aboutsummaryrefslogtreecommitdiff
path: root/engines/cruise/cruise_main.cpp
diff options
context:
space:
mode:
authorJohannes Schickel2010-01-25 01:39:44 +0000
committerJohannes Schickel2010-01-25 01:39:44 +0000
commitaed02365ec81e77b3c8aa4f4ecd9a9d3893326f2 (patch)
tree95f119e687a666f65aad5041910c43bdfd4f2929 /engines/cruise/cruise_main.cpp
parentec14cd6e6add76ce4f719edd7ce508d67ebd9f14 (diff)
downloadscummvm-rg350-aed02365ec81e77b3c8aa4f4ecd9a9d3893326f2.tar.gz
scummvm-rg350-aed02365ec81e77b3c8aa4f4ecd9a9d3893326f2.tar.bz2
scummvm-rg350-aed02365ec81e77b3c8aa4f4ecd9a9d3893326f2.zip
Strip trailing spaces/tabs.
svn-id: r47541
Diffstat (limited to 'engines/cruise/cruise_main.cpp')
-rw-r--r--engines/cruise/cruise_main.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/cruise/cruise_main.cpp b/engines/cruise/cruise_main.cpp
index f61d8f023a..92d484e241 100644
--- a/engines/cruise/cruise_main.cpp
+++ b/engines/cruise/cruise_main.cpp
@@ -93,7 +93,7 @@ void MemoryFree(void *v) {
memList.remove(p);
free(p - 8 - 64);
- } else
+ } else
free(v);
}
@@ -1163,7 +1163,7 @@ void callSubRelation(menuElementSubStruct *pMenuElement, int nOvl, int nObj) {
} else if (pHeader->type == RT_MSG) {
if (pHeader->obj2Number >= 0) {
- if ((pHeader->trackX !=-1) && (pHeader->trackY !=-1) &&
+ if ((pHeader->trackX !=-1) && (pHeader->trackY !=-1) &&
(pHeader->trackX != 9999) && (pHeader->trackY != 9999)) {
x = pHeader->trackX - 100;
y = pHeader->trackY - 150;
@@ -1192,7 +1192,7 @@ void callSubRelation(menuElementSubStruct *pMenuElement, int nOvl, int nObj) {
userWait = 1;
autoOvl = ovlIdx;
autoMsg = pHeader->id;
-
+
if ((narratorOvl > 0) && (pHeader->trackX != -1) && (pHeader->trackY != -1)) {
actorStruct *pTrack = findActor(&actorHead, narratorOvl, narratorIdx, 0);
@@ -1888,7 +1888,7 @@ void CruiseEngine::mainLoop() {
// Disable any mouse click used to end the user wait
currentMouseButton = 0;
- }
+ }
manageScripts(&relHead);
manageScripts(&procHead);