diff options
author | Torbjörn Andersson | 2010-10-19 19:54:15 +0000 |
---|---|---|
committer | Torbjörn Andersson | 2010-10-19 19:54:15 +0000 |
commit | 490d4aef0ef1c0649f1ff8e81ce315c830562c11 (patch) | |
tree | 06eadaf46d402d8dc27eb7936f99dda986c977f3 /engines | |
parent | f6a43d980a129c6f8da4cc45ee404bdb77f0d522 (diff) | |
download | scummvm-rg350-490d4aef0ef1c0649f1ff8e81ce315c830562c11.tar.gz scummvm-rg350-490d4aef0ef1c0649f1ff8e81ce315c830562c11.tar.bz2 scummvm-rg350-490d4aef0ef1c0649f1ff8e81ce315c830562c11.zip |
LASTEXPRESS: Changed some spaces to tabs
svn-id: r53618
Diffstat (limited to 'engines')
-rw-r--r-- | engines/lastexpress/entities/abbot.cpp | 4 | ||||
-rw-r--r-- | engines/lastexpress/entities/kahina.cpp | 2 | ||||
-rw-r--r-- | engines/lastexpress/entities/kronos.cpp | 4 | ||||
-rw-r--r-- | engines/lastexpress/entities/mertens.cpp | 2 | ||||
-rw-r--r-- | engines/lastexpress/entities/mmeboutarel.cpp | 2 | ||||
-rw-r--r-- | engines/lastexpress/entities/rebecca.cpp | 2 | ||||
-rw-r--r-- | engines/lastexpress/entities/vassili.cpp | 16 | ||||
-rw-r--r-- | engines/lastexpress/entities/verges.cpp | 2 | ||||
-rw-r--r-- | engines/lastexpress/game/scenes.cpp | 8 |
9 files changed, 21 insertions, 21 deletions
diff --git a/engines/lastexpress/entities/abbot.cpp b/engines/lastexpress/entities/abbot.cpp index d46bb325be..90d447fca6 100644 --- a/engines/lastexpress/entities/abbot.cpp +++ b/engines/lastexpress/entities/abbot.cpp @@ -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; } } diff --git a/engines/lastexpress/entities/kahina.cpp b/engines/lastexpress/entities/kahina.cpp index ffcf19862c..574d34b667 100644 --- a/engines/lastexpress/entities/kahina.cpp +++ b/engines/lastexpress/entities/kahina.cpp @@ -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)) { diff --git a/engines/lastexpress/entities/kronos.cpp b/engines/lastexpress/entities/kronos.cpp index f45f18bbd2..a7d6f5236f 100644 --- a/engines/lastexpress/entities/kronos.cpp +++ b/engines/lastexpress/entities/kronos.cpp @@ -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; } diff --git a/engines/lastexpress/entities/mertens.cpp b/engines/lastexpress/entities/mertens.cpp index a59a8eebe8..9124d3760b 100644 --- a/engines/lastexpress/entities/mertens.cpp +++ b/engines/lastexpress/entities/mertens.cpp @@ -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; diff --git a/engines/lastexpress/entities/mmeboutarel.cpp b/engines/lastexpress/entities/mmeboutarel.cpp index ce9ebf3abd..86acb90018 100644 --- a/engines/lastexpress/entities/mmeboutarel.cpp +++ b/engines/lastexpress/entities/mmeboutarel.cpp @@ -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; diff --git a/engines/lastexpress/entities/rebecca.cpp b/engines/lastexpress/entities/rebecca.cpp index b9c3f23401..4243554744 100644 --- a/engines/lastexpress/entities/rebecca.cpp +++ b/engines/lastexpress/entities/rebecca.cpp @@ -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); diff --git a/engines/lastexpress/entities/vassili.cpp b/engines/lastexpress/entities/vassili.cpp index 951c323f91..db16b0e032 100644 --- a/engines/lastexpress/entities/vassili.cpp +++ b/engines/lastexpress/entities/vassili.cpp @@ -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; } } diff --git a/engines/lastexpress/entities/verges.cpp b/engines/lastexpress/entities/verges.cpp index 20979ff9f9..4bebc205ec 100644 --- a/engines/lastexpress/entities/verges.cpp +++ b/engines/lastexpress/entities/verges.cpp @@ -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; diff --git a/engines/lastexpress/game/scenes.cpp b/engines/lastexpress/game/scenes.cpp index 2187d331b5..57578645d0 100644 --- a/engines/lastexpress/game/scenes.cpp +++ b/engines/lastexpress/game/scenes.cpp @@ -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: |