[Scummvm-cvs-logs] SF.net SVN: scummvm:[53693] scummvm/trunk/engines/lastexpress/entities

[littleboy at users.sourceforge.net]

Revision: 53693
          http://scummvm.svn.sourceforge.net/scummvm/?rev=53693&view=rev
Author:   littleboy
Date:     2010-10-22 00:35:37 +0000 (Fri, 22 Oct 2010)

Log Message:
-----------
LASTEXPRESS: Fix GCC errors & warnings (missing stricmp & parentheses)

Modified Paths:
--------------
    scummvm/trunk/engines/lastexpress/entities/anna.cpp
    scummvm/trunk/engines/lastexpress/entities/kronos.cpp
    scummvm/trunk/engines/lastexpress/entities/tatiana.cpp

Modified: scummvm/trunk/engines/lastexpress/entities/anna.cpp
===================================================================
--- scummvm/trunk/engines/lastexpress/entities/anna.cpp	2010-10-21 23:46:00 UTC (rev 53692)
+++ scummvm/trunk/engines/lastexpress/entities/anna.cpp	2010-10-22 00:35:37 UTC (rev 53693)
@@ -2880,9 +2880,9 @@
 			}
 
 			if (!params->param3
-			 || !getEntities()->isPlayerInCar(kCarRedSleeping)
+			 || (!getEntities()->isPlayerInCar(kCarRedSleeping)
 			 && !getEntities()->isInSalon(kEntityPlayer)
-			 && !getEntities()->isInRestaurant(kEntityPlayer)
+			 && !getEntities()->isInRestaurant(kEntityPlayer))
 			 || !params->param4)
 				params->param4 = getState()->time;
 

Modified: scummvm/trunk/engines/lastexpress/entities/kronos.cpp
===================================================================
--- scummvm/trunk/engines/lastexpress/entities/kronos.cpp	2010-10-21 23:46:00 UTC (rev 53692)
+++ scummvm/trunk/engines/lastexpress/entities/kronos.cpp	2010-10-22 00:35:37 UTC (rev 53693)
@@ -49,7 +49,7 @@
 
 static const struct {
 	uint32 time;
-	char *sequence;
+	const char *sequence;
 } concertData[54] = {
 	{735, "201d"},   {1395, "201a"},  {1965, "201d"},  {2205, "201a"},  {3405, "201d"},
 	{3750, "201a"},  {3975, "201d"},  {4365, "201a"},  {4650, "201d"},  {4770, "201a"},
@@ -489,11 +489,11 @@
 
 			getEntities()->drawSequenceLeft(kEntityKronos, (char *)&concertData[params->param6].sequence);
 
-			if (stricmp((char *)&concertData[params->param6].sequence, "201e")) {
+			if (scumm_stricmp((char *)&concertData[params->param6].sequence, "201e")) {
 
-				if (stricmp((char *)&concertData[params->param6].sequence, "201c")) {
+				if (scumm_stricmp((char *)&concertData[params->param6].sequence, "201c")) {
 
-					if (!stricmp((char *)&concertData[params->param6].sequence, "201d")) {
+					if (!scumm_stricmp((char *)&concertData[params->param6].sequence, "201d")) {
 						if (getEntities()->isPlayerPosition(kCarKronos, 86))
 							getScenes()->loadSceneFromPosition(kCarKronos, 83);
 

Modified: scummvm/trunk/engines/lastexpress/entities/tatiana.cpp
===================================================================
--- scummvm/trunk/engines/lastexpress/entities/tatiana.cpp	2010-10-21 23:46:00 UTC (rev 53692)
+++ scummvm/trunk/engines/lastexpress/entities/tatiana.cpp	2010-10-22 00:35:37 UTC (rev 53693)
@@ -615,7 +615,7 @@
 		if (params->param1 == kTimeInvalid || getState()->time <= kTime1179000)
 			goto label_update;
 
-		UPDATE_PARAM_PROC_TIME(kTime1233000, (!getEvent(kEventTatianaAskMatchSpeakRussian) && !getEvent(kEventTatianaAskMatch) || getEntities()->isInGreenCarEntrance(kEntityPlayer)), params->param1, 0)
+		UPDATE_PARAM_PROC_TIME(kTime1233000, ((!getEvent(kEventTatianaAskMatchSpeakRussian) && !getEvent(kEventTatianaAskMatch)) || getEntities()->isInGreenCarEntrance(kEntityPlayer)), params->param1, 0)
 label_update:
 			if (!getEvent(kEventTatianaAskMatchSpeakRussian)
 			 && !getEvent(kEventTatianaAskMatch)


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