[Scummvm-cvs-logs] CVS: scummvm/queen logic.h,1.77,1.78 logic.cpp,1.118,1.119

[Gregory Montoir]

Update of /cvsroot/scummvm/scummvm/queen
In directory sc8-pr-cvs1:/tmp/cvs-serv7323

Modified Files:
	logic.h logic.cpp 
Log Message:
cleanup

Index: logic.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/logic.h,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -d -r1.77 -r1.78
--- logic.h	3 Dec 2003 20:53:59 -0000	1.77
+++ logic.h	4 Dec 2003 13:21:25 -0000	1.78
@@ -261,8 +261,6 @@
 	void dialogue(const char *dlgFile, int personInRoom, char *cutaway);
 	void playCutaway(const char *cutFile, char *next = NULL);
 
-	const char *objectOrItemName(int16 obj) const;
-
 	Verb findVerbUnderCursor(int16 cursorx, int16 cursory) const;
 	uint16 findObjectUnderCursor(int16 cursorx, int16 cursory) const;
 

Index: logic.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/logic.cpp,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -d -r1.118 -r1.119
--- logic.cpp	3 Dec 2003 20:53:59 -0000	1.118
+++ logic.cpp	4 Dec 2003 13:21:26 -0000	1.119
@@ -1937,20 +1937,6 @@
 }
 
 
-const char* Logic::objectOrItemName(int16 obj) const {
-
-	uint16 name;
-	if (obj < 0) {
-		name = _itemData[ABS(obj)].name;
-	}
-	else {
-		name = _objectData[obj].name;
-	}
-	return _objName[name];
-
-}
-
-
 Verb Logic::findVerbUnderCursor(int16 cursorx, int16 cursory) const {
 
 	return Verb(PANEL_VERBS[zoneIn(ZONE_PANEL, cursorx, cursory)]);
@@ -1976,7 +1962,7 @@
 	debug(0, "Logic::findObjectRoomNumber(%X, %X)", zoneNum, objectMax);
 	if (zoneNum > objectMax) {
 		// this is an area box, check for associated object
-		uint16 obj = _area[_currentRoom][zoneNum - objectMax].object;
+		uint16 obj = currentRoomArea(zoneNum - objectMax)->object;
 		if (obj != 0 && objectData(obj)->name != 0) {
 			// there is an object, get its number
 			noun = obj - _roomData[_currentRoom];