[Scummvm-cvs-logs] CVS: scummvm/scumm script.cpp,1.56,1.57 scumm.h,1.165,1.166 debugger.cpp,1.20,1.21

Jonathan Gray khalek at users.sourceforge.net
Sun Apr 20 07:29:04 CEST 2003


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

Modified Files:
	script.cpp scumm.h debugger.cpp 
Log Message:
work around strange problem that breaks fbpack when _showStack is a bool...

Index: script.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script.cpp,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -d -r1.56 -r1.57
--- script.cpp	20 Apr 2003 08:04:26 -0000	1.56
+++ script.cpp	20 Apr 2003 14:28:24 -0000	1.57
@@ -280,7 +280,7 @@
 	int c;
 	while (_currentScript != 0xFF) {
 		
-		if (_showStack == true) {
+		if (_showStack == 1) {
 			printf("Stack:");
 			for (c=0; c < _scummStackPos; c++) {
 				printf(" %d", _scummStack[c]); 

Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.h,v
retrieving revision 1.165
retrieving revision 1.166
diff -u -d -r1.165 -r1.166
--- scumm.h	20 Apr 2003 08:04:27 -0000	1.165
+++ scumm.h	20 Apr 2003 14:28:24 -0000	1.166
@@ -420,7 +420,8 @@
 
 	int16 _virtual_mouse_x, _virtual_mouse_y;
 	int _bootParam;
-	bool _dumpScripts, _hexdumpScripts, _showStack;
+	bool _dumpScripts, _hexdumpScripts;
+	int _showStack;
 	uint16 _debugMode, _soundCardType;
 
 	/* Not sure where this stuff goes */

Index: debugger.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/debugger.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- debugger.cpp	20 Apr 2003 08:04:26 -0000	1.20
+++ debugger.cpp	20 Apr 2003 14:28:25 -0000	1.21
@@ -335,7 +335,7 @@
 		_s->_hexdumpScripts = true;
 		Debug_Printf("Script hex dumping on\n");
 	} else if (!strncmp(argv[1], "sta", 3)) {
-		_s->_showStack = true;
+		_s->_showStack = 1;
 		Debug_Printf("Stack tracing on\n");
 	} else {
 		Debug_Printf("Unknown show parameter '%s'\n", argv[1]);
@@ -354,7 +354,7 @@
 		_s->_hexdumpScripts = false;
 		Debug_Printf("Script hex dumping off\n");
 	} else if (!strncmp(argv[1], "sta", 3)) {
-		_s->_showStack = false;
+		_s->_showStack = 0;
 		Debug_Printf("Stack tracing off\n");
 	} else {
 		Debug_Printf("Unknown hide parameter '%s'\n", argv[1]);





More information about the Scummvm-git-logs mailing list