[Scummvm-git-logs] scummvm master -> ba5f3d9028cb6fb3fab1d806dd39c2f049a6f28b

[dreammaster]

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:
ba5f3d9028 MM: XEEN: workaround for broken canrnage hand animation.


Commit: ba5f3d9028cb6fb3fab1d806dd39c2f049a6f28b
    https://github.com/scummvm/scummvm/commit/ba5f3d9028cb6fb3fab1d806dd39c2f049a6f28b
Author: Alexander Izmailov (yarolig at gmail.com)
Date: 2023-06-10T16:06:16-07:00

Commit Message:
MM: XEEN: workaround for broken canrnage hand animation.

Some resource files from MM1 are opened by ID, that is hash(filename).
The ID for "049.att." file is exist and incorrect for this file.
MM4-5 games should not use IDs at all.
Not sure if here is the right place to select the way sprite loads.
But it fixes bug #14503.

Changed paths:
    engines/mm/shared/xeen/sprites.cpp


diff --git a/engines/mm/shared/xeen/sprites.cpp b/engines/mm/shared/xeen/sprites.cpp
index 97fa01aa11b..859818ddb66 100644
--- a/engines/mm/shared/xeen/sprites.cpp
+++ b/engines/mm/shared/xeen/sprites.cpp
@@ -80,7 +80,7 @@ SpriteResource &SpriteResource::operator=(const SpriteResource &src) {
 void SpriteResource::load(const Common::String &filename) {
 	_filename = filename;
 	Common::File f;
-	if (f.open(filename)) {
+	if (g_engine->getGameID() == GType_MightAndMagic1 && f.open(filename)) {
 		load(f);
 	} else {
 		File f2(filename);