[Scummvm-cvs-logs] SF.net SVN: scummvm: [24572] scummvm/trunk/engines/scumm/debugger.cpp

fingolfin at users.sourceforge.net fingolfin at users.sourceforge.net
Sun Oct 29 19:43:22 CET 2006


Revision: 24572
          http://svn.sourceforge.net/scummvm/?rev=24572&view=rev
Author:   fingolfin
Date:     2006-10-29 10:43:16 -0800 (Sun, 29 Oct 2006)

Log Message:
-----------
SCUMM: Avoid crash in debugger when omitting the state value in 'object state VALUE'

Modified Paths:
--------------
    scummvm/trunk/engines/scumm/debugger.cpp

Modified: scummvm/trunk/engines/scumm/debugger.cpp
===================================================================
--- scummvm/trunk/engines/scumm/debugger.cpp	2006-10-29 18:42:28 UTC (rev 24571)
+++ scummvm/trunk/engines/scumm/debugger.cpp	2006-10-29 18:43:16 UTC (rev 24572)
@@ -491,14 +491,14 @@
 		_vm->markObjectRectAsDirty(obj);
 		_vm->clearDrawObjectQueue();
 		_vm->runInventoryScript(obj);
-	} else if (!strcmp(argv[2], "state")) {
+	} else if (!strcmp(argv[2], "state") && argc == 4) {
 		_vm->putState(obj, atoi(argv[3]));
 		//is BgNeedsRedraw enough?
 		_vm->_bgNeedsRedraw = true;
 	} else if (!strcmp(argv[2], "name")) {
 		DebugPrintf("Name of object %d: %s\n", obj, _vm->getObjOrActorName(obj));
 	} else {
-		DebugPrintf("Unknown object command '%s'\nUse <pickup | state> as command\n", argv[2]);
+		DebugPrintf("Unknown object command '%s'\nUse <pickup | state | name> as command\n", argv[2]);
 	}
 
 	return true;


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