aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--scumm/script_v6.cpp7
-rw-r--r--scumm/script_v6he.cpp12
2 files changed, 1 insertions, 18 deletions
diff --git a/scumm/script_v6.cpp b/scumm/script_v6.cpp
index 8c69af856f..588a64e78f 100644
--- a/scumm/script_v6.cpp
+++ b/scumm/script_v6.cpp
@@ -1544,7 +1544,6 @@ void ScummEngine_v6::o6_resourceRoutines() {
if (resid >= _numGlobalScripts)
break;
setResourceCounter(rtScript, resid, 0x7F);
- debug(5, "nuke script %d", resid);
break;
case 105: // SO_NUKE_SOUND
resid = pop();
@@ -2541,9 +2540,7 @@ void ScummEngine_v6::o6_kernelSetFunctions() {
_smushFrameRate = 14;
speed = 1000000 / _smushFrameRate;
- debug(1, "INSANE Arg: %d %d", args[1], args[2]);
-
- // INSANE mode 0: SMUSH movie playback
+ // SMUSH movie playback
if (args[1] == 0) {
assert(getStringAddressVar(VAR_VIDEONAME));
if (strcmp((char *)getStringAddressVar(VAR_VIDEONAME), "sq3.san") == 0)
@@ -2965,7 +2962,6 @@ void ScummEngine_v6::o6_stampObject() {
if (state == 0)
state = 255;
- //debug(6, "o6_stampObject: (%d at (%d,%d) scale %d)", object, x, y, state);
Actor *a = derefActor(object, "o6_stampObject");
a->scalex = state;
a->scaley = state;
@@ -2991,7 +2987,6 @@ void ScummEngine_v6::o6_stampObject() {
putState(object, state);
drawObject(objnum, 0);
- //debug(6, "o6_stampObject: (%d at (%d,%d) state %d)", object, x, y, state);
}
void ScummEngine_v6::o6_stopTalking() {
diff --git a/scumm/script_v6he.cpp b/scumm/script_v6he.cpp
index 293162124b..5392fc8a99 100644
--- a/scumm/script_v6he.cpp
+++ b/scumm/script_v6he.cpp
@@ -768,7 +768,6 @@ void ScummEngine_v6he::o6_kernelSetFunctions() {
}
void ScummEngine_v6he::virtScreenLoad(int resIdx, int x1, int y1, int x2, int y2) {
- debug(1, "ScummEngine_v6he::virtScreenLoad(%d, %d, %d, %d, %d)", resIdx, x1, y1, x2, y2);
vsUnpackCtx ctx;
memset(&ctx, 0, sizeof(ctx));
VirtScreen &vs = virtscr[kMainVirtScreen]; // XXX gdi_virtScreen = 0;
@@ -847,7 +846,6 @@ void ScummEngine_v6he::o6_kernelGetFunctions() {
}
int ScummEngine_v6he::virtScreenSave(byte *dst, int x1, int y1, int x2, int y2) {
- debug(1, "ScummEngine_v6he::virtScreenSave(%d, %d, %d, %d)", x1, y1, x2, y2);
int packedSize = 0;
VirtScreen &vs = virtscr[kMainVirtScreen]; // XXX gdi_virtScreen = 0;
@@ -984,14 +982,12 @@ void ScummEngine_v6he::o6_openFile() {
if (_hFileTable[slot].isOpen() == false)
slot = -1;
- debug(1, "%d = o6_openFile(\"%s\", %d)", slot, filename + r, mode);
}
push(slot);
}
void ScummEngine_v6he::o6_closeFile() {
int slot = pop();
- debug(1, "o6_closeFile(%d)", slot);
if (slot != -1)
_hFileTable[slot].close();
}
@@ -1057,8 +1053,6 @@ void ScummEngine_v6he::o6_readFile() {
int slot = pop();
int val;
- debug(1, "o6_readFile(%d, %d)", slot, size);
-
// Fatty Bear uses positive values
if ((_features & GF_PC) && (_gameId == GID_FBEAR))
size = -size;
@@ -1087,8 +1081,6 @@ void ScummEngine_v6he::o6_writeFile() {
int16 resID = pop();
int slot = pop();
- debug(1, "o6_writeFile(%d, %d, %d)", slot, resID, size);
-
// Fatty Bear uses positive values
if ((_features & GF_PC) && (_gameId == GID_FBEAR))
size = -size;
@@ -1134,8 +1126,6 @@ void ScummEngine_v6he::o6_seekFilePos() {
offset = pop();
slot = pop();
- debug(1, "o6_seekFile(%d, %d, %d)", slot, offset, mode);
-
switch (mode) {
case 1:
seekFilePos(slot, offset, 0);
@@ -1171,8 +1161,6 @@ void ScummEngine_v6he::seekFilePos(int slot, int offset, int mode) {
void ScummEngine_v6he::o6_readFilePos() {
int slot = pop();
- debug(1, "o6_tellFile(%d)", slot);
-
if (slot == -1) {
push(0);
return;