20 files changed, 261 insertions, 182 deletions

diff --git a/src/net/manaserv/beinghandler.cpp b/src/net/manaserv/beinghandler.cpp
index 8df9a8ab..63c1e13f 100644
--- a/src/net/manaserv/beinghandler.cpp
+++ b/src/net/manaserv/beinghandler.cpp
@@ -21,13 +21,12 @@
 
 #include "net/manaserv/beinghandler.h"
 
+#include "actorspritemanager.h"
 #include "being.h"
-#include "beingmanager.h"
 #include "client.h"
 #include "game.h"
 #include "localplayer.h"
 #include "log.h"
-#include "npc.h"
 #include "particle.h"
 
 #include "gui/okdialog.h"
@@ -121,7 +120,7 @@ Vector BeingHandler::giveSpeedInPixelsPerTicks(float speedInTilesPerSeconds)
     return speedInTicks;
 }
 
-static void handleLooks(Player *being, Net::MessageIn &msg)
+static void handleLooks(Being *being, Net::MessageIn &msg)
 {
     // Order of sent slots. Has to be in sync with the server code.
     static int const nb_slots = 4;
@@ -145,7 +144,7 @@ static void handleLooks(Player *being, Net::MessageIn &msg)
     {
         if (!(mask & (1 << i))) continue;
         int id = msg.readInt16();
-        being->setSprite(slots[i], id);
+        being->setSprite(slots[i], id,"", (slots[i] == SPRITE_WEAPON));
     }
 }
 
@@ -170,23 +169,23 @@ void BeingHandler::handleBeingEnterMessage(Net::MessageIn &msg)
             }
             else
             {
-                being = beingManager->createBeing(id, Being::PLAYER, 0);
+                being = actorSpriteManager->createBeing(id,
+                                                    ActorSprite::PLAYER, 0);
                 being->setName(name);
             }
-            Player *p = static_cast< Player * >(being);
             int hs = msg.readInt8(), hc = msg.readInt8();
-            p->setSprite(SPRITE_HAIR, hs * -1, ColorDB::get(hc));
-            p->setGender(msg.readInt8() == GENDER_MALE ?
-                    GENDER_MALE : GENDER_FEMALE);
-            handleLooks(p, msg);
+            being->setSprite(SPRITE_HAIR, hs * -1, ColorDB::get(hc));
+            being->setGender(msg.readInt8() == GENDER_MALE ?
+                             GENDER_MALE : GENDER_FEMALE);
+            handleLooks(being, msg);
         } break;
 
         case OBJECT_MONSTER:
         case OBJECT_NPC:
         {
             int subtype = msg.readInt16();
-            being = beingManager->createBeing(id, type == OBJECT_MONSTER ?
-                                    Being::MONSTER : Being::NPC, subtype);
+            being = actorSpriteManager->createBeing(id, type == OBJECT_MONSTER
+                           ? ActorSprite::MONSTER : ActorSprite::NPC, subtype);
             std::string name = msg.readString();
             if (name.length() > 0) being->setName(name);
         } break;
@@ -202,11 +201,11 @@ void BeingHandler::handleBeingEnterMessage(Net::MessageIn &msg)
 
 void BeingHandler::handleBeingLeaveMessage(Net::MessageIn &msg)
 {
-    Being *being = beingManager->findBeing(msg.readInt16());
+    Being *being = actorSpriteManager->findBeing(msg.readInt16());
     if (!being)
         return;
 
-    beingManager->destroyBeing(being);
+    actorSpriteManager->destroy(being);
 }
 
 void BeingHandler::handleBeingsMoveMessage(Net::MessageIn &msg)
@@ -215,7 +214,7 @@ void BeingHandler::handleBeingsMoveMessage(Net::MessageIn &msg)
     {
         int id = msg.readInt16();
         int flags = msg.readInt8();
-        Being *being = beingManager->findBeing(id);
+        Being *being = actorSpriteManager->findBeing(id);
         int sx = 0;
         int sy = 0;
         int speed = 0;
@@ -257,7 +256,7 @@ void BeingHandler::handleBeingsMoveMessage(Net::MessageIn &msg)
 
 void BeingHandler::handleBeingAttackMessage(Net::MessageIn &msg)
 {
-    Being *being = beingManager->findBeing(msg.readInt16());
+    Being *being = actorSpriteManager->findBeing(msg.readInt16());
     const int direction = msg.readInt8();
     const int attackType = msg.readInt8();
 
@@ -279,7 +278,7 @@ void BeingHandler::handleBeingsDamageMessage(Net::MessageIn &msg)
 {
     while (msg.getUnreadLength())
     {
-        Being *being = beingManager->findBeing(msg.readInt16());
+        Being *being = actorSpriteManager->findBeing(msg.readInt16());
         int damage = msg.readInt16();
         if (being)
         {
@@ -290,7 +289,7 @@ void BeingHandler::handleBeingsDamageMessage(Net::MessageIn &msg)
 
 void BeingHandler::handleBeingActionChangeMessage(Net::MessageIn &msg)
 {
-    Being *being = beingManager->findBeing(msg.readInt16());
+    Being *being = actorSpriteManager->findBeing(msg.readInt16());
     Being::Action action = (Being::Action) msg.readInt8();
     if (!being)
         return;
@@ -329,22 +328,21 @@ void BeingHandler::handleBeingActionChangeMessage(Net::MessageIn &msg)
 
 void BeingHandler::handleBeingLooksChangeMessage(Net::MessageIn &msg)
 {
-    Being *being = beingManager->findBeing(msg.readInt16());
-    if (!being || being->getType() != Being::PLAYER)
+    Being *being = actorSpriteManager->findBeing(msg.readInt16());
+    if (!being || being->getType() != ActorSprite::PLAYER)
         return;
-    Player *player = static_cast<Player *>(being);
-    handleLooks(player, msg);
+    handleLooks(being, msg);
     if (msg.getUnreadLength())
     {
         int style = msg.readInt16();
         int color = msg.readInt16();
-        player->setSprite(SPRITE_HAIR, style * -1, ColorDB::get(color));
+        being->setSprite(SPRITE_HAIR, style * -1, ColorDB::get(color));
     }
 }
 
 void BeingHandler::handleBeingDirChangeMessage(Net::MessageIn &msg)
 {
-    Being *being = beingManager->findBeing(msg.readInt16());
+    Being *being = actorSpriteManager->findBeing(msg.readInt16());
     if (!being)
         return;
     int data = msg.readInt8();
diff --git a/src/net/manaserv/buysellhandler.cpp b/src/net/manaserv/buysellhandler.cpp
index a4ce6aa0..c1efca0d 100644
--- a/src/net/manaserv/buysellhandler.cpp
+++ b/src/net/manaserv/buysellhandler.cpp
@@ -21,10 +21,9 @@
 
 #include "net/manaserv/buysellhandler.h"
 
-#include "beingmanager.h"
+#include "actorspritemanager.h"
 #include "item.h"
-#include "localplayer.h"
-#include "npc.h"
+#include "playerinfo.h"
 
 #include "gui/buy.h"
 #include "gui/chat.h"
@@ -49,8 +48,8 @@ BuySellHandler::BuySellHandler()
 
 void BuySellHandler::handleMessage(Net::MessageIn &msg)
 {
-    Being *being = beingManager->findBeing(msg.readInt16());
-    if (!being || being->getType() != Being::NPC)
+    Being *being = actorSpriteManager->findBeing(msg.readInt16());
+    if (!being || being->getType() != ActorSprite::NPC)
     {
         return;
     }
@@ -64,7 +63,7 @@ void BuySellHandler::handleMessage(Net::MessageIn &msg)
             BuyDialog* dialog = new BuyDialog(npcId);
 
             dialog->reset();
-            dialog->setMoney(player_node->getMoney());
+            dialog->setMoney(PlayerInfo::getAttribute(MONEY));
 
             while (msg.getUnreadLength())
             {
@@ -81,7 +80,7 @@ void BuySellHandler::handleMessage(Net::MessageIn &msg)
             SellDialog* dialog = new SellDialog(npcId);
 
             dialog->reset();
-            dialog->setMoney(player_node->getMoney());
+            dialog->setMoney(PlayerInfo::getAttribute(MONEY));
 
             while (msg.getUnreadLength())
             {
diff --git a/src/net/manaserv/charhandler.cpp b/src/net/manaserv/charhandler.cpp
index e6723226..7e401455 100644
--- a/src/net/manaserv/charhandler.cpp
+++ b/src/net/manaserv/charhandler.cpp
@@ -233,6 +233,7 @@ void CharHandler::handleCharacterSelectResponse(Net::MessageIn &msg)
 
         // Prevent the selected local player from being deleted
         player_node = mSelectedCharacter->dummy;
+        PlayerInfo::setBackend(mSelectedCharacter->data);
         mSelectedCharacter->dummy = 0;
 
         Client::setState(STATE_CONNECT_GAME);
@@ -319,17 +320,17 @@ void CharHandler::switchCharacter()
     gameHandler->quit(true);
 }
 
-int CharHandler::baseSprite() const
+unsigned int CharHandler::baseSprite() const
 {
     return SPRITE_BASE;
 }
 
-int CharHandler::hairSprite() const
+unsigned int CharHandler::hairSprite() const
 {
     return SPRITE_HAIR;
 }
 
-int CharHandler::maxSprite() const
+unsigned int CharHandler::maxSprite() const
 {
     return SPRITE_VECTOREND;
 }
@@ -355,14 +356,14 @@ void CharHandler::updateCharacters()
         player->setGender(info.gender);
         player->setSprite(SPRITE_HAIR, info.hairStyle * -1,
                           ColorDB::get(info.hairColor));
-        player->setLevel(info.level);
-        player->setCharacterPoints(info.characterPoints);
-        player->setCorrectionPoints(info.correctionPoints);
-        player->setMoney(info.money);
+        character->data.mAttributes[LEVEL] = info.level;
+        character->data.mAttributes[CHAR_POINTS] = info.characterPoints;
+        character->data.mAttributes[CORR_POINTS] = info.correctionPoints;
+        character->data.mAttributes[MONEY] = info.money;
 
         for (int i = 0; i < 7; i++)
         {
-            player->setAttributeBase(i, info.attribute[i], false);
+            character->data.mStats[i].base = info.attribute[i];
         }
 
         mCharacters.push_back(character);
diff --git a/src/net/manaserv/charhandler.h b/src/net/manaserv/charhandler.h
index 26a7bf4e..dac4a29e 100644
--- a/src/net/manaserv/charhandler.h
+++ b/src/net/manaserv/charhandler.h
@@ -65,11 +65,11 @@ class CharHandler : public MessageHandler, public Net::CharHandler
 
         void switchCharacter();
 
-        int baseSprite() const;
+        unsigned int baseSprite() const;
 
-        int hairSprite() const;
+        unsigned int hairSprite() const;
 
-        int maxSprite() const;
+        unsigned int maxSprite() const;
 
         void clear();
 
diff --git a/src/net/manaserv/chathandler.cpp b/src/net/manaserv/chathandler.cpp
index a452281f..aabe8bb4 100644
--- a/src/net/manaserv/chathandler.cpp
+++ b/src/net/manaserv/chathandler.cpp
@@ -21,11 +21,12 @@
 
 #include "net/manaserv/chathandler.h"
 
+#include "actorspritemanager.h"
 #include "being.h"
-#include "beingmanager.h"
 #include "client.h"
 #include "channel.h"
 #include "channelmanager.h"
+#include "eventmanager.h"
 
 #include "gui/chat.h"
 
@@ -149,11 +150,11 @@ void ChatHandler::handleGameChatMessage(Net::MessageIn &msg)
 
     if (id == 0)
     {
-        localChatTab->chatLog(chatMsg, BY_SERVER);
+        SERVER_NOTICE(chatMsg)
         return;
     }
 
-    Being *being = beingManager->findBeing(id);
+    Being *being = actorSpriteManager->findBeing(id);
 
     std::string mes;
     if (being)
@@ -164,7 +165,9 @@ void ChatHandler::handleGameChatMessage(Net::MessageIn &msg)
     else
         mes = "Unknown : " + chatMsg;
 
-    localChatTab->chatLog(mes, being == player_node ? BY_PLAYER : BY_OTHER);
+    Mana::Event event(being == player_node ? "Player" : "Being");
+    event.setString("message", mes);
+    Mana::EventManager::trigger("Chat", event);
 }
 
 void ChatHandler::handleEnterChannelResponse(Net::MessageIn &msg)
@@ -198,13 +201,13 @@ void ChatHandler::handleEnterChannelResponse(Net::MessageIn &msg)
     }
     else
     {
-        localChatTab->chatLog(_("Error joining channel."), BY_SERVER);
+        SERVER_NOTICE(_("Error joining channel."))
     }
 }
 
 void ChatHandler::handleListChannelsResponse(Net::MessageIn &msg)
 {
-    localChatTab->chatLog(_("Listing channels."), BY_SERVER);
+    SERVER_NOTICE(_("Listing channels."))
     while (msg.getUnreadLength())
     {
         std::string channelName = msg.readString();
@@ -214,9 +217,9 @@ void ChatHandler::handleListChannelsResponse(Net::MessageIn &msg)
         numUsers << msg.readInt16();
         channelName += " - ";
         channelName += numUsers.str();
-        localChatTab->chatLog(channelName, BY_SERVER);
+        SERVER_NOTICE(channelName)
     }
-    localChatTab->chatLog(_("End of channel list."), BY_SERVER);
+    SERVER_NOTICE(_("End of channel list."))
 }
 
 void ChatHandler::handlePrivateMessage(Net::MessageIn &msg)
@@ -224,13 +227,18 @@ void ChatHandler::handlePrivateMessage(Net::MessageIn &msg)
     std::string userNick = msg.readString();
     std::string chatMsg = msg.readString();
 
-    chatWindow->whisper(userNick, chatMsg);
+    Mana::Event event("Whisper");
+    event.setString("nick", userNick);
+    event.setString("message", chatMsg);
+    Mana::EventManager::trigger("Chat", event);
 }
 
 void ChatHandler::handleAnnouncement(Net::MessageIn &msg)
 {
     std::string chatMsg = msg.readString();
-    localChatTab->chatLog(chatMsg, BY_GM);
+    Mana::Event event("Announcement");
+    event.setString("message", chatMsg);
+    Mana::EventManager::trigger("Chat", event);
 }
 
 void ChatHandler::handleChatMessage(Net::MessageIn &msg)
@@ -341,7 +349,7 @@ void ChatHandler::handleWhoResponse(Net::MessageIn &msg)
         {
             break;
         }
-        localChatTab->chatLog(userNick, BY_SERVER);
+        SERVER_NOTICE(userNick)
     }
 }
 
diff --git a/src/net/manaserv/defines.h b/src/net/manaserv/defines.h
new file mode 100644
index 00000000..e97866df
--- /dev/null
+++ b/src/net/manaserv/defines.h
@@ -0,0 +1,76 @@
+/*
+ *  The Mana Client
+ *  Copyright (C) 2004-2009  The Mana World Development Team
+ *  Copyright (C) 2009-2010  The Mana Developers
+ *
+ *  This file is part of The Mana Client.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef MANASERV_DEFINES_H
+#define MANASERV_DEFINES_H
+
+/**
+ * Attributes used during combat. Available to all the beings.
+ */
+enum
+{
+BASE_ATTR_BEGIN = 0,
+    BASE_ATTR_PHY_ATK_MIN = BASE_ATTR_BEGIN,
+    BASE_ATTR_PHY_ATK_DELTA,
+                       /**< Physical attack power. */
+    BASE_ATTR_MAG_ATK, /**< Magical attack power. */
+    BASE_ATTR_PHY_RES, /**< Resistance to physical damage. */
+    BASE_ATTR_MAG_RES, /**< Resistance to magical damage. */
+    BASE_ATTR_EVADE,   /**< Ability to avoid hits. */
+    BASE_ATTR_HIT,     /**< Ability to hit stuff. */
+    BASE_ATTR_HP,      /**< Hit Points (Base value: maximum, Modded value: current) */
+    BASE_ATTR_HP_REGEN,/**< number of HP regenerated every 10 game ticks */
+    BASE_ATTR_END,
+    BASE_ATTR_NB = BASE_ATTR_END - BASE_ATTR_BEGIN,
+
+    BASE_ELEM_BEGIN = BASE_ATTR_END,
+    BASE_ELEM_NEUTRAL = BASE_ELEM_BEGIN,
+    BASE_ELEM_FIRE,
+    BASE_ELEM_WATER,
+    BASE_ELEM_EARTH,
+    BASE_ELEM_AIR,
+    BASE_ELEM_SACRED,
+    BASE_ELEM_DEATH,
+    BASE_ELEM_END,
+    BASE_ELEM_NB = BASE_ELEM_END - BASE_ELEM_BEGIN,
+
+    NB_BEING_ATTRIBUTES = BASE_ELEM_END
+};
+
+/**
+ * Attributes of characters. Used to derive being attributes.
+ */
+enum
+{
+    CHAR_ATTR_BEGIN = NB_BEING_ATTRIBUTES,
+    CHAR_ATTR_STRENGTH = CHAR_ATTR_BEGIN,
+    CHAR_ATTR_AGILITY,
+    CHAR_ATTR_DEXTERITY,
+    CHAR_ATTR_VITALITY,
+    CHAR_ATTR_INTELLIGENCE,
+    CHAR_ATTR_WILLPOWER,
+    CHAR_ATTR_END,
+    CHAR_ATTR_NB = CHAR_ATTR_END - CHAR_ATTR_BEGIN,
+
+    NB_CHARACTER_ATTRIBUTES = CHAR_ATTR_END
+};
+
+#endif // MANASERV_DEFINES_H
diff --git a/src/net/manaserv/effecthandler.cpp b/src/net/manaserv/effecthandler.cpp
index 27db9b59..c803b441 100644
--- a/src/net/manaserv/effecthandler.cpp
+++ b/src/net/manaserv/effecthandler.cpp
@@ -21,7 +21,7 @@
 
 #include "net/manaserv/effecthandler.h"
 
-#include "beingmanager.h"
+#include "actorspritemanager.h"
 #include "effectmanager.h"
 #include "log.h"
 
@@ -68,7 +68,7 @@ void EffectHandler::handleCreateEffectBeing(Net::MessageIn &msg)
 {
     int eid = msg.readInt16();
     int bid = msg.readInt16();
-    Being* b = beingManager->findBeing(bid);
+    Being* b = actorSpriteManager->findBeing(bid);
     if (b)
         effectManager->trigger(eid, b);
     else
diff --git a/src/net/manaserv/gamehandler.cpp b/src/net/manaserv/gamehandler.cpp
index 271fff15..65010ad3 100644
--- a/src/net/manaserv/gamehandler.cpp
+++ b/src/net/manaserv/gamehandler.cpp
@@ -109,16 +109,6 @@ void GameHandler::disconnect()
     chatHandler->disconnect();
 }
 
-void GameHandler::inGame()
-{
-    // TODO
-}
-
-void GameHandler::mapLoaded(const std::string &mapName)
-{
-    // TODO
-}
-
 void GameHandler::who()
 {
     // TODO
diff --git a/src/net/manaserv/gamehandler.h b/src/net/manaserv/gamehandler.h
index dde1748f..2e9f37fe 100644
--- a/src/net/manaserv/gamehandler.h
+++ b/src/net/manaserv/gamehandler.h
@@ -42,10 +42,6 @@ class GameHandler : public MessageHandler, public Net::GameHandler
 
         void disconnect();
 
-        void inGame();
-
-        void mapLoaded(const std::string &mapName);
-
         void who();
 
         void quit(bool reconnectAccount);
@@ -53,12 +49,15 @@ class GameHandler : public MessageHandler, public Net::GameHandler
         void quit() { quit(false); }
 
         void ping(int tick);
-        
+
         bool removeDeadBeings() const { return false; }
 
         void clear();
 
         void gameLoading();
+
+        /** The ManaServ protocol doesn't use the MP status bar. */
+        bool canUseMagicBar() const { return false; }
 };
 
 } // namespace ManaServ
diff --git a/src/net/manaserv/generalhandler.cpp b/src/net/manaserv/generalhandler.cpp
index 0d3073f1..210e3043 100644
--- a/src/net/manaserv/generalhandler.cpp
+++ b/src/net/manaserv/generalhandler.cpp
@@ -90,6 +90,9 @@ GeneralHandler::GeneralHandler():
     chatServerConnection = getConnection();
 
     generalHandler = this;
+
+    listen("Client");
+    listen("Game");
 }
 
 void GeneralHandler::load()
@@ -163,38 +166,40 @@ void GeneralHandler::flushNetwork()
     }
 }
 
-void GeneralHandler::guiWindowsLoaded()
-{
-    inventoryWindow->setSplitAllowed(true);
-    skillDialog->loadSkills("mana-skills.xml");
-    specialsWindow->loadSpecials("specials.xml");
-
-    player_node->setExpNeeded(100);
-
-    Stats::informStatusWindow();
-}
-
-void GeneralHandler::guiWindowsUnloaded()
-{
-    // TODO
-}
-
 void GeneralHandler::clearHandlers()
 {
     clearNetworkHandlers();
 }
 
-void GeneralHandler::stateChanged(State oldState, State newState)
+void GeneralHandler::event(const std::string &channel,
+                           const Mana::Event &event)
 {
-    if (newState == STATE_GAME)
+    if (channel == "Client")
     {
-        GameHandler *game = static_cast<GameHandler*>(Net::getGameHandler());
-        game->gameLoading();
+        int newState = event.getInt("newState");
+
+        if (newState == STATE_GAME)
+        {
+            GameHandler *game = static_cast<GameHandler*>(Net::getGameHandler());
+            game->gameLoading();
+        }
+        else if (newState == STATE_LOAD_DATA)
+        {
+            Stats::load();
+            Stats::informItemDB();
+        }
     }
-    else if (newState == STATE_LOAD_DATA)
+    else if (channel == "Game")
     {
-        Stats::load();
-        Stats::informItemDB();
+        if (event.getName() == "GuiWindowsLoaded")
+        {
+            inventoryWindow->setSplitAllowed(true);
+            skillDialog->loadSkills("mana-skills.xml");
+
+            PlayerInfo::setAttribute(EXP_NEEDED, 100);
+
+            Stats::informStatusWindow();
+        }
     }
 }
 
diff --git a/src/net/manaserv/generalhandler.h b/src/net/manaserv/generalhandler.h
index 58b95529..2a203e8c 100644
--- a/src/net/manaserv/generalhandler.h
+++ b/src/net/manaserv/generalhandler.h
@@ -22,6 +22,8 @@
 #ifndef NET_MANASERV_GENERALHANDLER_H
 #define NET_MANASERV_GENERALHANDLER_H
 
+#include "listener.h"
+
 #include "net/generalhandler.h"
 #include "net/net.h"
 
@@ -29,7 +31,7 @@
 
 namespace ManaServ {
 
-class GeneralHandler : public Net::GeneralHandler
+class GeneralHandler : public Net::GeneralHandler, public Mana::Listener
 {
     public:
         GeneralHandler();
@@ -42,13 +44,9 @@ class GeneralHandler : public Net::GeneralHandler
 
         void flushNetwork();
 
-        void guiWindowsLoaded();
-
-        void guiWindowsUnloaded();
-
         void clearHandlers();
 
-        void stateChanged(State oldState, State newState);
+        void event(const std::string &channel, const Mana::Event &event);
 
     protected:
         MessageHandlerPtr mBeingHandler;
diff --git a/src/net/manaserv/guildhandler.cpp b/src/net/manaserv/guildhandler.cpp
index 253efb01..1c9625bf 100644
--- a/src/net/manaserv/guildhandler.cpp
+++ b/src/net/manaserv/guildhandler.cpp
@@ -21,6 +21,7 @@
 
 #include "net/manaserv/guildhandler.h"
 
+#include "eventmanager.h"
 #include "guild.h"
 #include "log.h"
 #include "localplayer.h"
@@ -78,12 +79,12 @@ void GuildHandler::handleMessage(Net::MessageIn &msg)
             if (msg.readInt8() == ERRMSG_OK)
             {
                 // TODO - Acknowledge guild was created
-                localChatTab->chatLog(_("Guild created."));
+                SERVER_NOTICE(_("Guild created."))
                 joinedGuild(msg);
             }
             else
             {
-                localChatTab->chatLog(_("Error creating guild."));
+                SERVER_NOTICE(_("Error creating guild."))
             }
         } break;
 
@@ -93,7 +94,7 @@ void GuildHandler::handleMessage(Net::MessageIn &msg)
             if (msg.readInt8() == ERRMSG_OK)
             {
                 // TODO - Acknowledge invite was sent
-                localChatTab->chatLog(_("Invite sent."));
+                SERVER_NOTICE(_("Invite sent."))
             }
         } break;
 
@@ -200,12 +201,12 @@ void GuildHandler::handleMessage(Net::MessageIn &msg)
             if (msg.readInt8() == ERRMSG_OK)
             {
                 // promotion succeeded
-                localChatTab->chatLog(_("Member was promoted successfully."));
+                SERVER_NOTICE(_("Member was promoted successfully."))
             }
             else
             {
                 // promotion failed
-                localChatTab->chatLog(_("Failed to promote member."));
+                SERVER_NOTICE(_("Failed to promote member."))
             }
         }
 
@@ -275,9 +276,9 @@ void GuildHandler::invite(int guildId, const std::string &name)
     chatServerConnection->send(msg);
 }
 
-void GuildHandler::invite(int guildId, Player *player)
+void GuildHandler::invite(int guildId, Being *being)
 {
-    invite(guildId, player->getName());
+    invite(guildId, being->getName());
 }
 
 void GuildHandler::inviteResponse(int guildId, bool response)
diff --git a/src/net/manaserv/guildhandler.h b/src/net/manaserv/guildhandler.h
index 9929d135..bde677fb 100644
--- a/src/net/manaserv/guildhandler.h
+++ b/src/net/manaserv/guildhandler.h
@@ -41,7 +41,7 @@ public:
 
     void invite(int guildId, const std::string &name);
 
-    void invite(int guidId, Player *player);
+    void invite(int guidId, Being *being);
 
     void inviteResponse(int guidId, bool response);
 
diff --git a/src/net/manaserv/inventoryhandler.cpp b/src/net/manaserv/inventoryhandler.cpp
index 76fca7ae..3f8aa8b5 100644
--- a/src/net/manaserv/inventoryhandler.cpp
+++ b/src/net/manaserv/inventoryhandler.cpp
@@ -26,6 +26,7 @@
 #include "item.h"
 #include "itemshortcut.h"
 #include "localplayer.h"
+#include "playerinfo.h"
 
 #include "gui/chat.h"
 
@@ -60,8 +61,8 @@ void InventoryHandler::handleMessage(Net::MessageIn &msg)
     switch (msg.getId())
     {
         case GPMSG_INVENTORY_FULL:
-            player_node->clearInventory();
-            player_node->mEquipment->setBackend(&mEquips);
+            PlayerInfo::clearInventory();
+            PlayerInfo::getEquipment()->setBackend(&mEquips);
             // no break!
 
         case GPMSG_INVENTORY:
@@ -70,7 +71,7 @@ void InventoryHandler::handleMessage(Net::MessageIn &msg)
                 unsigned int slot = msg.readInt8();
                 if (slot == 255)
                 {
-                    player_node->setMoney(msg.readInt32());
+                    PlayerInfo::setAttribute(MONEY, msg.readInt32());
                     continue;
                 }
 
@@ -82,7 +83,7 @@ void InventoryHandler::handleMessage(Net::MessageIn &msg)
                 else if (slot >= 32 && slot < 32 + getSize(Inventory::INVENTORY))
                 {
                     int amount = id ? msg.readInt8() : 0;
-                    player_node->setInvItem(slot - 32, id, amount);
+                    PlayerInfo::setInventoryItem(slot - 32, id, amount);
                 }
             };
             break;
@@ -130,7 +131,7 @@ bool InventoryHandler::canSplit(const Item *item)
 
 void InventoryHandler::splitItem(const Item *item, int amount)
 {
-    int newIndex = player_node->getInventory()->getFreeSlot();
+    int newIndex = PlayerInfo::getInventory()->getFreeSlot();
     if (newIndex > Inventory::NO_SLOT_INDEX)
     {
         MessageOut msg(PGMSG_MOVE_ITEM);
@@ -149,7 +150,7 @@ void InventoryHandler::moveItem(int oldIndex, int newIndex)
     MessageOut msg(PGMSG_MOVE_ITEM);
     msg.writeInt8(oldIndex);
     msg.writeInt8(newIndex);
-    msg.writeInt8(player_node->getInventory()->getItem(oldIndex)
+    msg.writeInt8(PlayerInfo::getInventory()->getItem(oldIndex)
                   ->getQuantity());
     gameServerConnection->send(msg);
 }
diff --git a/src/net/manaserv/itemhandler.cpp b/src/net/manaserv/itemhandler.cpp
index dc3b9f14..200e7fac 100644
--- a/src/net/manaserv/itemhandler.cpp
+++ b/src/net/manaserv/itemhandler.cpp
@@ -21,7 +21,7 @@
 
 #include "net/manaserv/itemhandler.h"
 
-#include "flooritemmanager.h"
+#include "actorspritemanager.h"
 
 #include "net/manaserv/protocol.h"
 #include "net/manaserv/messagein.h"
@@ -62,8 +62,7 @@ void ItemHandler::handleMessage(Net::MessageIn &msg)
                     {
                         if (Map *map = game->getCurrentMap())
                         {
-                            floorItemManager->create(id,
-                                                     itemId,
+                            actorSpriteManager->createItem(id, itemId,
                                                      x / map->getTileWidth(),
                                                      y / map->getTileHeight());
                         }
@@ -75,9 +74,9 @@ void ItemHandler::handleMessage(Net::MessageIn &msg)
                         }
                     }
                 }
-                else if (FloorItem *item = floorItemManager->findById(id))
+                else if (FloorItem *item = actorSpriteManager->findItem(id))
                 {
-                    floorItemManager->destroy(item);
+                    actorSpriteManager->destroy(item);
                 }
             }
         } break;
diff --git a/src/net/manaserv/npchandler.cpp b/src/net/manaserv/npchandler.cpp
index 392ec4fd..509f26e1 100644
--- a/src/net/manaserv/npchandler.cpp
+++ b/src/net/manaserv/npchandler.cpp
@@ -21,8 +21,7 @@
 
 #include "net/manaserv/npchandler.h"
 
-#include "beingmanager.h"
-#include "npc.h"
+#include "actorspritemanager.h"
 
 #include "gui/npcdialog.h"
 #include "gui/npcpostdialog.h"
@@ -56,8 +55,8 @@ NpcHandler::NpcHandler()
 
 void NpcHandler::handleMessage(Net::MessageIn &msg)
 {
-    Being *being = beingManager->findBeing(msg.readInt16());
-    if (!being || being->getType() != Being::NPC)
+    Being *being = actorSpriteManager->findBeing(msg.readInt16());
+    if (!being || being->getType() != ActorSprite::NPC)
     {
         return;
     }
diff --git a/src/net/manaserv/partyhandler.cpp b/src/net/manaserv/partyhandler.cpp
index ec153fa8..00bb0fae 100644
--- a/src/net/manaserv/partyhandler.cpp
+++ b/src/net/manaserv/partyhandler.cpp
@@ -21,13 +21,12 @@
 
 #include "net/manaserv/partyhandler.h"
 
+#include "eventmanager.h"
 #include "log.h"
 #include "localplayer.h"
 
 #include "gui/socialwindow.h"
 
-#include "gui/widgets/chattab.h"
-
 #include "net/manaserv/connection.h"
 #include "net/manaserv/messagein.h"
 #include "net/manaserv/messageout.h"
@@ -85,7 +84,7 @@ void PartyHandler::handleMessage(Net::MessageIn &msg)
             if (msg.readInt8() == ERRMSG_OK)
             {
                 //
-                localChatTab->chatLog(_("Joined party."));
+                SERVER_NOTICE(_("Joined party."));
             }
         }
 
@@ -103,7 +102,7 @@ void PartyHandler::handleMessage(Net::MessageIn &msg)
             int id = msg.readInt16(); // being id
             std::string name = msg.readString();
 
-            localChatTab->chatLog(strprintf(_("%s joined the party."),
+            SERVER_NOTICE(strprintf(_("%s joined the party."),
                                             name.c_str()));
 
             if (id == player_node->getId())
@@ -120,8 +119,8 @@ void PartyHandler::handleMessage(Net::MessageIn &msg)
         case CPMSG_PARTY_REJECTED:
         {
             std::string name = msg.readString();
-            localChatTab->chatLog(strprintf(_("%s rejected your invite."),
-                                            name.c_str()));
+            SERVER_NOTICE(strprintf(
+                        _("%s rejected your invite."), name.c_str()));
         } break;
     }
 }
@@ -136,9 +135,9 @@ void PartyHandler::join(int partyId)
     // TODO
 }
 
-void PartyHandler::invite(Player *player)
+void PartyHandler::invite(Being *being)
 {
-    invite(player->getName());
+    invite(being->getName());
 }
 
 void PartyHandler::invite(const std::string &name)
@@ -167,7 +166,7 @@ void PartyHandler::leave()
     chatServerConnection->send(msg);
 }
 
-void PartyHandler::kick(Player *player)
+void PartyHandler::kick(Being *being)
 {
     // TODO
 }
diff --git a/src/net/manaserv/partyhandler.h b/src/net/manaserv/partyhandler.h
index 0777b49e..29dc280d 100644
--- a/src/net/manaserv/partyhandler.h
+++ b/src/net/manaserv/partyhandler.h
@@ -43,7 +43,7 @@ public:
 
     void join(int partyId);
 
-    void invite(Player *player);
+    void invite(Being *being);
 
     void invite(const std::string &name);
 
@@ -51,7 +51,7 @@ public:
 
     void leave();
 
-    void kick(Player *player);
+    void kick(Being *being);
 
     void kick(const std::string &name);
 
diff --git a/src/net/manaserv/playerhandler.cpp b/src/net/manaserv/playerhandler.cpp
index 2347fee2..ee67c359 100644
--- a/src/net/manaserv/playerhandler.cpp
+++ b/src/net/manaserv/playerhandler.cpp
@@ -28,7 +28,7 @@
 #include "localplayer.h"
 #include "log.h"
 #include "particle.h"
-#include "npc.h"
+#include "playerinfo.h"
 #include "configuration.h"
 
 #include "gui/chat.h"
@@ -39,6 +39,7 @@
 #include "net/net.h"
 
 #include "net/manaserv/connection.h"
+#include "net/manaserv/defines.h"
 #include "net/manaserv/messagein.h"
 #include "net/manaserv/messageout.h"
 #include "net/manaserv/npchandler.h"
@@ -113,13 +114,13 @@ void PlayerHandler::handleMessage(Net::MessageIn &msg)
 
                 if (stat == BASE_ATTR_HP)
                 {
-                    player_node->setMaxHp(base);
-                    player_node->setHp(value);
+                    PlayerInfo::setAttribute(MAX_HP, base);
+                    PlayerInfo::setAttribute(HP, value);
                 }
                 else
                 {
-                    player_node->setAttributeBase(stat, base);
-                    player_node->setAttributeEffective(stat, value);
+                    PlayerInfo::setStatBase(stat, base);
+                    PlayerInfo::setStatMod(stat, value - base);
                 }
             }
         } break;
@@ -133,26 +134,26 @@ void PlayerHandler::handleMessage(Net::MessageIn &msg)
                 int current = msg.readInt32();
                 int next = msg.readInt32();
 
-                player_node->setExperience(skill, current, next);
+                PlayerInfo::setStatExperience(skill, current, next);
             }
         } break;
 
         case GPMSG_LEVELUP:
         {
-            player_node->setLevel(msg.readInt16());
-            player_node->setCharacterPoints(msg.readInt16());
-            player_node->setCorrectionPoints(msg.readInt16());
+            PlayerInfo::setAttribute(LEVEL, msg.readInt16());
+            PlayerInfo::setAttribute(CHAR_POINTS, msg.readInt16());
+            PlayerInfo::setAttribute(CORR_POINTS, msg.readInt16());
             Particle* effect = particleEngine->addEffect(
-                 paths.getValue("particles", "graphics/particles/")
-               + paths.getValue("levelUpEffectFile", "levelup.particle.xml"),
-                                                         0, 0);
+                                               paths.getStringValue("particles")
+                                     + paths.getStringValue("levelUpEffectFile")
+                                                         ,0, 0);
             player_node->controlParticle(effect);
         } break;
 
 
         case GPMSG_LEVEL_PROGRESS:
         {
-            player_node->setExp(msg.readInt8(), false);
+            PlayerInfo::setAttribute(EXP, msg.readInt8());
         } break;
 
 
@@ -176,18 +177,19 @@ void PlayerHandler::handleMessage(Net::MessageIn &msg)
                     // has to be correct. The server is always right!
                     // undo attribute change and set points to 0
                     logger->log("Warning: Server denied increase of attribute %d (no points left) ", attrNum);
-                    int attrValue = player_node->getAttributeBase(attrNum) - 1;
-                    player_node->setCharacterPoints(0);
-                    player_node->setAttributeBase(attrNum, attrValue);
+                    int attrValue = PlayerInfo::getStatBase(attrNum) - 1;
+                    PlayerInfo::setAttribute(CHAR_POINTS, 0);
+                    PlayerInfo::setStatBase(attrNum, attrValue);
                 } break;
                 case ATTRIBMOD_DENIED:
                 {
                     // undo attribute change
                     logger->log("Warning: Server denied increase of attribute %d (reason unknown) ", attrNum);
-                    int points = player_node->getCharacterPoints() - 1;
-                    player_node->setCharacterPoints(points);
-                    int attrValue = player_node->getAttributeBase(attrNum) - 1;
-                    player_node->setAttributeBase(attrNum, attrValue);
+                    int points = PlayerInfo::getAttribute(CHAR_POINTS) - 1;
+                    PlayerInfo::setAttribute(CHAR_POINTS, points);
+
+                    int attrValue = PlayerInfo::getStatBase(attrNum) - 1;
+                    PlayerInfo::setStatBase(attrNum, attrValue);
                 } break;
             }
         } break;
@@ -212,21 +214,23 @@ void PlayerHandler::handleMessage(Net::MessageIn &msg)
                     // has to be correct. The server is always right!
                     // undo attribute change and set points to 0
                     logger->log("Warning: Server denied reduction of attribute %d (no points left) ", attrNum);
-                    int attrValue = player_node->getAttributeBase(attrNum) + 1;
-                    player_node->setCorrectionPoints(0);
-                    player_node->setAttributeBase(attrNum, attrValue);
+                    int attrValue = PlayerInfo::getStatBase(attrNum) + 1;
+                    PlayerInfo::setAttribute(CHAR_POINTS, 0);
+                    PlayerInfo::setStatBase(attrNum, attrValue);
                     break;
                 } break;
                 case ATTRIBMOD_DENIED:
                 {
                     // undo attribute change
                     logger->log("Warning: Server denied reduction of attribute %d (reason unknown) ", attrNum);
-                    int charaPoints = player_node->getCharacterPoints() - 1;
-                    player_node->setCharacterPoints(charaPoints);
-                    int correctPoints = player_node->getCorrectionPoints() + 1;
-                    player_node->setCorrectionPoints(correctPoints);
-                    int attrValue = player_node->getAttributeBase(attrNum) + 1;
-                    player_node->setAttributeBase(attrNum, attrValue);
+                    int charaPoints = PlayerInfo::getAttribute(CHAR_POINTS) - 1;
+                    PlayerInfo::setAttribute(CHAR_POINTS, charaPoints);
+
+                    int correctPoints = PlayerInfo::getAttribute(CORR_POINTS) + 1;
+                    PlayerInfo::setAttribute(CORR_POINTS, correctPoints);
+
+                    int attrValue = PlayerInfo::getStatBase(attrNum) + 1;
+                    PlayerInfo::setStatBase(attrNum, attrValue);
                 } break;
             }
 
@@ -241,7 +245,7 @@ void PlayerHandler::handleMessage(Net::MessageIn &msg)
                 int current = msg.readInt32();
                 int max = msg.readInt32();
                 int recharge = msg.readInt32();
-                player_node->setSpecialStatus(id, current, max, recharge);
+                PlayerInfo::setSpecialStatus(id, current, max, recharge);
             }
         } break;
         /*
@@ -334,11 +338,14 @@ void PlayerHandler::increaseSkill(int skillId)
 
 void PlayerHandler::pickUp(FloorItem *floorItem)
 {
-    int id = floorItem->getId();
-    MessageOut msg(PGMSG_PICKUP);
-    msg.writeInt16(id >> 16);
-    msg.writeInt16(id & 0xFFFF);
-    gameServerConnection->send(msg);
+    if (floorItem)
+    {
+        int id = floorItem->getId();
+        MessageOut msg(PGMSG_PICKUP);
+        msg.writeInt16(id >> 16);
+        msg.writeInt16(id & 0xFFFF);
+        gameServerConnection->send(msg);
+    }
 }
 
 void PlayerHandler::setDirection(char direction)
diff --git a/src/net/manaserv/tradehandler.cpp b/src/net/manaserv/tradehandler.cpp
index 234a18d6..a80fc6e6 100644
--- a/src/net/manaserv/tradehandler.cpp
+++ b/src/net/manaserv/tradehandler.cpp
@@ -21,15 +21,15 @@
 
 #include "net/manaserv/tradehandler.h"
 
-#include "beingmanager.h"
+#include "actorspritemanager.h"
+#include "eventmanager.h"
 #include "item.h"
 #include "localplayer.h"
+#include "playerinfo.h"
 
 #include "gui/confirmdialog.h"
 #include "gui/trade.h"
 
-#include "gui/widgets/chattab.h"
-
 #include "net/net.h"
 
 #include "net/manaserv/connection.h"
@@ -86,16 +86,15 @@ TradeHandler::TradeHandler():
     };
     handledMessages = _messages;
     tradeHandler = this;
-    
 }
 
 void TradeHandler::setAcceptTradeRequests(bool acceptTradeRequests)
 {
     mAcceptTradeRequests = acceptTradeRequests;
     if (mAcceptTradeRequests)
-        localChatTab->chatLog(_("Accepting incoming trade requests."), BY_SERVER);
+        SERVER_NOTICE(_("Accepting incoming trade requests."))
     else
-        localChatTab->chatLog(_("Ignoring incoming trade requests."), BY_SERVER);
+        SERVER_NOTICE(_("Ignoring incoming trade requests."))
 }
 
 void TradeHandler::handleMessage(Net::MessageIn &msg)
@@ -104,13 +103,13 @@ void TradeHandler::handleMessage(Net::MessageIn &msg)
     {
         case GPMSG_TRADE_REQUEST:
         {
-            Being *being = beingManager->findBeing(msg.readInt16());
+            Being *being = actorSpriteManager->findBeing(msg.readInt16());
             if (!being || !mAcceptTradeRequests)
             {
                 respond(false);
                 break;
             }
-            player_node->setTrading(true);
+            PlayerInfo::setTrading(true);
             tradePartnerName = being->getName();
             tradePartnerID = being->getId();
             ConfirmDialog *dlg = new ConfirmDialog(_("Request for Trade"),
@@ -144,19 +143,19 @@ void TradeHandler::handleMessage(Net::MessageIn &msg)
         case GPMSG_TRADE_AGREED:
             tradeWindow->receivedOk(false);
             break;
-            
+
         case GPMSG_TRADE_CANCEL:
-            localChatTab->chatLog(_("Trade canceled."), BY_SERVER);
+            SERVER_NOTICE(_("Trade canceled."))
             tradeWindow->setVisible(false);
             tradeWindow->reset();
-            player_node->setTrading(false);
+            PlayerInfo::setTrading(false);
             break;
 
         case GPMSG_TRADE_COMPLETE:
-            localChatTab->chatLog(_("Trade completed."), BY_SERVER);
+            SERVER_NOTICE(_("Trade completed."))
             tradeWindow->setVisible(false);
             tradeWindow->reset();
-            player_node->setTrading(false);
+            PlayerInfo::setTrading(false);
             break;
     }
 }
@@ -177,7 +176,7 @@ void TradeHandler::respond(bool accept)
     gameServerConnection->send(msg);
 
     if (!accept)
-        player_node->setTrading(false);
+        PlayerInfo::setTrading(false);
 }
 
 void TradeHandler::addItem(Item *item, int amount)