diff options
| author | Torbjörn Andersson | 2006-07-08 20:45:01 +0000 |
|---|---|---|
| committer | Torbjörn Andersson | 2006-07-08 20:45:01 +0000 |
| commit | 7bfaa0db78b79c555fc1137de4a5964beca9d16e (patch) | |
| tree | 5c9079aa73c7653b4055a807870f81c9694550bf /engines/sword2/console.cpp | |
| parent | 8edc7ce1f74232be366957553cbf224f462576b4 (diff) | |
| download | scummvm-rg350-7bfaa0db78b79c555fc1137de4a5964beca9d16e.tar.gz scummvm-rg350-7bfaa0db78b79c555fc1137de4a5964beca9d16e.tar.bz2 scummvm-rg350-7bfaa0db78b79c555fc1137de4a5964beca9d16e.zip | |
Cleanup
svn-id: r23439
Diffstat (limited to 'engines/sword2/console.cpp')
| -rw-r--r-- | engines/sword2/console.cpp | 36 |
1 files changed, 15 insertions, 21 deletions
diff --git a/engines/sword2/console.cpp b/engines/sword2/console.cpp index b95c50653a..02f85418ad 100644 --- a/engines/sword2/console.cpp +++ b/engines/sword2/console.cpp @@ -434,44 +434,41 @@ bool Debugger::Cmd_ResLook(int argc, const char **argv) { } // Open up the resource and take a look inside! - uint8 type = _vm->_resman->fetchType(res);; - byte name[NAME_LEN]; - - _vm->_resman->fetchName(res, name); + uint8 type = _vm->_resman->fetchType(res); switch (type) { case ANIMATION_FILE: - DebugPrintf("<anim> %s\n", name); + DebugPrintf("<anim> %s\n", _vm->_resman->fetchName(res)); break; case SCREEN_FILE: - DebugPrintf("<layer> %s\n", name); + DebugPrintf("<layer> %s\n", _vm->_resman->fetchName(res)); break; case GAME_OBJECT: - DebugPrintf("<game object> %s\n", name); + DebugPrintf("<game object> %s\n", _vm->_resman->fetchName(res)); break; case WALK_GRID_FILE: - DebugPrintf("<walk grid> %s\n", name); + DebugPrintf("<walk grid> %s\n", _vm->_resman->fetchName(res)); break; case GLOBAL_VAR_FILE: - DebugPrintf("<global variables> %s\n", name); + DebugPrintf("<global variables> %s\n", _vm->_resman->fetchName(res)); break; case PARALLAX_FILE_null: - DebugPrintf("<parallax file NOT USED!> %s\n", name); + DebugPrintf("<parallax file NOT USED!> %s\n", _vm->_resman->fetchName(res)); break; case RUN_LIST: - DebugPrintf("<run list> %s\n", name); + DebugPrintf("<run list> %s\n", _vm->_resman->fetchName(res)); break; case TEXT_FILE: - DebugPrintf("<text file> %s\n", name); + DebugPrintf("<text file> %s\n", _vm->_resman->fetchName(res)); break; case SCREEN_MANAGER: - DebugPrintf("<screen manager> %s\n", name); + DebugPrintf("<screen manager> %s\n", _vm->_resman->fetchName(res)); break; case MOUSE_FILE: - DebugPrintf("<mouse pointer> %s\n", name); + DebugPrintf("<mouse pointer> %s\n", _vm->_resman->fetchName(res)); break; case ICON_FILE: - DebugPrintf("<menu icon> %s\n", name); + DebugPrintf("<menu icon> %s\n", _vm->_resman->fetchName(res)); break; default: DebugPrintf("unrecognised fileType %d\n", type); @@ -511,9 +508,7 @@ bool Debugger::Cmd_RunList(int argc, const char **argv) { if (!res) break; - byte name[NAME_LEN]; - - DebugPrintf("%d %s\n", res, _vm->_resman->fetchName(res, name)); + DebugPrintf("%d %s\n", res, _vm->_resman->fetchName(res)); } _vm->_resman->closeResource(runList); @@ -786,12 +781,11 @@ bool Debugger::Cmd_Events(int argc, const char **argv) { for (uint32 i = 0; i < MAX_events; i++) { if (eventList[i].id) { - byte buf[NAME_LEN]; uint32 target = eventList[i].id; uint32 script = eventList[i].interact_id; - DebugPrintf("slot %2d: id = %s (%d)\n", i, _vm->_resman->fetchName(target, buf), target); - DebugPrintf(" script = %s (%d) pos %d\n", _vm->_resman->fetchName(script / 65536, buf), script / 65536, script % 65536); + DebugPrintf("slot %2d: id = %s (%d)\n", i, _vm->_resman->fetchName(target), target); + DebugPrintf(" script = %s (%d) pos %d\n", _vm->_resman->fetchName(script / 65536), script / 65536, script % 65536); } } |