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

[fingolfin at users.sourceforge.net]

Revision: 35933
          http://scummvm.svn.sourceforge.net/scummvm/?rev=35933&view=rev
Author:   fingolfin
Date:     2009-01-20 02:54:30 +0000 (Tue, 20 Jan 2009)

Log Message:
-----------
Fixed warnings (nice example of why heeding warnings is useful: one of the changes seems to fix a NULL deref)

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

Modified: scummvm/trunk/engines/kyra/scene_lol.cpp
===================================================================
--- scummvm/trunk/engines/kyra/scene_lol.cpp	2009-01-20 00:33:26 UTC (rev 35932)
+++ scummvm/trunk/engines/kyra/scene_lol.cpp	2009-01-20 02:54:30 UTC (rev 35933)
@@ -692,10 +692,11 @@
 	for (int i = 0; i < 1024; i++) {
 		_levelBlockProperties[i].field_8 = 5;
 		uint16 id = _levelBlockProperties[i].itemIndex;
-		LVL * r = 0;
+		LVL *r = 0;
 
 		while (id & 0x8000) {
-			LVL * r = (LVL*) cmzGetItemOffset(id);
+			r = (LVL*)cmzGetItemOffset(id);
+			assert(r);
 			id = r->itemIndexUnk;
 		}
 

Modified: scummvm/trunk/engines/kyra/script_lol.cpp
===================================================================
--- scummvm/trunk/engines/kyra/script_lol.cpp	2009-01-20 00:33:26 UTC (rev 35932)
+++ scummvm/trunk/engines/kyra/script_lol.cpp	2009-01-20 02:54:30 UTC (rev 35933)
@@ -364,7 +364,6 @@
 }
 
 int LoLEngine::o2_setUnkArrayVal(EMCState *script) {
-	int a=stackPos(0);
 	_unkEMC46[stackPos(0)] = stackPos(1);
 	return 1;
 }


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