[Scummvm-git-logs] scummvm master -> 614ad647d1dc385e4117b206a273b02645d9ab07

[somaen]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
614ad647d1 GRIM: Don't error out on "specialty" texture loading.


Commit: 614ad647d1dc385e4117b206a273b02645d9ab07
    https://github.com/scummvm/scummvm/commit/614ad647d1dc385e4117b206a273b02645d9ab07
Author: Einar Johan Trøan Sømåen (somaen at scummvm.org)
Date: 2022-10-16T22:43:20+02:00

Commit Message:
GRIM: Don't error out on "specialty" texture loading.

Specialty textures are not loaded from files, so
the previous change broke EFMI entirely. This change
makes an exception for specialty textures.

Changed paths:
    engines/grim/resource.cpp


diff --git a/engines/grim/resource.cpp b/engines/grim/resource.cpp
index b4c0eba905b..ebfd6ed7858 100644
--- a/engines/grim/resource.cpp
+++ b/engines/grim/resource.cpp
@@ -454,8 +454,12 @@ Material *ResourceLoader::loadMaterial(const Common::String &filename, CMap *c,
 			error("Could not find material %s", filename.c_str());
 		}
 	}
-	if (!stream)
-		error("Couldn't open %s", fname.c_str());
+	if (!stream) {
+		// Specialty materials are not loaded from files.
+		if (!filename.hasPrefix("specialty")) {
+			error("Couldn't open %s", fname.c_str());
+		}
+	}
 
 	Material *result = new Material(fname, stream, c, clamp);
 	delete stream;