aboutsummaryrefslogtreecommitdiff
path: root/scumm
diff options
context:
space:
mode:
authorTravis Howell2004-08-29 03:19:44 +0000
committerTravis Howell2004-08-29 03:19:44 +0000
commit2b5c7c37b603137e260ad10710313dc8cf4a1136 (patch)
tree4bd033cb3396291e054fb853d8ef5c9219ab834d /scumm
parent8c8ed39b05ad3fb4d470c53cae5c05de38db16a8 (diff)
downloadscummvm-rg350-2b5c7c37b603137e260ad10710313dc8cf4a1136.tar.gz
scummvm-rg350-2b5c7c37b603137e260ad10710313dc8cf4a1136.tar.bz2
scummvm-rg350-2b5c7c37b603137e260ad10710313dc8cf4a1136.zip
Clean up
svn-id: r14824
Diffstat (limited to 'scumm')
-rw-r--r--scumm/script_v72he.cpp6
-rw-r--r--scumm/string.cpp4
2 files changed, 5 insertions, 5 deletions
diff --git a/scumm/script_v72he.cpp b/scumm/script_v72he.cpp
index 9513f761dd..91ed426497 100644
--- a/scumm/script_v72he.cpp
+++ b/scumm/script_v72he.cpp
@@ -899,7 +899,7 @@ void ScummEngine_v72he::o72_unknownCE() {
int b = pop();
int c = pop();
int d = pop();
- warning("o72_unknownCE stub (%d, %d, %d, %d)", d, c, b, a);
+ debug(1,"o72_unknownCE stub (%d, %d, %d, %d)", d, c, b, a);
}
void ScummEngine_v72he::shuffleArray(int num, int minIdx, int maxIdx) {
@@ -1283,13 +1283,13 @@ void ScummEngine_v72he::o72_unknownFB() {
pop();
break;
}
- warning("o72_unknownFB stub");
+ debug(1, "o72_unknownFB stub");
}
void ScummEngine_v72he::o72_unknownFC() {
int a = pop();
int b = pop();
- warning("o7_unknownFB stub (%d, %d)", b, a);
+ debug(1,"o7_unknownFC stub (%d, %d)", b, a);
push(0);
}
diff --git a/scumm/string.cpp b/scumm/string.cpp
index 96311238ad..c9fedee288 100644
--- a/scumm/string.cpp
+++ b/scumm/string.cpp
@@ -249,12 +249,12 @@ void ScummEngine::CHARSET_1() {
_sound->talkSound(talk_sound_a, talk_sound_b, 2);
break;
- case 110:
- goto newLine;
case 104:
_haveMsg = 0;
_keepText = true;
break;
+ case 110:
+ goto newLine;
case 119:
if (_haveMsg != 0xFE)
_haveMsg = 0xFF;