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

[lordhoto at users.sourceforge.net]

Revision: 53494
          http://scummvm.svn.sourceforge.net/scummvm/?rev=53494&view=rev
Author:   lordhoto
Date:     2010-10-15 14:14:10 +0000 (Fri, 15 Oct 2010)

Log Message:
-----------
KYRA: Fix valid warnings of bug #3087837 "KYRA: Code analysis warnings".

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/items_lok.cpp
    scummvm/trunk/engines/kyra/script_tim.cpp
    scummvm/trunk/engines/kyra/sequences_lol.cpp

Modified: scummvm/trunk/engines/kyra/items_lok.cpp
===================================================================
--- scummvm/trunk/engines/kyra/items_lok.cpp	2010-10-15 13:56:14 UTC (rev 53493)
+++ scummvm/trunk/engines/kyra/items_lok.cpp	2010-10-15 14:14:10 UTC (rev 53494)
@@ -304,10 +304,11 @@
 	int itemHeight = _itemTable[item].height;
 	_lastProcessedItemHeight = itemHeight;
 
-	if (x == -1 && x == -1) {
+	if (x == -1)
 		x = _rnd.getRandomNumberRng(16, 304);
+
+	if (y == -1)
 		y = _rnd.getRandomNumberRng(_northExitHeight & 0xFF, 135);
-	}
 
 	int xpos = x;
 	int ypos = y;

Modified: scummvm/trunk/engines/kyra/script_tim.cpp
===================================================================
--- scummvm/trunk/engines/kyra/script_tim.cpp	2010-10-15 13:56:14 UTC (rev 53493)
+++ scummvm/trunk/engines/kyra/script_tim.cpp	2010-10-15 14:14:10 UTC (rev 53494)
@@ -946,7 +946,7 @@
 		}
 	}
 
-	if (wsaFlags & 7)
+	if (wsa && (wsaFlags & 7))
 		wsa->displayFrame(0, 0, x, y, 0, 0, 0);
 
 	if (wsaFlags & 3) {

Modified: scummvm/trunk/engines/kyra/sequences_lol.cpp
===================================================================
--- scummvm/trunk/engines/kyra/sequences_lol.cpp	2010-10-15 13:56:14 UTC (rev 53493)
+++ scummvm/trunk/engines/kyra/sequences_lol.cpp	2010-10-15 14:14:10 UTC (rev 53494)
@@ -1435,7 +1435,7 @@
 				if (monsterAnimFrame >= 8)
 					_screen->drawShape(page, doorShape, doorX, doorY, doorSD, (doorSD == 22) ? 0 : 1);
 
-				_screen->drawShape(page, monsterShape, monsterX, monsterY, 0, 0x104 | ((!isRightMonster | (monsterAnimFrame < 20)) ? 0 : 1), _outroShapeTable, 1, _outroMonsterScaleTableX[monsterAnimFrame], _outroMonsterScaleTableY[monsterAnimFrame]);
+				_screen->drawShape(page, monsterShape, monsterX, monsterY, 0, 0x104 | ((!isRightMonster || monsterAnimFrame < 20) ? 0 : 1), _outroShapeTable, 1, _outroMonsterScaleTableX[monsterAnimFrame], _outroMonsterScaleTableY[monsterAnimFrame]);
 
 				if (monsterAnimFrame < 8)
 					_screen->drawShape(page, doorShape, doorX, doorY, doorSD, (doorSD == 22) ? 0 : 1);


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