libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-24 13:13:58 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

changed references to StringData::getString to use two parameter version rather than passing NULL values

Browse Source 
svn-id: r23697
This commit is contained in:
Paul Gilbert 2006-08-07 13:28:19 +00:00
parent d80d6157b6
commit 389c7a403c
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
engines/lure/debugger.cpp
View File

@ -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);

2
engines/lure/menu.cpp
View File

@ -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);
}
}