aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Horn2004-08-14 07:04:31 +0000
committerMax Horn2004-08-14 07:04:31 +0000
commit15e3d8cbe397c89db72602f94ca5ec12a64d670d (patch)
tree8e0ce3d9793d8e5771ce89de8a9ae00a84147b44
parent2ec0c553a61ee56444046a10dae432100f7ea8b7 (diff)
downloadscummvm-rg350-15e3d8cbe397c89db72602f94ca5ec12a64d670d.tar.gz
scummvm-rg350-15e3d8cbe397c89db72602f94ca5ec12a64d670d.tar.bz2
scummvm-rg350-15e3d8cbe397c89db72602f94ca5ec12a64d670d.zip
whitespace
svn-id: r14600
-rw-r--r--scumm/script.cpp2
-rw-r--r--scumm/script_v2.cpp1
-rw-r--r--scumm/script_v6.cpp1
3 files changed, 1 insertions, 3 deletions
diff --git a/scumm/script.cpp b/scumm/script.cpp
index d9c816681c..ee244ef5af 100644
--- a/scumm/script.cpp
+++ b/scumm/script.cpp
@@ -855,7 +855,7 @@ void ScummEngine::killScriptsAndResources() {
ss->status = ssDead;
} else if (ss->where == WIO_LOCAL) {
if (ss->cutsceneOverride) {
- if ( _version >= 5)
+ if (_version >= 5)
warning("Script %d stopped with active cutscene/override in exit", ss->number);
ss->cutsceneOverride = 0;
}
diff --git a/scumm/script_v2.cpp b/scumm/script_v2.cpp
index 16e7753f21..b842a1a44d 100644
--- a/scumm/script_v2.cpp
+++ b/scumm/script_v2.cpp
@@ -448,7 +448,6 @@ void ScummEngine_v2::writeVar(uint var, int value) {
// script 89, script 164 isn't reran to redraw it. Why? Dunno. Hack? Yes.
if ((var == 175) && (_gameId == GID_MANIAC) && (vm.slot[_currentScript].number == 89))
runScript(164, 0, 0, 0);
-
}
void ScummEngine_v2::getResultPosIndirect() {
diff --git a/scumm/script_v6.cpp b/scumm/script_v6.cpp
index 99ae54451a..ce7a7b4256 100644
--- a/scumm/script_v6.cpp
+++ b/scumm/script_v6.cpp
@@ -394,7 +394,6 @@ int ScummEngine_v6::popRoomAndObj(int *room) {
obj = pop();
}
-
return obj;
}