diff options
| -rw-r--r-- | debug.cpp | 4 | ||||
| -rw-r--r-- | script_v1.cpp | 3 |
2 files changed, 4 insertions, 3 deletions
@@ -73,7 +73,7 @@ bool ScummDebugger::do_command() "(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 @@ bool ScummDebugger::do_command() 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; diff --git a/script_v1.cpp b/script_v1.cpp index f66a9000f7..607bdb11f3 100644 --- a/script_v1.cpp +++ b/script_v1.cpp @@ -1454,7 +1454,8 @@ void Scumm::o5_ifClassOfIs() 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; |