Minor changes

Author: deathkiller

README.md

@@ -40,7 +40,7 @@ Jazz² Resurrection is reimplementation of the game **Jazz Jackrabbit 2** releas
 * Copy contents of original *Jazz Jackrabbit 2* directory to `‹Game›\Source\`
 * Run `‹Game›\Jazz2.exe`, `‹Game›\Jazz2_avx2.exe` or `‹Game›\Jazz2_sdl2.exe` application
 
-`‹Game›` *denotes path to Jazz² Resurrection. The game requires **Windows 7** (or newer) and GPU with **OpenGL 3.0** support. Game files should **not** be copied to* `Program Files`*. Cache is recreated during intro cinematics on the first startup, so it can't be skipped.*
+`‹Game›` *denotes path to Jazz² Resurrection. The game requires **Windows 7** (or newer) and GPU with **OpenGL 3.0** support. Game files should **not** be copied to* `Program Files`*. Cache is recreated during the intro cinematics on the first startup, so it can't be skipped. Also, the sound effects in the intro cinematics require the cache, so they will be missing the first time the game is started up.*
 
 ### Linux
 * Download the game
@@ -51,7 +51,7 @@ Jazz² Resurrection is reimplementation of the game **Jazz Jackrabbit 2** releas
 * Run `‹Game›/jazz2` or `‹Game›/jazz2_sdl2` application
   * If packages are used, the game should be visible in application list
 
-`‹Game›` *denotes path to Jazz² Resurrection.* `~` *denotes user's home directory. The game requires GPU with **OpenGL 3.0** or **OpenGL ES 3.0** (ARM) support. Cache is recreated during intro cinematics on the first startup, so it can't be skipped.*
+`‹Game›` *denotes path to Jazz² Resurrection.* `~` *denotes user's home directory. The game requires GPU with **OpenGL 3.0** or **OpenGL ES 3.0** (ARM) support. Cache is recreated during the intro cinematics on the first startup, so it can't be skipped. Also, the sound effects in the intro cinematics require the cache, so they will be missing the first time the game is started up.*
 
 <sup>Alternatively, you can use package repository for your Linux distribution:</sup><br>
 [![ArchLinux](https://img.shields.io/badge/Arch%20Linux-grey?logo=archlinux&logoColor=ffffff)](https://aur.archlinux.org/packages/jazz2-bin)
@@ -66,7 +66,7 @@ Jazz² Resurrection is reimplementation of the game **Jazz Jackrabbit 2** releas
 * Copy contents of original *Jazz Jackrabbit 2* directory to `~/Library/Application Support/Jazz² Resurrection/Source/`
 * Run the newly installed application
 
-`~` *denotes user's home directory. Cache is recreated during intro cinematics on the first startup, so it can't be skipped.*
+`~` *denotes user's home directory. Cache is recreated during the intro cinematics on the first startup, so it can't be skipped. Also, the sound effects in the intro cinematics require the cache, so they will be missing the first time the game is started up.*
 
 Alternatively, you can install it using <sub><sub>[![Homebrew](https://img.shields.io/homebrew/cask/v/jazz2-resurrection?logo=homebrew&logoColor=ffffff&label=Homebrew&color=b56b2b)](https://formulae.brew.sh/cask/jazz2-resurrection)</sub></sub> `brew install --cask jazz2-resurrection`
 
@@ -79,15 +79,15 @@ Alternatively, you can install it using <sub><sub>[![Homebrew](https://img.shiel
     * `‹Storage›/Download/Jazz² Resurrection/Source/`
 * Run the newly installed application
 
-`‹Storage›` *usually denotes internal storage on your device.* `Content` *directory is included directly in APK file, no action is needed. The game requires **Android 5.0** (or newer) and GPU with **OpenGL ES 3.0** support. Cache is recreated during intro cinematics on the first startup.*
+`‹Storage›` *usually denotes internal storage on your device.* `Content` *directory is included directly in APK file, no action is needed. The game requires **Android 5.0** (or newer) and GPU with **OpenGL ES 3.0** support. Cache is recreated during the intro cinematics on the first startup. Also, the sound effects in the intro cinematics require the cache, so they will be missing the first time the game is started up.*
 
 ### Nintendo Switch
 * Download the game
 * Install `Jazz2.nro` package (custom firmware is needed)
 * Copy contents of original *Jazz Jackrabbit 2* directory to `/Games/Jazz2/Source/` on SD card
 * Run the newly installed application with enabled full RAM access
 
-*Cache is recreated during intro cinematics on the first startup, so it can't be skipped. It may take more time, so white screen could be shown longer than expected.*
+*Cache is recreated during the intro cinematics on the first startup, so it can't be skipped. It may take more time, so white screen could be shown longer than expected. Also, the sound effects in the intro cinematics require the cache, so they will be missing the first time the game is started up.*
 
 ### Web (Emscripten)
 * Go to https://deat.tk/jazz2/wasm/
@@ -104,6 +104,8 @@ Alternatively, you can install it using <sub><sub>[![Homebrew](https://img.shiel
   * Alternatively, copy the files to `\Games\Jazz² Resurrection\Source\` on an external drive to preserve settings across installations, the application must be set to `Game` type, `exFAT` is recommended or correct read/write permissions must be assigned
 * Run the application again
 
+*Cache is recreated during the intro cinematics on the first startup, so it can't be skipped. It may take more time, so white screen could be shown longer than expected. Also, the sound effects in the intro cinematics require the cache, so they will be missing the first time the game is started up.*
+
 
 ## Building the application
 

Sources/Jazz2/Compatibility/JJ2Anims.cpp

@@ -20,7 +20,10 @@ namespace Jazz2::Compatibility
 		SmallVector<SampleSection, 0> samples;
 
 		auto s = fs::Open(path, FileAccess::Read);
-		DEATH_ASSERT(s->IsValid(), "Cannot open file for reading", JJ2Version::Unknown);
+		if (!s->IsValid()) {
+			LOGE("Cannot open file \"{}\" for reading", path);
+			return JJ2Version::Unknown;
+		}
 
 		bool seemsLikeCC = false;
 

Sources/Jazz2/Compatibility/JJ2Data.cpp

@@ -22,7 +22,10 @@ namespace Jazz2::Compatibility
 	bool JJ2Data::Open(StringView path, bool strictParser)
 	{
 		auto s = fs::Open(path, FileAccess::Read);
-		DEATH_ASSERT(s->IsValid(), "Cannot open file for reading", false);
+		if (!s->IsValid()) {
+			LOGE("Cannot open file \"{}\" for reading", path);
+			return false;
+		}
 
 		std::uint32_t magic = s->ReadValue<std::uint32_t>();
 		std::uint32_t signature = s->ReadValue<std::uint32_t>();

Sources/Jazz2/Compatibility/JJ2Episode.cpp

@@ -25,7 +25,10 @@ namespace Jazz2::Compatibility
 	bool JJ2Episode::Open(StringView path)
 	{
 		auto s = fs::Open(path, FileAccess::Read);
-		DEATH_ASSERT(s->IsValid(), "Cannot open file for reading", false);
+		if (!s->IsValid()) {
+			LOGE("Cannot open file \"{}\" for reading", path);
+			return false;
+		}
 
 		Name = fs::GetFileNameWithoutExtension(path);
 		StringUtils::lowercaseInPlace(Name);

Sources/Jazz2/Compatibility/JJ2Level.cpp

@@ -20,8 +20,11 @@ namespace Jazz2::Compatibility
 {
 	bool JJ2Level::Open(StringView path, bool strictParser)
 	{
-		auto s = fs::Open(path, FileAccess::Read);
-		DEATH_ASSERT(s->IsValid(), "Cannot open file for reading", false);
+		auto s = fs::Open(path, FileAccess::Read);	
+		if (!s->IsValid()) {
+			LOGE("Cannot open file \"{}\" for reading", path);
+			return false;
+		}
 
 		// Skip copyright notice
 		s->Seek(180, SeekOrigin::Current);

Sources/Jazz2/Compatibility/JJ2Strings.cpp

@@ -45,7 +45,10 @@ namespace Jazz2::Compatibility
 	bool JJ2Strings::Open(StringView path)
 	{
 		auto s = fs::Open(path, FileAccess::Read);
-		DEATH_ASSERT(s->IsValid(), "Cannot open file for reading", false);
+		if (!s->IsValid()) {
+			LOGE("Cannot open file \"{}\" for reading", path);
+			return false;
+		}
 
 		Name = fs::GetFileNameWithoutExtension(path);
 		StringUtils::lowercaseInPlace(Name);

Sources/Jazz2/Compatibility/JJ2Tileset.cpp

@@ -14,7 +14,10 @@ namespace Jazz2::Compatibility
 	bool JJ2Tileset::Open(StringView path, bool strictParser)
 	{
 		auto s = fs::Open(path, FileAccess::Read);
-		DEATH_ASSERT(s->IsValid(), "Cannot open file for reading", false);
+		if (!s->IsValid()) {
+			LOGE("Cannot open file \"{}\" for reading", path);
+			return false;
+		}
 
 		// Skip copyright notice
 		s->Seek(180, SeekOrigin::Current);