Revert mistaken commit of local debug code

svn-id: r21220

4 files changed, 2 insertions, 57 deletions

diff --git a/engines/scumm/he/script_v100he.cpp b/engines/scumm/he/script_v100he.cpp
index 807203fd1c..7f38ef5423 100644
--- a/engines/scumm/he/script_v100he.cpp
+++ b/engines/scumm/he/script_v100he.cpp
@@ -2640,11 +2640,9 @@ void ScummEngine_v100he::o100_getSpriteInfo() {
 
 	byte subOp = fetchScriptByte();
 
-	printf("o100_getSpriteInfo: subOp %d\n", subOp);
 	switch (subOp) {
 	case 3:
 		spriteId = pop();
-		printf("spriteId is %d\n", spriteId);
 		if (spriteId)
 			push(_sprite->getSpriteFlagAutoAnim(spriteId));
 		else
diff --git a/engines/scumm/he/script_v72he.cpp b/engines/scumm/he/script_v72he.cpp
index 7ed98988d7..939dba168c 100644
--- a/engines/scumm/he/script_v72he.cpp
+++ b/engines/scumm/he/script_v72he.cpp
@@ -621,8 +621,6 @@ void ScummEngine_v72he::decodeScriptString(byte *dst, bool scriptString) {
 		len = resStrLen(string) + 1;
 	}
 
-	printf("String %s\n", string);
-
 	// Decode string
 	num = 0;
 	val = 0;
diff --git a/engines/scumm/he/sprite_he.cpp b/engines/scumm/he/sprite_he.cpp
index 37d7d59e23..8f17a89215 100644
--- a/engines/scumm/he/sprite_he.cpp
+++ b/engines/scumm/he/sprite_he.cpp
@@ -925,8 +925,8 @@ void Sprite::setGroupBounds(int spriteGroupId, int x1, int y1, int x2, int y2) {
 	_spriteGroups[spriteGroupId].flags |= kSGFClipBox;
 	_spriteGroups[spriteGroupId].bbox.left = x1;
 	_spriteGroups[spriteGroupId].bbox.top = y1;
-	_spriteGroups[spriteGroupId].bbox.right = x2 + 1;
-	_spriteGroups[spriteGroupId].bbox.bottom = y2 + 1;
+	_spriteGroups[spriteGroupId].bbox.right = x2;
+	_spriteGroups[spriteGroupId].bbox.bottom = y2;
 
 	redrawSpriteGroup(spriteGroupId);
 }
diff --git a/engines/scumm/script.cpp b/engines/scumm/script.cpp
index 45dad41365..d50b1120b4 100644
--- a/engines/scumm/script.cpp
+++ b/engines/scumm/script.cpp
@@ -516,16 +516,6 @@ int ScummEngine::fetchScriptDWordSigned() {
 int ScummEngine::readVar(uint var) {
 	int a;
 
-	// Putt Zoo
- 	if (var == 450)
- 		printf("Found HolyMoley\n");
- 
- 	if (_game.features & GF_16BIT_COLOR && var == 89) {
- 		error("Reading the video color depth");
- 	}
- 
- 
- 
 	debugC(DEBUG_VARS, "readvar(%d)", var);
 
 	if ((var & 0x2000) && (_game.version <= 5)) {
@@ -608,47 +598,6 @@ int ScummEngine::readVar(uint var) {
 void ScummEngine::writeVar(uint var, int value) {
 	debugC(DEBUG_VARS, "writeVar(%d, %d)", var, value);
 
-	// Used as mini game loads in spyfox2
-	if (_game.heversion >= 99 && var == 126) {
-		warning("Video method was set to %d", value);
-	}
-
-	// Used when chase loads level
-	if (_game.heversion >= 90 && var == 121) {
-		warning("Resource unknown set to %d", value);
-	}
-
-
-
-
-	if (_game.heversion >= 72 && var == 40 && value != 0) {
-		printf("Set script VAR40 to %d\n", value);
-	}
-
-	if (_game.heversion >= 80 && var == 90 && value != 0) {
-		printf("Set msg VAR90 to %s\n", getStringAddress(90));
-	}
-
-	if (_game.heversion >= 80 && var == 93) {
-		error("Set the default background color to %d", value);
-	}
-
-	if (_game.heversion >= 80 && var == 94) {
-		error("Set the default actor color to %d", value);
-	}
-
-	if (_game.heversion >= 80 && var == 87) {
-		error("Sound Script was set to %d", value);
-	}
-
-	if (_game.heversion >= 100 && var == 138) {
-		error("Main Script 2 was set to %d", value);
-	}
-
-	if (_game.heversion >= 100 && var == 139) {
-		error("Sprite bit was set to %d", value);
-	}
-
 	if (!(var & 0xF000)) {
 		checkRange(_numVariables - 1, 0, var, "Variable %d out of range(w)");