diff options
| author | Thorbjørn Lindeijer <thorbjorn@lindeijer.nl> | 2010-02-05 22:15:43 +0100 |
|---|---|---|
| committer | Thorbjørn Lindeijer <thorbjorn@lindeijer.nl> | 2010-02-06 21:25:37 +0100 |
| commit | 242e3bb8d92def67d5c30f2f2fd974cfb117ec04 (patch) | |
| tree | 7f247e04e238a0edc0281ec8ed85539b2be81137 /src/net/manaserv/itemhandler.cpp | |
| parent | 51e14c9d7aab75fe60f68d4943759eef66eafe9a (diff) | |
| download | mana-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/net/manaserv/itemhandler.cpp')
| -rw-r--r-- | src/net/manaserv/itemhandler.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/net/manaserv/itemhandler.cpp b/src/net/manaserv/itemhandler.cpp index 3d89487c..79a0caf0 100644 --- a/src/net/manaserv/itemhandler.cpp +++ b/src/net/manaserv/itemhandler.cpp @@ -21,11 +21,9 @@ #include "net/manaserv/itemhandler.h" -#include "engine.h" #include "flooritemmanager.h" #include "net/manaserv/protocol.h" - #include "net/manaserv/messagein.h" namespace ManaServ { @@ -56,7 +54,7 @@ void ItemHandler::handleMessage(Net::MessageIn &msg) if (itemId) { - floorItemManager->create(id, itemId, x / 32, y / 32, engine->getCurrentMap()); + floorItemManager->create(id, itemId, x / 32, y / 32); } else if (FloorItem *item = floorItemManager->findById(id)) { |