Fixed compilation for tmwserv

3 files changed, 12 insertions, 5 deletions

diff --git a/src/gui/connection.cpp b/src/gui/connection.cpp
index 0862ee69..4863edcd 100644
--- a/src/gui/connection.cpp
+++ b/src/gui/connection.cpp
@@ -30,7 +30,7 @@
 
 #include "utils/gettext.h"
 
-ConnectionDialog::ConnectionDialog(int previousState):
+ConnectionDialog::ConnectionDialog(State previousState):
     Window("Info"), mProgress(0), mPreviousState(previousState)
 {
     setContentSize(200, 100);
diff --git a/src/gui/connection.h b/src/gui/connection.h
index 62441fa9..d6059c3f 100644
--- a/src/gui/connection.h
+++ b/src/gui/connection.h
@@ -24,6 +24,8 @@
 
 #include "gui/widgets/window.h"
 
+#include "main.h"
+
 #include <guichan/actionlistener.hpp>
 
 class ProgressBar;
@@ -41,7 +43,7 @@ class ConnectionDialog : public Window, gcn::ActionListener
          *
          * @see Window::Window
          */
-        ConnectionDialog(int previousState);
+        ConnectionDialog(State previousState);
 
         /**
          * Called when the user presses Cancel. Restores the global state to
@@ -54,7 +56,7 @@ class ConnectionDialog : public Window, gcn::ActionListener
     private:
         ProgressBar *mProgressBar;
         float mProgress;
-        int mPreviousState;
+        State mPreviousState;
 };
 
 #endif
diff --git a/src/gui/outfitwindow.cpp b/src/gui/outfitwindow.cpp
index 53950299..f43e1440 100644
--- a/src/gui/outfitwindow.cpp
+++ b/src/gui/outfitwindow.cpp
@@ -153,9 +153,14 @@ void OutfitWindow::wearOutfit(int outfit)
             //non vis is 3,4,7
             if (i != 3 && i != 4 && i != 7)
             {
-                if (!(item = player_node->getInventory()->getItem(player_node
-                                        ->mEquipment.get()->getEquipment(i))))
+#ifdef TMWSERV_SUPPORT
+                if (!(item = player_node->mEquipment.get()->getEquipment(i)))
                     continue;
+#else
+                if (!(item = player_node->getInventory()->getItem(
+                      player_node->mEquipment.get()->getEquipment(i))))
+                    continue;
+#endif
                 Net::getInventoryHandler()->unequipItem(item);
             }
         }