Move more from LocalPlayer to PlayerInfo

Also cleanup PlayerInfo a bit.

Reviewed-by: Chuck Miller

3 files changed, 11 insertions, 10 deletions

diff --git a/src/net/manaserv/inventoryhandler.cpp b/src/net/manaserv/inventoryhandler.cpp
index bf5682c7..3f8aa8b5 100644
--- a/src/net/manaserv/inventoryhandler.cpp
+++ b/src/net/manaserv/inventoryhandler.cpp
@@ -61,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:
@@ -83,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;
@@ -131,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);
@@ -150,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/playerhandler.cpp b/src/net/manaserv/playerhandler.cpp
index cef75472..bc03cc25 100644
--- a/src/net/manaserv/playerhandler.cpp
+++ b/src/net/manaserv/playerhandler.cpp
@@ -241,7 +241,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;
         /*
diff --git a/src/net/manaserv/tradehandler.cpp b/src/net/manaserv/tradehandler.cpp
index b6169ac9..d5505075 100644
--- a/src/net/manaserv/tradehandler.cpp
+++ b/src/net/manaserv/tradehandler.cpp
@@ -24,6 +24,7 @@
 #include "actorspritemanager.h"
 #include "item.h"
 #include "localplayer.h"
+#include "playerinfo.h"
 
 #include "gui/confirmdialog.h"
 #include "gui/trade.h"
@@ -110,7 +111,7 @@ void TradeHandler::handleMessage(Net::MessageIn &msg)
                 respond(false);
                 break;
             }
-            player_node->setTrading(true);
+            PlayerInfo::setTrading(true);
             tradePartnerName = being->getName();
             tradePartnerID = being->getId();
             ConfirmDialog *dlg = new ConfirmDialog(_("Request for Trade"),
@@ -149,14 +150,14 @@ void TradeHandler::handleMessage(Net::MessageIn &msg)
             localChatTab->chatLog(_("Trade canceled."), BY_SERVER);
             tradeWindow->setVisible(false);
             tradeWindow->reset();
-            player_node->setTrading(false);
+            PlayerInfo::setTrading(false);
             break;
 
         case GPMSG_TRADE_COMPLETE:
             localChatTab->chatLog(_("Trade completed."), BY_SERVER);
             tradeWindow->setVisible(false);
             tradeWindow->reset();
-            player_node->setTrading(false);
+            PlayerInfo::setTrading(false);
             break;
     }
 }
@@ -177,7 +178,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)