[Scummvm-cvs-logs] CVS: scummvm/scumm script.cpp,1.48,1.49

Max Horn fingolfin at users.sourceforge.net
Fri Mar 7 19:53:05 CET 2003


Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv3725

Modified Files:
	script.cpp 
Log Message:
removed valgrind hack again

Index: script.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script.cpp,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -d -r1.48 -r1.49
--- script.cpp	7 Mar 2003 23:49:59 -0000	1.48
+++ script.cpp	8 Mar 2003 03:52:37 -0000	1.49
@@ -467,13 +467,7 @@
 	writeVar(_resultVarNumber, value);
 }
 
-int my_dummy_global = 0;
-
 void Scumm::push(int a) {
-// HACK to aid valgrind
-if (a > 0)
-	my_dummy_global++;
-
 	assert(_scummStackPos >= 0 && (unsigned int)_scummStackPos < ARRAYSIZE(_scummStack));
 	_scummStack[_scummStackPos++] = a;
 }
@@ -483,13 +477,7 @@
 		error("No items on stack to pop() for %s (0x%X) at [%d-%d]", getOpcodeDesc(_opcode), _opcode, _roomResource, vm.slot[_currentScript].number);
 	}
 
-	int a = _scummStack[--_scummStackPos];
-
-// HACK to aid valgrind
-if (a > 0)
-	my_dummy_global++;
-
-	return a;
+	return _scummStack[--_scummStackPos];
 }
 
 void Scumm::drawBox(int x, int y, int x2, int y2, int color) {





More information about the Scummvm-git-logs mailing list