[Scummvm-cvs-logs] SF.net SVN: scummvm: [21220] scummvm/trunk/engines/scumm
kirben at users.sourceforge.net
kirben at users.sourceforge.net
Sat Mar 11 17:07:14 CET 2006
Revision: 21220
Author: kirben
Date: 2006-03-11 17:06:23 -0800 (Sat, 11 Mar 2006)
ViewCVS: http://svn.sourceforge.net/scummvm/?rev=21220&view=rev
Log Message:
-----------
Revert mistaken commit of local debug code
Modified Paths:
--------------
scummvm/trunk/engines/scumm/he/script_v100he.cpp
scummvm/trunk/engines/scumm/he/script_v72he.cpp
scummvm/trunk/engines/scumm/he/sprite_he.cpp
scummvm/trunk/engines/scumm/script.cpp
Modified: scummvm/trunk/engines/scumm/he/script_v100he.cpp
===================================================================
--- scummvm/trunk/engines/scumm/he/script_v100he.cpp 2006-03-12 00:53:30 UTC (rev 21219)
+++ scummvm/trunk/engines/scumm/he/script_v100he.cpp 2006-03-12 01:06:23 UTC (rev 21220)
@@ -2640,11 +2640,9 @@
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
Modified: scummvm/trunk/engines/scumm/he/script_v72he.cpp
===================================================================
--- scummvm/trunk/engines/scumm/he/script_v72he.cpp 2006-03-12 00:53:30 UTC (rev 21219)
+++ scummvm/trunk/engines/scumm/he/script_v72he.cpp 2006-03-12 01:06:23 UTC (rev 21220)
@@ -621,8 +621,6 @@
len = resStrLen(string) + 1;
}
- printf("String %s\n", string);
-
// Decode string
num = 0;
val = 0;
Modified: scummvm/trunk/engines/scumm/he/sprite_he.cpp
===================================================================
--- scummvm/trunk/engines/scumm/he/sprite_he.cpp 2006-03-12 00:53:30 UTC (rev 21219)
+++ scummvm/trunk/engines/scumm/he/sprite_he.cpp 2006-03-12 01:06:23 UTC (rev 21220)
@@ -925,8 +925,8 @@
_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);
}
Modified: scummvm/trunk/engines/scumm/script.cpp
===================================================================
--- scummvm/trunk/engines/scumm/script.cpp 2006-03-12 00:53:30 UTC (rev 21219)
+++ scummvm/trunk/engines/scumm/script.cpp 2006-03-12 01:06:23 UTC (rev 21220)
@@ -516,16 +516,6 @@
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 @@
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)");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list