3 files changed, 10 insertions, 4 deletions
diff --git a/src/net/manaserv/playerhandler.cpp b/src/net/manaserv/playerhandler.cpp
index 60274288..0d7544fd 100644
--- a/src/net/manaserv/playerhandler.cpp
+++ b/src/net/manaserv/playerhandler.cpp
@@ -42,9 +42,8 @@
 #include "net/manaserv/messageout.h"
 #include "net/manaserv/protocol.h"
 
-// TODO Move somewhere else
-OkDialog *weightNotice = NULL;
-OkDialog *deathNotice = NULL;
+extern OkDialog *weightNotice;
+extern OkDialog *deathNotice;
 
 extern BuyDialog *buyDialog;
 extern SellDialog *sellDialog;
@@ -424,4 +423,9 @@ int PlayerHandler::getJobLocation()
     return -1;
 }
 
+float PlayerHandler::getDefaultWalkSpeed()
+{
+    return 6.0f;
+}
+
 } // namespace ManaServ
diff --git a/src/net/manaserv/playerhandler.h b/src/net/manaserv/playerhandler.h
index 37d485f8..22be69f3 100644
--- a/src/net/manaserv/playerhandler.h
+++ b/src/net/manaserv/playerhandler.h
@@ -73,6 +73,8 @@ class PlayerHandler : public MessageHandler, public Net::PlayerHandler
 
         int getJobLocation();
 
+        float getDefaultWalkSpeed();
+
     private:
         void handleMapChangeMessage(Net::MessageIn &msg);
 };
diff --git a/src/net/manaserv/tradehandler.cpp b/src/net/manaserv/tradehandler.cpp
index 5eedbec8..7f7be6bf 100644
--- a/src/net/manaserv/tradehandler.cpp
+++ b/src/net/manaserv/tradehandler.cpp
@@ -40,7 +40,7 @@
 #include "utils/gettext.h"
 #include "utils/stringutils.h"
 
-std::string tradePartnerName;
+extern std::string tradePartnerName;
 int tradePartnerID;
 
 extern Net::TradeHandler *tradeHandler;