diff options
| author | Paul Gilbert | 2006-08-07 13:28:19 +0000 |
|---|---|---|
| committer | Paul Gilbert | 2006-08-07 13:28:19 +0000 |
| commit | 389c7a403c42724ecd53493aa037829c3e46e1a0 (patch) | |
| tree | 2f5990725fc6c7c74a14eaacdbf5c7bf23f0bcbb /engines | |
| parent | d80d6157b636a320d338b91f09c372a59e8f0592 (diff) | |
| download | scummvm-rg350-389c7a403c42724ecd53493aa037829c3e46e1a0.tar.gz scummvm-rg350-389c7a403c42724ecd53493aa037829c3e46e1a0.tar.bz2 scummvm-rg350-389c7a403c42724ecd53493aa037829c3e46e1a0.zip | |
changed references to StringData::getString to use two parameter version rather than passing NULL values
svn-id: r23697
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/lure/debugger.cpp | 6 | ||||
| -rw-r--r-- | engines/lure/menu.cpp | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/engines/lure/debugger.cpp b/engines/lure/debugger.cpp index 8795c3ceb9..63a9fab43c 100644 --- a/engines/lure/debugger.cpp +++ b/engines/lure/debugger.cpp @@ -150,7 +150,7 @@ bool Debugger::cmd_listRooms(int argc, const char **argv) { DebugPrintf("Available rooms are:\n"); for (i = rooms.begin(); i != rooms.end(); ++i) { RoomData *room = *i; - strings.getString(room->roomNumber, buffer, NULL, NULL); + strings.getString(room->roomNumber, buffer); // DEBUG: Explictly note the second drawbridge room as "Alt" for now if (ctr == 42) { strcat(buffer, " (alt)"); } @@ -271,7 +271,7 @@ bool Debugger::cmd_hotspots(int argc, const char **argv) { Hotspot *hotspot = *i; if (hotspot->nameId() == 0) strcpy(buffer, "none"); - else strings.getString(hotspot->nameId(), buffer, NULL, NULL); + else strings.getString(hotspot->nameId(), buffer); DebugPrintf("%4xh - %s pos=(%d,%d,%d)\n", hotspot->hotspotId(), buffer, hotspot->x(), hotspot->y(), hotspot->roomNumber()); @@ -286,7 +286,7 @@ bool Debugger::cmd_hotspots(int argc, const char **argv) { if (hotspot->roomNumber == roomNumber) { if (hotspot->nameId == 0) strcpy(buffer, "none"); - else strings.getString(hotspot->nameId, buffer, NULL, NULL); + else strings.getString(hotspot->nameId, buffer); DebugPrintf("%4xh - %s pos=(%d,%d,%d)\n", hotspot->hotspotId, buffer, hotspot->startX, hotspot->startY, hotspot->roomNumber); diff --git a/engines/lure/menu.cpp b/engines/lure/menu.cpp index eb9c1f591b..95aa541435 100644 --- a/engines/lure/menu.cpp +++ b/engines/lure/menu.cpp @@ -251,7 +251,7 @@ uint16 PopupMenu::ShowInventory() { if (hotspot->roomNumber == PLAYER_ID) { idList[itemCtr] = hotspot->hotspotId; char *hotspotName = itemNames[itemCtr++] = (char *) malloc(MAX_HOTSPOT_NAME_SIZE); - strings.getString(hotspot->nameId, hotspotName, NULL, NULL); + strings.getString(hotspot->nameId, hotspotName); } } |