[Scummvm-cvs-logs] CVS: scummvm debug.cpp,1.28,1.29 script_v1.cpp,1.106,1.107

[James Brown]

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

Modified Files:
	debug.cpp script_v1.cpp 
Log Message:
Add paramless 'r' debug command to show the current room.



Index: debug.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/debug.cpp,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- debug.cpp	19 Apr 2002 11:12:27 -0000	1.28
+++ debug.cpp	11 May 2002 19:17:58 -0000	1.29
@@ -73,7 +73,7 @@
 					 "(q)uit -> quit the debugger\n"
 					 "(g)o [numframes] -> increase frame\n"
 					 "(a)ctor [actornum] -> show actor information\n"
-					 "(r)oom roomnum -> load room\n"
+					 "(r)oom [roomnum] -> load room\n"
 					 "(s)cripts -> show running scripts\n"
 					 "(b)oxes -> list and draw boxen\n"
 					 "(v)ariable -> set or show a variable value\n"
@@ -102,7 +102,7 @@
 		return true;
 	case CMD_LOAD_ROOM:
 		if (!_parameters[0]) {
-			printf("Enter a room number...\n");
+			printf("Current room: %d [%d]\n", _s->_currentRoom, _s->_roomResource);
 		} else {
 			int room = atoi(_parameters);
 			_s->actor[_s->_vars[_s->VAR_EGO]].room = room;

Index: script_v1.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/script_v1.cpp,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -d -r1.106 -r1.107
--- script_v1.cpp	11 May 2002 17:49:42 -0000	1.106
+++ script_v1.cpp	11 May 2002 19:17:58 -0000	1.107
@@ -1454,7 +1454,8 @@
 
 	while ((_opcode = fetchScriptByte()) != 0xFF) {
 		cls = getVarOrDirectWord(0x80);
-		b = getClass(act, cls);
+		if (cls)
+			b = getClass(act, cls);
 
 		if (cls & 0x80 && !b || !(cls & 0x80) && b)
 			cond = false;