[Scummvm-cvs-logs] SF.net SVN: scummvm:[53953] scummvm/trunk/engines/gob

[drmccoy at users.sourceforge.net]

Revision: 53953
          http://scummvm.svn.sourceforge.net/scummvm/?rev=53953&view=rev
Author:   drmccoy
Date:     2010-10-30 17:28:54 +0000 (Sat, 30 Oct 2010)

Log Message:
-----------
GOB: Make Map::getItem()/setItem() nonvirtual

Modified Paths:
--------------
    scummvm/trunk/engines/gob/map.cpp
    scummvm/trunk/engines/gob/map.h

Modified: scummvm/trunk/engines/gob/map.cpp
===================================================================
--- scummvm/trunk/engines/gob/map.cpp	2010-10-30 17:28:27 UTC (rev 53952)
+++ scummvm/trunk/engines/gob/map.cpp	2010-10-30 17:28:54 UTC (rev 53953)
@@ -146,6 +146,24 @@
 	return _wayPoints[n];
 }
 
+int16 Map::getItem(int x, int y) const {
+	assert(_itemsMap);
+
+	x = CLIP<int>(x, 0, _mapWidth - 1);
+	y = CLIP<int>(y, 0, _mapHeight - 1);
+
+	return _itemsMap[y][x];
+}
+
+void Map::setItem(int x, int y, int16 item) {
+	assert(_itemsMap);
+
+	x = CLIP<int>(x, 0, _mapWidth - 1);
+	y = CLIP<int>(y, 0, _mapHeight - 1);
+
+	_itemsMap[y][x] = item;
+}
+
 void Map::placeItem(int16 x, int16 y, int16 id) {
 	if ((getItem(x, y) & 0xFF00) != 0)
 		setItem(x, y, (getItem(x, y) & 0xFF00) | id);

Modified: scummvm/trunk/engines/gob/map.h
===================================================================
--- scummvm/trunk/engines/gob/map.h	2010-10-30 17:28:27 UTC (rev 53952)
+++ scummvm/trunk/engines/gob/map.h	2010-10-30 17:28:54 UTC (rev 53953)
@@ -107,6 +107,8 @@
 	void findNearestWalkable(int16 &gobDestX, int16 &gobDestY,
 		int16 mouseX, int16 mouseY);
 
+	int16 getItem(int x, int y) const;
+	void setItem(int x, int y, int16 item);
 	void placeItem(int16 x, int16 y, int16 id);
 
 	Direction getDirection(int16 x0, int16 y0, int16 x1, int16 y1);
@@ -118,9 +120,6 @@
 
 	void loadMapsInitGobs();
 
-	virtual int16 getItem(int x, int y) = 0;
-	virtual void setItem(int x, int y, int16 item) = 0;
-
 	virtual void loadMapObjects(const char *avjFile) = 0;
 	virtual void findNearestToGob(Mult::Mult_Object *obj) = 0;
 	virtual void findNearestToDest(Mult::Mult_Object *obj) = 0;
@@ -168,23 +167,6 @@
 	virtual void findNearestToDest(Mult::Mult_Object *obj);
 	virtual void optimizePoints(Mult::Mult_Object *obj, int16 x, int16 y);
 
-	virtual int16 getItem(int x, int y) {
-		assert(_itemsMap);
-
-		x = CLIP<int>(x, 0, _mapWidth - 1);
-		y = CLIP<int>(y, 0, _mapHeight - 1);
-
-		return _itemsMap[y][x];
-	}
-	virtual void setItem(int x, int y, int16 item) {
-		assert(_itemsMap);
-
-		x = CLIP<int>(x, 0, _mapWidth - 1);
-		y = CLIP<int>(y, 0, _mapHeight - 1);
-
-		_itemsMap[y][x] = item;
-	}
-
 	Map_v1(GobEngine *vm);
 	virtual ~Map_v1();
 


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