[Scummvm-cvs-logs] scummvm master -> 1666d9da824c7e217fba19bcd694cc878b3d65bb

DrMcCoy drmccoy at drmccoy.de
Sat Jun 16 01:41:42 CEST 2012


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:
1666d9da82 GOB: Fix mult object collision detection I broke in 2007


Commit: 1666d9da824c7e217fba19bcd694cc878b3d65bb
    https://github.com/scummvm/scummvm/commit/1666d9da824c7e217fba19bcd694cc878b3d65bb
Author: Sven Hesse (drmccoy at users.sourceforge.net)
Date: 2012-06-15T16:39:14-07:00

Commit Message:
GOB: Fix mult object collision detection I broke in 2007

This fixes the sidescroller levels (like the bees and butterflies)
in Little Red.

I really wonder if this breakage had other effects too...

Changed paths:
    engines/gob/mult_v2.cpp



diff --git a/engines/gob/mult_v2.cpp b/engines/gob/mult_v2.cpp
index 6593565..64b9d19 100644
--- a/engines/gob/mult_v2.cpp
+++ b/engines/gob/mult_v2.cpp
@@ -1082,7 +1082,7 @@ void Mult_v2::animate() {
 			continue;
 
 		for (int j = 0; j < numAnims; j++) {
-			Mult_Object &animObj2 = *_renderObjs[i];
+			Mult_Object &animObj2 = *_renderObjs[j];
 			Mult_AnimData &animData2 = *(animObj2.pAnimData);
 
 			if (i == j)






More information about the Scummvm-git-logs mailing list