libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-05 02:17:05 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

LASTEXPRESS: Simplify some entity callback code

Browse Source 
svn-id: r53690
This commit is contained in:
Julien Templier 2010-10-21 23:44:27 +00:00
parent af36047c71
commit 4466e2a20d
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
engines/lastexpress/entities/coudert.cpp
View File

@ -1346,7 +1346,7 @@ IMPLEMENT_FUNCTION(26, Coudert, function26)
getData()->location = kLocationInsideCompartment; getData()->location = kLocationInsideCompartment;
getEntities()->clearSequences(kEntityCoudert); getEntities()->clearSequences(kEntityCoudert);
setCallback(getCallback() == 3 ? 4 : 8); setCallback(getCallback() + 1);
setup_function20(kObjectCompartmentD, kObject51); setup_function20(kObjectCompartmentD, kObject51);
break; break;

4
engines/lastexpress/entities/francois.cpp
View File

@ -669,13 +669,13 @@ IMPLEMENT_FUNCTION_IIS(14, Francois, function14, ObjectIndex, EntityPosition)
case 3: case 3:
case 5: case 5:
setCallback(getCallback() == 3 ? 4 : 6); setCallback(getCallback() + 1);
setup_updateFromTime(rnd(450)); setup_updateFromTime(rnd(450));
break; break;
case 4: case 4:
case 6: case 6:
setCallback(getCallback() == 4 ? 5 : 7); setCallback(getCallback() + 1);
setup_playSound(rnd(2) ? "Fra2005B" : "Fra2005C"); setup_playSound(rnd(2) ? "Fra2005B" : "Fra2005C");
break; break;

8
engines/lastexpress/entities/kahina.cpp
View File

@ -665,13 +665,13 @@ label_callback_3:
getObjects()->update(kObjectCompartmentKronos, kEntityPlayer, kObjectLocationNone, kCursorHandKnock, kCursorHand); getObjects()->update(kObjectCompartmentKronos, kEntityPlayer, kObjectLocationNone, kCursorHandKnock, kCursorHand);
getScenes()->loadSceneFromPosition(kCarKronos, 80, 1); getScenes()->loadSceneFromPosition(kCarKronos, 80, 1);
setCallback(getCallback() == 1 ? 2 : 5); setCallback(getCallback() + 1);
setup_updateFromTime(900); setup_updateFromTime(900);
break; break;
case 2: case 2:
case 5: case 5:
setCallback(getCallback() == 2 ? 3 : 6); setCallback(getCallback() + 1);
setup_playSound("KRO3005"); setup_playSound("KRO3005");
break; break;
@ -1274,7 +1274,7 @@ IMPLEMENT_FUNCTION(25, Kahina, function25)
case 1: case 1:
case 4: case 4:
if (getEntities()->isPlayerInCar(kCarGreenSleeping)) { if (getEntities()->isPlayerInCar(kCarGreenSleeping)) {
setCallback(getCallback() == 1 ? 2 : 5); setCallback(getCallback() + 1);
setup_function19(getCallback() == 1 ? kCarGreenSleeping : kCarKronos, getCallback() == 1 ? kPosition_9460 : kPosition_9270); setup_function19(getCallback() == 1 ? kCarGreenSleeping : kCarKronos, getCallback() == 1 ? kPosition_9460 : kPosition_9270);
break; break;
} else { } else {
@ -1361,7 +1361,7 @@ IMPLEMENT_FUNCTION(25, Kahina, function25)
case 12: case 12:
getData()->location = kLocationOutsideCompartment; getData()->location = kLocationOutsideCompartment;
setCallback(getCallback() == 10 ? 11 : 13); setCallback(getCallback() + 1);
setup_updateEntity(kCarKronos, kPosition_9270); setup_updateEntity(kCarKronos, kPosition_9270);
break; break;
} }

2
engines/lastexpress/entities/milos.cpp
View File

@ -621,7 +621,7 @@ label_callback_12:
getState()->time += 1800; getState()->time += 1800;
getProgress().field_CC = 1; getProgress().field_CC = 1;
setCallback(getCallback() == 4 ? 5 : 19); setCallback(getCallback() + 1);
setup_savegame(kSavegameTypeEvent, kEventMilosTylerCompartmentDefeat); setup_savegame(kSavegameTypeEvent, kEventMilosTylerCompartmentDefeat);
} }
break; break;