* Removed Shape base class

* Reverted Rect to not derive from Shape
* ImageMap now just uses Polygon's

svn-id: r33680

1 files changed, 2 insertions, 4 deletions

diff --git a/common/image-map.h b/common/image-map.h
index eaf803178d..ee64d96ba1 100644
--- a/common/image-map.h
+++ b/common/image-map.h
@@ -28,7 +28,6 @@
 
 #include "common/hashmap.h"
 #include "common/hash-str.h"
-#include "common/rect.h"
 #include "common/polygon.h"
 
 namespace Common {
@@ -39,14 +38,13 @@ public:
 
 	~ImageMap();
 	
-	Rect *createRectArea(const String& id);
-	Polygon *createPolygonArea(const String& id);
+	Polygon *createArea(const String& id);
 	void removeArea(const String& id);
 	void removeAllAreas();
 	String findMapArea(int16 x, int16 y);
 
 protected:
-	HashMap<String, Shape*> _areas;
+	HashMap<String, Polygon*> _areas;
 };