Updated dev-cpp project file, removed unnecessary header, fixed some include paths.

5 files changed, 6 insertions, 14 deletions

diff --git a/src/game.cpp b/src/game.cpp
index e70d4dee..4b3d78a1 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -56,6 +56,7 @@
 #include "gui/requesttrade.h"
 #include "gui/sell.h"
 #include "gui/setup.h"
+#include "gui/skill.h"
 #include "gui/stats.h"
 #include "gui/status.h"
 #include "gui/trade.h"
diff --git a/src/gui/inventorywindow.cpp b/src/gui/inventorywindow.cpp
index d13fa35d..4ad4ca66 100644
--- a/src/gui/inventorywindow.cpp
+++ b/src/gui/inventorywindow.cpp
@@ -37,7 +37,7 @@
 #include "../item.h"
 #include "../playerinfo.h"
 
-#include "resources/iteminfo.h"
+#include "../resources/iteminfo.h"
 
 InventoryWindow::InventoryWindow():
     Window("Inventory")
diff --git a/src/net/protocol.cpp b/src/net/protocol.cpp
index e30e9d4e..ce27b7ea 100644
--- a/src/net/protocol.cpp
+++ b/src/net/protocol.cpp
@@ -23,9 +23,7 @@
 
 #include "protocol.h"
 
-#ifdef WIN32
-#include <windows.h>
-#else
+#ifndef WIN32
 #include "win2linux.h"
 #endif
 
diff --git a/src/playerinfo.h b/src/playerinfo.h
index 1e769404..29109fb6 100644
--- a/src/playerinfo.h
+++ b/src/playerinfo.h
@@ -25,7 +25,6 @@
 #define _TMW_PLAYERINFO_H
 
 #include <vector>
-#include "gui/skill.h"
 
 struct PLAYER_INFO {
     int id;
@@ -39,10 +38,6 @@ struct PLAYER_INFO {
     char STRUp, AGIUp, VITUp, INTUp, DEXUp, LUKUp;
     int totalWeight, maxWeight;
     short weapon;
-    // skill list declaration
-    std::vector<SKILL> m_Skill; // array of N_SKILLS skills
-    // gets the requested skills level from char_info
-    int GetSkill(int n_ID, int n_XP=2, int n_base = false); // implemented in the body (main.cpp)
 };
 
 extern PLAYER_INFO *char_info;
diff --git a/src/resources/itemmanager.cpp b/src/resources/itemmanager.cpp
index ef2d573b..6593516f 100644
--- a/src/resources/itemmanager.cpp
+++ b/src/resources/itemmanager.cpp
@@ -20,17 +20,15 @@
  *
  *  $Id$
  */
-
-#include "itemmanager.h"
-
+ 
 #include <libxml/tree.h>
 
+#include "iteminfo.h"
+#include "itemmanager.h"
 #include "resourcemanager.h"
 
 #include "../log.h"
 
-#include "resources/iteminfo.h"
-
 // MSVC libxml2 at the moment doesn't work right when using MinGW, missing this
 // function at link time.
 #ifdef WIN32