cleanup

svn-id: r11494

2 files changed, 1 insertions, 17 deletions

diff --git a/queen/logic.cpp b/queen/logic.cpp
index ffca3566a1..67ca80c1fa 100644
--- a/queen/logic.cpp
+++ b/queen/logic.cpp
@@ -1937,20 +1937,6 @@ void Logic::joeSpeak(uint16 descNum, bool objectType) {
 }
 
 
-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 @@ uint16 Logic::findObjectRoomNumber(uint16 zoneNum) const {
 	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];
diff --git a/queen/logic.h b/queen/logic.h
index eb74a80f4b..66122f3820 100644
--- a/queen/logic.h
+++ b/queen/logic.h
@@ -261,8 +261,6 @@ public:
 	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;