[Scummvm-cvs-logs] SF.net SVN: scummvm:[53618] scummvm/trunk/engines/lastexpress
eriktorbjorn at users.sourceforge.net
eriktorbjorn at users.sourceforge.net
Tue Oct 19 21:54:15 CEST 2010
Revision: 53618
http://scummvm.svn.sourceforge.net/scummvm/?rev=53618&view=rev
Author: eriktorbjorn
Date: 2010-10-19 19:54:15 +0000 (Tue, 19 Oct 2010)
Log Message:
-----------
LASTEXPRESS: Changed some spaces to tabs
Modified Paths:
--------------
scummvm/trunk/engines/lastexpress/entities/abbot.cpp
scummvm/trunk/engines/lastexpress/entities/kahina.cpp
scummvm/trunk/engines/lastexpress/entities/kronos.cpp
scummvm/trunk/engines/lastexpress/entities/mertens.cpp
scummvm/trunk/engines/lastexpress/entities/mmeboutarel.cpp
scummvm/trunk/engines/lastexpress/entities/rebecca.cpp
scummvm/trunk/engines/lastexpress/entities/vassili.cpp
scummvm/trunk/engines/lastexpress/entities/verges.cpp
scummvm/trunk/engines/lastexpress/game/scenes.cpp
Modified: scummvm/trunk/engines/lastexpress/entities/abbot.cpp
===================================================================
--- scummvm/trunk/engines/lastexpress/entities/abbot.cpp 2010-10-19 17:03:36 UTC (rev 53617)
+++ scummvm/trunk/engines/lastexpress/entities/abbot.cpp 2010-10-19 19:54:15 UTC (rev 53618)
@@ -269,7 +269,7 @@
case kAction192054567:
setCallback(1);
- setup_callbackActionRestaurantOrSalon();
+ setup_callbackActionRestaurantOrSalon();
break;
}
}
@@ -406,7 +406,7 @@
getData()->location = kLocationInsideCompartment;
setCallback(7);
- setup_draw("029B");
+ setup_draw("029B");
break;
}
}
Modified: scummvm/trunk/engines/lastexpress/entities/kahina.cpp
===================================================================
--- scummvm/trunk/engines/lastexpress/entities/kahina.cpp 2010-10-19 17:03:36 UTC (rev 53617)
+++ scummvm/trunk/engines/lastexpress/entities/kahina.cpp 2010-10-19 19:54:15 UTC (rev 53618)
@@ -206,7 +206,7 @@
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)) {
Modified: scummvm/trunk/engines/lastexpress/entities/kronos.cpp
===================================================================
--- scummvm/trunk/engines/lastexpress/entities/kronos.cpp 2010-10-19 17:03:36 UTC (rev 53617)
+++ scummvm/trunk/engines/lastexpress/entities/kronos.cpp 2010-10-19 19:54:15 UTC (rev 53618)
@@ -160,8 +160,8 @@
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;
}
Modified: scummvm/trunk/engines/lastexpress/entities/mertens.cpp
===================================================================
--- scummvm/trunk/engines/lastexpress/entities/mertens.cpp 2010-10-19 17:03:36 UTC (rev 53617)
+++ scummvm/trunk/engines/lastexpress/entities/mertens.cpp 2010-10-19 19:54:15 UTC (rev 53618)
@@ -570,7 +570,7 @@
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;
Modified: scummvm/trunk/engines/lastexpress/entities/mmeboutarel.cpp
===================================================================
--- scummvm/trunk/engines/lastexpress/entities/mmeboutarel.cpp 2010-10-19 17:03:36 UTC (rev 53617)
+++ scummvm/trunk/engines/lastexpress/entities/mmeboutarel.cpp 2010-10-19 19:54:15 UTC (rev 53618)
@@ -418,7 +418,7 @@
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;
Modified: scummvm/trunk/engines/lastexpress/entities/rebecca.cpp
===================================================================
--- scummvm/trunk/engines/lastexpress/entities/rebecca.cpp 2010-10-19 17:03:36 UTC (rev 53617)
+++ scummvm/trunk/engines/lastexpress/entities/rebecca.cpp 2010-10-19 19:54:15 UTC (rev 53618)
@@ -1345,7 +1345,7 @@
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);
Modified: scummvm/trunk/engines/lastexpress/entities/vassili.cpp
===================================================================
--- scummvm/trunk/engines/lastexpress/entities/vassili.cpp 2010-10-19 17:03:36 UTC (rev 53617)
+++ scummvm/trunk/engines/lastexpress/entities/vassili.cpp 2010-10-19 19:54:15 UTC (rev 53618)
@@ -350,16 +350,16 @@
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;
}
}
Modified: scummvm/trunk/engines/lastexpress/entities/verges.cpp
===================================================================
--- scummvm/trunk/engines/lastexpress/entities/verges.cpp 2010-10-19 17:03:36 UTC (rev 53617)
+++ scummvm/trunk/engines/lastexpress/entities/verges.cpp 2010-10-19 19:54:15 UTC (rev 53618)
@@ -336,7 +336,7 @@
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;
Modified: scummvm/trunk/engines/lastexpress/game/scenes.cpp
===================================================================
--- scummvm/trunk/engines/lastexpress/game/scenes.cpp 2010-10-19 17:03:36 UTC (rev 53617)
+++ scummvm/trunk/engines/lastexpress/game/scenes.cpp 2010-10-19 19:54:15 UTC (rev 53618)
@@ -216,7 +216,7 @@
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 @@
if (getState()->sceneUseBackup)
getState()->sceneBackup = getSceneIndexFromPosition(car, position);
else
- loadSceneFromPosition(car, position);
- }
+ loadSceneFromPosition(car, position);
+ }
}
//////////////////////////////////////////////////////////////////////////
@@ -1176,7 +1176,7 @@
break;
case Scene::kTypeReadText:
- getSound()->readText(scene->param1);
+ getSound()->readText(scene->param1);
break;
case Scene::kType133:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list