[Scummvm-cvs-logs] SF.net SVN: scummvm:[48016] scummvm/trunk/engines/kyra/scene_lol.cpp

[athrxx at users.sourceforge.net]

Revision: 48016
          http://scummvm.svn.sourceforge.net/scummvm/?rev=48016&view=rev
Author:   athrxx
Date:     2010-02-09 21:09:29 +0000 (Tue, 09 Feb 2010)

Log Message:
-----------
LOL: fixed script bug in castle cimmeria that would cause out of bounds mem access (should fix bug #2948109)

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/scene_lol.cpp

Modified: scummvm/trunk/engines/kyra/scene_lol.cpp
===================================================================
--- scummvm/trunk/engines/kyra/scene_lol.cpp	2010-02-09 18:24:54 UTC (rev 48015)
+++ scummvm/trunk/engines/kyra/scene_lol.cpp	2010-02-09 21:09:29 UTC (rev 48016)
@@ -1959,10 +1959,12 @@
 		if (!(w & 8))
 			continue;
 
-		uint16 v = 20 * (s - _dscUnk2[s]);
+		uint16 v = 20 * (s - (s < 23 ? _dscUnk2[s] : 0));
+		if (v > 80)
+			v = 80;
 
 		scaleLevelShapesDim(t, dimY1, dimY2, 13);
-		drawDoor(_doorShapes[_dscDoorShpIndex[s]], 0, t, 10, 0, -v, 2);
+		drawDoor(_doorShapes[(s < 23 ? _dscDoorShpIndex[s] : 0)], 0, t, 10, 0, -v, 2);
 		setLevelShapesDim(t, dimY1, dimY2, 13);
 	}
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.