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

[littleboy at users.sourceforge.net]

Revision: 53690
          http://scummvm.svn.sourceforge.net/scummvm/?rev=53690&view=rev
Author:   littleboy
Date:     2010-10-21 23:44:27 +0000 (Thu, 21 Oct 2010)

Log Message:
-----------
LASTEXPRESS: Simplify some entity callback code

Modified Paths:
--------------
    scummvm/trunk/engines/lastexpress/entities/coudert.cpp
    scummvm/trunk/engines/lastexpress/entities/francois.cpp
    scummvm/trunk/engines/lastexpress/entities/kahina.cpp
    scummvm/trunk/engines/lastexpress/entities/milos.cpp

Modified: scummvm/trunk/engines/lastexpress/entities/coudert.cpp
===================================================================
--- scummvm/trunk/engines/lastexpress/entities/coudert.cpp	2010-10-21 23:43:57 UTC (rev 53689)
+++ scummvm/trunk/engines/lastexpress/entities/coudert.cpp	2010-10-21 23:44:27 UTC (rev 53690)
@@ -1346,7 +1346,7 @@
 			getData()->location = kLocationInsideCompartment;
 			getEntities()->clearSequences(kEntityCoudert);
 
-			setCallback(getCallback() == 3 ? 4 : 8);
+			setCallback(getCallback() + 1);
 			setup_function20(kObjectCompartmentD, kObject51);
 			break;
 

Modified: scummvm/trunk/engines/lastexpress/entities/francois.cpp
===================================================================
--- scummvm/trunk/engines/lastexpress/entities/francois.cpp	2010-10-21 23:43:57 UTC (rev 53689)
+++ scummvm/trunk/engines/lastexpress/entities/francois.cpp	2010-10-21 23:44:27 UTC (rev 53690)
@@ -669,13 +669,13 @@
 
 		case 3:
 		case 5:
-			setCallback(getCallback() == 3 ? 4 : 6);
+			setCallback(getCallback() + 1);
 			setup_updateFromTime(rnd(450));
 			break;
 
 		case 4:
 		case 6:
-			setCallback(getCallback() == 4 ? 5 : 7);
+			setCallback(getCallback() + 1);
 			setup_playSound(rnd(2) ? "Fra2005B" : "Fra2005C");
 			break;
 

Modified: scummvm/trunk/engines/lastexpress/entities/kahina.cpp
===================================================================
--- scummvm/trunk/engines/lastexpress/entities/kahina.cpp	2010-10-21 23:43:57 UTC (rev 53689)
+++ scummvm/trunk/engines/lastexpress/entities/kahina.cpp	2010-10-21 23:44:27 UTC (rev 53690)
@@ -665,13 +665,13 @@
 			getObjects()->update(kObjectCompartmentKronos, kEntityPlayer, kObjectLocationNone, kCursorHandKnock, kCursorHand);
 			getScenes()->loadSceneFromPosition(kCarKronos, 80, 1);
 
-			setCallback(getCallback() == 1 ? 2 : 5);
+			setCallback(getCallback() + 1);
 			setup_updateFromTime(900);
 			break;
 
 		case 2:
 		case 5:
-			setCallback(getCallback() == 2 ? 3 : 6);
+			setCallback(getCallback() + 1);
 			setup_playSound("KRO3005");
 			break;
 
@@ -1274,7 +1274,7 @@
 		case 1:
 		case 4:
 			if (getEntities()->isPlayerInCar(kCarGreenSleeping)) {
-				setCallback(getCallback() == 1 ? 2 : 5);
+				setCallback(getCallback() + 1);
 				setup_function19(getCallback() == 1 ? kCarGreenSleeping : kCarKronos, getCallback() == 1 ? kPosition_9460 : kPosition_9270);
 				break;
 			} else {
@@ -1361,7 +1361,7 @@
 		case 12:
 			getData()->location = kLocationOutsideCompartment;
 
-			setCallback(getCallback() == 10 ? 11 : 13);
+			setCallback(getCallback() + 1);
 			setup_updateEntity(kCarKronos, kPosition_9270);
 			break;
 		}

Modified: scummvm/trunk/engines/lastexpress/entities/milos.cpp
===================================================================
--- scummvm/trunk/engines/lastexpress/entities/milos.cpp	2010-10-21 23:43:57 UTC (rev 53689)
+++ scummvm/trunk/engines/lastexpress/entities/milos.cpp	2010-10-21 23:44:27 UTC (rev 53690)
@@ -621,7 +621,7 @@
 				getState()->time += 1800;
 				getProgress().field_CC = 1;
 
-				setCallback(getCallback() == 4 ? 5 : 19);
+				setCallback(getCallback() + 1);
 				setup_savegame(kSavegameTypeEvent, kEventMilosTylerCompartmentDefeat);
 			}
 			break;


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