diff options
Diffstat (limited to 'engines/scumm')
| -rw-r--r-- | engines/scumm/debugger.cpp | 22 | ||||
| -rw-r--r-- | engines/scumm/dialogs.cpp | 4 | ||||
| -rw-r--r-- | engines/scumm/saveload.cpp | 4 |
3 files changed, 18 insertions, 12 deletions
diff --git a/engines/scumm/debugger.cpp b/engines/scumm/debugger.cpp index 0ebea94608..617c2ab85f 100644 --- a/engines/scumm/debugger.cpp +++ b/engines/scumm/debugger.cpp @@ -411,14 +411,15 @@ bool ScummDebugger::Cmd_PrintActor(int argc, const char **argv) { int i; Actor *a; - debugPrintf("+---------------------------------------------------------------+\n"); - debugPrintf("|# | x | y | w | h |elev|cos|box|mov| zp|frm|scl|dir| cls |\n"); - debugPrintf("+--+----+----+---+---+----+---+---+---+---+---+---+---+---------+\n"); + debugPrintf("+----------------------------------------------------------------------------+\n"); + debugPrintf("|# | name | x | y | w | h |elev|cos|box|mov| zp|frm|scl|dir| cls |\n"); + debugPrintf("+--+------------+----+----+---+---+----+---+---+---+---+---+---+---+---------+\n"); for (i = 1; i < _vm->_numActors; i++) { a = _vm->_actors[i]; + const byte *name = _vm->getObjOrActorName(_vm->actorToObj(a->_number)); if (a->_visible) - debugPrintf("|%2d|%4d|%4d|%3d|%3d|%4d|%3d|%3d|%3d|%3d|%3d|%3d|%3d|$%08x|\n", - a->_number, a->getRealPos().x, a->getRealPos().y, a->_width, a->_bottom - a->_top, + debugPrintf("|%2d|%-12.12s|%4d|%4d|%3d|%3d|%4d|%3d|%3d|%3d|%3d|%3d|%3d|%3d|$%08x|\n", + a->_number, name, a->getRealPos().x, a->getRealPos().y, a->_width, a->_bottom - a->_top, a->getElevation(), a->_costume, a->_walkbox, a->_moving, a->_forceClip, a->_frame, a->_scalex, a->getFacing(), _vm->_classData[a->_number]); @@ -431,17 +432,18 @@ bool ScummDebugger::Cmd_PrintObjects(int argc, const char **argv) { int i; ObjectData *o; debugPrintf("Objects in current room\n"); - debugPrintf("+---------------------------------+------------+\n"); - debugPrintf("|num | x | y |width|height|state|fl| cls |\n"); - debugPrintf("+----+----+----+-----+------+-----+--+---------+\n"); + debugPrintf("+-----------------------------------------------------------+\n"); + debugPrintf("|num | name | x | y |width|height|state|fl| cls |\n"); + debugPrintf("+----+------------+----+----+-----+------+-----+--+---------+\n"); for (i = 1; i < _vm->_numLocalObjects; i++) { o = &(_vm->_objs[i]); if (o->obj_nr == 0) continue; int classData = (_vm->_game.version != 0 ? _vm->_classData[o->obj_nr] : 0); - debugPrintf("|%4d|%4d|%4d|%5d|%6d|%5d|%2d|$%08x|\n", - o->obj_nr, o->x_pos, o->y_pos, o->width, o->height, o->state, + const byte *name = _vm->getObjOrActorName(o->obj_nr); + debugPrintf("|%4d|%-12.12s|%4d|%4d|%5d|%6d|%5d|%2d|$%08x|\n", + o->obj_nr, name, o->x_pos, o->y_pos, o->width, o->height, o->state, o->fl_object_index, classData); } debugPrintf("\n"); diff --git a/engines/scumm/dialogs.cpp b/engines/scumm/dialogs.cpp index 8a6b545bf2..9b09f426ef 100644 --- a/engines/scumm/dialogs.cpp +++ b/engines/scumm/dialogs.cpp @@ -149,8 +149,8 @@ static const ResString string_map_table_v6[] = { {91, "Unable to Find %s, (%c%d) Press Button."}, {92, "Error reading disk %c, (%c%d) Press Button."}, {93, "Game Paused. Press SPACE to Continue."}, - {94, "Are you sure you want to restart? (Y/N)"}, - {95, "Are you sure you want to quit? (Y/N)"}, + {94, "Are you sure you want to restart? (Y/N)Y"}, + {95, "Are you sure you want to quit? (Y/N)Y"}, {96, "Save"}, {97, "Load"}, {98, "Play"}, diff --git a/engines/scumm/saveload.cpp b/engines/scumm/saveload.cpp index 40dc83c7f3..0ab36d1a96 100644 --- a/engines/scumm/saveload.cpp +++ b/engines/scumm/saveload.cpp @@ -1137,6 +1137,10 @@ void ScummEngine::saveOrLoad(Serializer *s) { if (s->isLoading() && s->getVersion() < VER(14)) upgradeGfxUsageBits(); + // When loading, reset the ShakePos. Fixes one part of bug #7141 + if (s->isLoading() && s->getVersion() >= VER(10)) + _system->setShakePos(0); + // When loading, move the mouse to the saved mouse position. if (s->isLoading() && s->getVersion() >= VER(20)) { updateCursor(); |