[Scummvm-cvs-logs] SF.net SVN: scummvm: [23697] scummvm/trunk/engines/lure

[dreammaster at users.sourceforge.net]

Revision: 23697
Author:   dreammaster
Date:     2006-08-07 06:28:19 -0700 (Mon, 07 Aug 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm/?rev=23697&view=rev

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

Modified Paths:
--------------
    scummvm/trunk/engines/lure/debugger.cpp
    scummvm/trunk/engines/lure/menu.cpp
Modified: scummvm/trunk/engines/lure/debugger.cpp
===================================================================
--- scummvm/trunk/engines/lure/debugger.cpp	2006-08-07 13:27:28 UTC (rev 23696)
+++ scummvm/trunk/engines/lure/debugger.cpp	2006-08-07 13:28:19 UTC (rev 23697)
@@ -150,7 +150,7 @@
 	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 @@
 				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 @@
 
 				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);

Modified: scummvm/trunk/engines/lure/menu.cpp
===================================================================
--- scummvm/trunk/engines/lure/menu.cpp	2006-08-07 13:27:28 UTC (rev 23696)
+++ scummvm/trunk/engines/lure/menu.cpp	2006-08-07 13:28:19 UTC (rev 23697)
@@ -251,7 +251,7 @@
 		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);
 		}
 	}
 	


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.