summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/gui/connection.cpp2
-rw-r--r--src/gui/connection.h6
-rw-r--r--src/gui/outfitwindow.cpp9
-rw-r--r--tmw.cbp16
4 files changed, 19 insertions, 14 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);
}
}
diff --git a/tmw.cbp b/tmw.cbp
index c9ac6fb3..b1332b5f 100644
--- a/tmw.cbp
+++ b/tmw.cbp
@@ -218,10 +218,10 @@
<Option target="TMWServ" />
<Option target="Unix TMWSERV" />
</Unit>
- <Unit filename="src/gui/charselectdialog.cpp" />
- <Unit filename="src/gui/charselectdialog.h" />
<Unit filename="src/gui/charcreatedialog.cpp" />
<Unit filename="src/gui/charcreatedialog.h" />
+ <Unit filename="src/gui/charselectdialog.cpp" />
+ <Unit filename="src/gui/charselectdialog.h" />
<Unit filename="src/gui/chat.cpp" />
<Unit filename="src/gui/chat.h" />
<Unit filename="src/gui/confirmdialog.cpp" />
@@ -285,16 +285,14 @@
<Unit filename="src/gui/minimap.h" />
<Unit filename="src/gui/ministatus.cpp" />
<Unit filename="src/gui/ministatus.h" />
- <Unit filename="src/gui/npctextdialog.cpp" />
- <Unit filename="src/gui/npctextdialog.h" />
- <Unit filename="src/gui/npcintegerdialog.cpp" />
+ <Unit filename="src/gui/npcdialog.cpp" />
+ <Unit filename="src/gui/npcdialog.h" />
<Unit filename="src/gui/npcintegerdialog.h" />
- <Unit filename="src/gui/npclistdialog.cpp" />
<Unit filename="src/gui/npclistdialog.h" />
<Unit filename="src/gui/npcpostdialog.cpp" />
<Unit filename="src/gui/npcpostdialog.h" />
- <Unit filename="src/gui/npcstringdialog.cpp" />
<Unit filename="src/gui/npcstringdialog.h" />
+ <Unit filename="src/gui/npctextdialog.h" />
<Unit filename="src/gui/okdialog.cpp" />
<Unit filename="src/gui/okdialog.h" />
<Unit filename="src/gui/outfitwindow.cpp" />
@@ -512,7 +510,6 @@
<Unit filename="src/lockedarray.h" />
<Unit filename="src/log.cpp" />
<Unit filename="src/log.h" />
- <Unit filename="src/logindata.h" />
<Unit filename="src/main.cpp" />
<Unit filename="src/main.h" />
<Unit filename="src/map.cpp" />
@@ -1008,7 +1005,8 @@
<Unit filename="src/resources/spritedef.h" />
<Unit filename="src/resources/wallpaper.cpp" />
<Unit filename="src/resources/wallpaper.h" />
- <Unit filename="src/serverinfo.h" />
+ <Unit filename="src/rotationalparticle.cpp" />
+ <Unit filename="src/rotationalparticle.h" />
<Unit filename="src/shopitem.cpp" />
<Unit filename="src/shopitem.h" />
<Unit filename="src/simpleanimation.cpp" />