summaryrefslogtreecommitdiff
path: root/src/flooritemmanager.h
diff options
context:
space:
mode:
authorThorbjørn Lindeijer <thorbjorn@lindeijer.nl>2010-02-05 22:15:43 +0100
committerThorbjørn Lindeijer <thorbjorn@lindeijer.nl>2010-02-06 21:25:37 +0100
commit242e3bb8d92def67d5c30f2f2fd974cfb117ec04 (patch)
tree7f247e04e238a0edc0281ec8ed85539b2be81137 /src/flooritemmanager.h
parent51e14c9d7aab75fe60f68d4943759eef66eafe9a (diff)
downloadmana-242e3bb8d92def67d5c30f2f2fd974cfb117ec04.tar.gz
mana-242e3bb8d92def67d5c30f2f2fd974cfb117ec04.tar.bz2
mana-242e3bb8d92def67d5c30f2f2fd974cfb117ec04.tar.xz
mana-242e3bb8d92def67d5c30f2f2fd974cfb117ec04.zip
Merged the Engine class into the Game class
There was little point in keeping the Engine class separate. It wasn't an engine at all, but only kept track of the currently active map, a job more suitable for the Game class anyway.
Diffstat (limited to 'src/flooritemmanager.h')
-rw-r--r--src/flooritemmanager.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/flooritemmanager.h b/src/flooritemmanager.h
index 704b39fd..725eb10c 100644
--- a/src/flooritemmanager.h
+++ b/src/flooritemmanager.h
@@ -32,14 +32,14 @@ class FloorItemManager
public:
~FloorItemManager();
- FloorItem* create(int id, int itemId, int x, int y, Map *map);
+ FloorItem *create(int id, int itemId, int x, int y);
void destroy(FloorItem *item);
void clear();
- FloorItem* findById(int id);
- FloorItem* findByCoordinates(int x, int y);
+ FloorItem *findById(int id) const;
+ FloorItem *findByCoordinates(int x, int y) const;
private:
typedef std::list<FloorItem*> FloorItems;