[Scummvm-cvs-logs] CVS: scummvm/scumm script.cpp,1.6,1.7

James Brown ender at users.sourceforge.net
Sat Nov 2 04:22:13 CET 2002


Update of /cvsroot/scummvm/scummvm/scumm
In directory usw-pr-cvs1:/tmp/cvs-serv7800/scumm

Modified Files:
	script.cpp 
Log Message:
Make stack problems a little more verbose


Index: script.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- script.cpp	27 Oct 2002 09:06:20 -0000	1.6
+++ script.cpp	2 Nov 2002 12:20:41 -0000	1.7
@@ -843,7 +843,10 @@
 
 int Scumm::pop()
 {
-	assert(_scummStackPos > 0 && (unsigned int)_scummStackPos <= ARRAYSIZE(_scummStack));
+	if ((_scummStackPos > 0) && ((unsigned int)_scummStackPos <= ARRAYSIZE(_scummStack))) {
+		error("No items on stack to pop() for %s (0x%X) at [%d-%d]\n", _opcodes_lookup[_opcode], _opcode, _roomResource, vm.slot[_currentScript].number);
+	}
+
 	return _scummStack[--_scummStackPos];
 }
 





More information about the Scummvm-git-logs mailing list