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

LASTEXPRESS: Changed some spaces to tabs

Browse Source 
svn-id: r53618
This commit is contained in:
Torbjörn Andersson 2010-10-19 19:54:15 +00:00
parent f6a43d980a
commit 490d4aef0e
9 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -269,7 +269,7 @@ IMPLEMENT_FUNCTION(18, Abbot, chapter3Handler)
case kAction192054567:
setCallback(1);
setup_callbackActionRestaurantOrSalon();
setup_callbackActionRestaurantOrSalon();
break;
}
}
@ -406,7 +406,7 @@ IMPLEMENT_FUNCTION(21, Abbot, function21)
getData()->location = kLocationInsideCompartment;
setCallback(7);
setup_draw("029B");
setup_draw("029B");
break;
}
}

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

@ -206,7 +206,7 @@ IMPLEMENT_FUNCTION_II(7 ,Kahina, updateEntity2, CarIndex, EntityPosition)
if (getEntities()->updateEntity(_entityIndex, (CarIndex)params->param1, (EntityPosition)params->param2)) {
CALLBACK_ACTION();
} else if (getEntities()->isDistanceBetweenEntities(kEntityKahina, kEntityPlayer, 1000)
&& !getEntities()->isInGreenCarEntrance(kEntityPlayer)
&& !getEntities()->isInGreenCarEntrance(kEntityPlayer)
&& !getEntities()->isInsideCompartments(kEntityPlayer)
&& !getEntities()->checkFields10(kEntityPlayer)) {

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

@ -160,8 +160,8 @@ IMPLEMENT_FUNCTION(9, Kronos, function9)
if (getCallback() == 1) {
getAction()->playAnimation(kEventKronosConversation);
getScenes()->loadSceneFromPosition(kCarKronos, 87);
getSavePoints()->push(kEntityKronos, kEntityKahina, kAction137685712);
setup_function10();
getSavePoints()->push(kEntityKronos, kEntityKahina, kAction137685712);
setup_function10();
}
break;
}

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

@ -570,7 +570,7 @@ IMPLEMENT_FUNCTION_II(13, Mertens, function13, bool, bool)
UPDATE_PARAM_PROC_END
getData()->inventoryItem = (getProgress().chapter == kChapter1
&& !ENTITY_PARAM(2, 1)
&& !ENTITY_PARAM(2, 1)
&& !getProgress().eventCorpseFound
&& !getEvent(kEventMertensAskTylerCompartment)
&& !getEvent(kEventMertensAskTylerCompartmentD)) ? kItemMatchBox : kItemNone;

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

@ -418,7 +418,7 @@ IMPLEMENT_FUNCTION(14, MmeBoutarel, function14)
case 1:
getObjects()->update(kObjectCompartmentD, kEntityPlayer, kObjectLocation2, kCursorNormal, kCursorNormal);
getObjects()->update(kObject51, kEntityPlayer, kObjectLocation1, kCursorHandKnock, kCursorHand);
getObjects()->update(kObject51, kEntityPlayer, kObjectLocation1, kCursorHandKnock, kCursorHand);
getEntities()->drawSequenceLeft(kEntityMmeBoutarel, "503");
break;

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

@ -1345,7 +1345,7 @@ IMPLEMENT_FUNCTION(38, Rebecca, function38)
case 1:
getObjects()->update(kObjectCompartmentE, kEntityPlayer, kObjectLocationNone, kCursorHandKnock, kCursorHand);
getSavePoints()->push(kEntityRebecca, kEntitySophie, kAction259921280);
getSavePoints()->push(kEntityRebecca, kEntitySophie, kAction259921280);
setCallback(2);
setup_updateEntity(kCarKronos, kPosition_9270);

16
engines/lastexpress/entities/vassili.cpp
View File

@ -350,16 +350,16 @@ IMPLEMENT_FUNCTION(10, Vassili, seizure)
getData()->location = kLocationInsideCompartment;
getAction()->playAnimation(kEventVassiliSeizure);
getObjects()->update(kObjectCompartmentA, kEntityPlayer, kObjectLocationNone, kCursorHandKnock, kCursorHand);
getObjects()->update(kObjectCompartment1, kEntityPlayer, kObjectLocationNone, kCursorHandKnock, kCursorHand);
getProgress().field_18 = 2;
getObjects()->update(kObjectCompartmentA, kEntityPlayer, kObjectLocationNone, kCursorHandKnock, kCursorHand);
getObjects()->update(kObjectCompartment1, kEntityPlayer, kObjectLocationNone, kCursorHandKnock, kCursorHand);
getProgress().field_18 = 2;
getSavePoints()->push(kEntityVassili, kEntityAnna, kAction191477936);
getSavePoints()->push(kEntityVassili, kEntityVerges, kAction191477936);
getSavePoints()->push(kEntityVassili, kEntityCoudert, kAction191477936);
getScenes()->loadSceneFromObject(kObjectCompartmentA);
getSavePoints()->push(kEntityVassili, kEntityAnna, kAction191477936);
getSavePoints()->push(kEntityVassili, kEntityVerges, kAction191477936);
getSavePoints()->push(kEntityVassili, kEntityCoudert, kAction191477936);
getScenes()->loadSceneFromObject(kObjectCompartmentA);
setup_drawInBed();
setup_drawInBed();
break;
}
}

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

@ -336,7 +336,7 @@ IMPLEMENT_FUNCTION(11, Verges, function11)
getData()->entityPosition = kPosition_5000;
getObjects()->update(kObject104, kEntityVerges, kObjectLocationNone, kCursorNormal, kCursorHand);
getObjects()->update(kObject105, kEntityVerges, kObjectLocationNone, kCursorNormal, kCursorHand);
getObjects()->update(kObject105, kEntityVerges, kObjectLocationNone, kCursorNormal, kCursorHand);
CALLBACK_ACTION();
break;

8
engines/lastexpress/game/scenes.cpp
View File

@ -216,7 +216,7 @@ void SceneManager::loadSceneFromItemPosition(InventoryItem item) {
Scene *scene = getScenes()->get(getState()->scene);
Position position = scene->position;
if (getState()->sceneUseBackup) {
if (getState()->sceneUseBackup) {
Scene *sceneBackup = getScenes()->get(getState()->sceneBackup);
position = sceneBackup->position;
}
@ -228,8 +228,8 @@ void SceneManager::loadSceneFromItemPosition(InventoryItem item) {
if (getState()->sceneUseBackup)
getState()->sceneBackup = getSceneIndexFromPosition(car, position);
else
loadSceneFromPosition(car, position);
}
loadSceneFromPosition(car, position);
}
}
//////////////////////////////////////////////////////////////////////////
@ -1176,7 +1176,7 @@ void SceneManager::postProcessScene() {
break;
case Scene::kTypeReadText:
getSound()->readText(scene->param1);
getSound()->readText(scene->param1);
break;
case Scene::kType133: