[Scummvm-cvs-logs] scummvm master -> 45f27edb0a30b3021084b24fa68f1f4883ba888b

m-kiewitz m_kiewitz at users.sourceforge.net
Sat Jun 13 16:44:40 CEST 2015


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:
45f27edb0a SHERLOCK: 3DO: adjust sprite frame only for walk


Commit: 45f27edb0a30b3021084b24fa68f1f4883ba888b
    https://github.com/scummvm/scummvm/commit/45f27edb0a30b3021084b24fa68f1f4883ba888b
Author: Martin Kiewitz (m_kiewitz at users.sourceforge.net)
Date: 2015-06-13T16:43:45+02:00

Commit Message:
SHERLOCK: 3DO: adjust sprite frame only for walk

only adjust animation frame for walk.anim
map uses another set of images and the same sprite code

Changed paths:
    engines/sherlock/objects.cpp



diff --git a/engines/sherlock/objects.cpp b/engines/sherlock/objects.cpp
index cbc3cbd..a1fef8f 100644
--- a/engines/sherlock/objects.cpp
+++ b/engines/sherlock/objects.cpp
@@ -200,10 +200,15 @@ void Sprite::setImageFrame() {
 	assert(images);
 
 	if (_vm->getPlatform() == Common::kPlatform3DO) {
-		// 3DO has 110 animation frames inside walk.anim
-		// PC has 55
-		// this adjusts the framenumber accordingly
-		imageNumber *= 2;
+		// only do this to the image-array with 110 entries
+		// map uses another image-array and this code
+		if (images->size() == 110) {
+			// 3DO has 110 animation frames inside walk.anim
+			// PC has 55
+			// this adjusts the framenumber accordingly
+			// sort of HACK
+			imageNumber *= 2;
+		}
 	}
 
 	// Set the frame pointer






More information about the Scummvm-git-logs mailing list