* moved a few files

CCallback.cpp

@@ -1,10 +1,10 @@
 #include "stdafx.h"
 #include "CCallback.h"
-#include "CGameInfo.h"
-#include "CGameState.h"
-#include "CPlayerInterface.h"
+#include "client/CGameInfo.h"
+#include "lib/CGameState.h"
+#include "client/CPlayerInterface.h"
 #include "client/Client.h"
-#include "map.h"
+#include "lib/map.h"
 #include "hch/CBuildingHandler.h"
 #include "hch/CDefObjInfoHandler.h"
 #include "hch/CHeroHandler.h"

CCallback.h

@@ -9,7 +9,7 @@
 //support of unicode we should use ICU or some boost wraper areound it
 //(boost using this lib during compilation i dont know what for exactly)
 #endif
-#include "CGameState.h"
+#include "lib/CGameState.h"
 
 /*
  * CCallback.h, part of VCMI engine

AdventureMapButton.cpp → client/AdventureMapButton.cpp

@@ -1,14 +1,14 @@
 #include "AdventureMapButton.h"
 #include "CAdvmapInterface.h"
 #include "SDL_Extensions.h"
-#include "hch/CDefHandler.h"
+#include "../hch/CDefHandler.h"
 #include "CGameInfo.h"
-#include "hch/CLodHandler.h"
-#include "hch/CGeneralTextHandler.h"
-#include "hch/CTownHandler.h"
-#include "CCallback.h"
-#include "client/CConfigHandler.h"
-#include "client/Graphics.h"
+#include "../hch/CLodHandler.h"
+#include "../hch/CGeneralTextHandler.h"
+#include "../hch/CTownHandler.h"
+#include "../CCallback.h"
+#include "CConfigHandler.h"
+#include "Graphics.h"
 #include "CBattleInterface.h"
 #include "CPlayerInterface.h"
 

AdventureMapButton.h → client/AdventureMapButton.h

@@ -1,9 +1,9 @@
 #ifndef __ADVENTUREMAPBUTTON_H__
 #define __ADVENTUREMAPBUTTON_H__
 
-#include "client/FunctionList.h"
+#include "FunctionList.h"
 #include <boost/bind.hpp>
-#include "client/GUIBase.h"
+#include "GUIBase.h"
 
 /*
  * AdventureMapButton.h, part of VCMI engine

CAdvmapInterface.cpp → client/CAdvmapInterface.cpp

@@ -1,24 +1,24 @@
 #include "AdventureMapButton.h"
 #include "CAdvmapInterface.h"
-#include "CCallback.h"
+#include "../CCallback.h"
 #include "CCastleInterface.h"
 #include "CCursorHandler.h"
 #include "CGameInfo.h"
 #include "CHeroWindow.h"
 #include "CMessage.h"
 #include "SDL_Extensions.h"
-#include "client/CBitmapHandler.h"
-#include "client/CConfigHandler.h"
-#include "client/CSpellWindow.h"
-#include "client/Graphics.h"
-#include "hch/CDefHandler.h"
-#include "hch/CGeneralTextHandler.h"
-#include "hch/CHeroHandler.h"
-#include "hch/CObjectHandler.h"
-#include "hch/CTownHandler.h"
-#include "map.h"
-#include "mapHandler.h"
-#include "stdafx.h"
+#include "CBitmapHandler.h"
+#include "CConfigHandler.h"
+#include "CSpellWindow.h"
+#include "Graphics.h"
+#include "../hch/CDefHandler.h"
+#include "../hch/CGeneralTextHandler.h"
+#include "../hch/CHeroHandler.h"
+#include "../hch/CObjectHandler.h"
+#include "../hch/CTownHandler.h"
+#include "../lib/map.h"
+#include "../mapHandler.h"
+#include "../stdafx.h"
 #include <boost/algorithm/string.hpp>
 #include <boost/algorithm/string/replace.hpp>
 #include <boost/assign/std/vector.hpp>

CAdvmapInterface.h → client/CAdvmapInterface.h

@@ -1,11 +1,11 @@
 #ifndef __CADVMAPINTERFACE_H__
 #define __CADVMAPINTERFACE_H__
 #include <typeinfo>
-#include "global.h"
+#include "../global.h"
 #include "SDL.h"
 #include <map>
 #include "AdventureMapButton.h"
-#include "client/GUIClasses.h"
+#include "GUIClasses.h"
 class CDefHandler;
 class CCallback;
 struct CPath;

CBattleInterface.cpp → client/CBattleInterface.cpp

@@ -1,26 +1,26 @@
 #include "CBattleInterface.h"
 #include "CGameInfo.h"
-#include "hch/CLodHandler.h"
+#include "../hch/CLodHandler.h"
 #include "SDL_Extensions.h"
 #include "CAdvmapInterface.h"
 #include "AdventureMapButton.h"
-#include "hch/CObjectHandler.h"
-#include "hch/CHeroHandler.h"
-#include "hch/CDefHandler.h"
-#include "hch/CSpellHandler.h"
+#include "../hch/CObjectHandler.h"
+#include "../hch/CHeroHandler.h"
+#include "../hch/CDefHandler.h"
+#include "../hch/CSpellHandler.h"
 #include "CMessage.h"
 #include "CCursorHandler.h"
-#include "CCallback.h"
-#include "CGameState.h"
-#include "hch/CGeneralTextHandler.h"
-#include "client/CCreatureAnimation.h"
-#include "client/Graphics.h"
-#include "client/CSpellWindow.h"
-#include "client/CConfigHandler.h"
+#include "../CCallback.h"
+#include "../lib/CGameState.h"
+#include "../hch/CGeneralTextHandler.h"
+#include "CCreatureAnimation.h"
+#include "Graphics.h"
+#include "CSpellWindow.h"
+#include "CConfigHandler.h"
 #include <queue>
 #include <sstream>
-#include "lib/CondSh.h"
-#include "lib/NetPacks.h"
+#include "../lib/CondSh.h"
+#include "../lib/NetPacks.h"
 #include "CPlayerInterface.h"
 #include <boost/assign/list_of.hpp>
 #ifndef __GNUC__

CBattleInterface.h → client/CBattleInterface.h

@@ -1,9 +1,9 @@
 #ifndef __CBATTLEINTERFACE_H__
 #define __CBATTLEINTERFACE_H__
 
-#include "global.h"
+#include "../global.h"
 #include <list>
-#include "client/GUIBase.h"
+#include "GUIBase.h"
 
 /*
  * CBattleInterface.h, part of VCMI engine

CCastleInterface.cpp → client/CCastleInterface.cpp

@@ -1,22 +1,22 @@
-#include "stdafx.h"
+#include "../stdafx.h"
 #include "CCastleInterface.h"
 #include "AdventureMapButton.h"
 #include "CAdvmapInterface.h"
-#include "CCallback.h"
+#include "../CCallback.h"
 #include "CGameInfo.h"
 #include "CHeroWindow.h"
 #include "CMessage.h"
 #include "SDL_Extensions.h"
-#include "client/CCreatureAnimation.h"
-#include "client/Graphics.h"
-#include "hch/CArtHandler.h"
-#include "hch/CBuildingHandler.h"
-#include "hch/CDefHandler.h"
-#include "hch/CGeneralTextHandler.h"
-#include "hch/CLodHandler.h"
-#include "hch/CObjectHandler.h"
-#include "hch/CSpellHandler.h"
-#include "hch/CTownHandler.h"
+#include "CCreatureAnimation.h"
+#include "Graphics.h"
+#include "../hch/CArtHandler.h"
+#include "../hch/CBuildingHandler.h"
+#include "../hch/CDefHandler.h"
+#include "../hch/CGeneralTextHandler.h"
+#include "../hch/CLodHandler.h"
+#include "../hch/CObjectHandler.h"
+#include "../hch/CSpellHandler.h"
+#include "../hch/CTownHandler.h"
 #include <boost/algorithm/string.hpp>
 #include <boost/algorithm/string/replace.hpp>
 #include <boost/assign/std/vector.hpp> 

CCastleInterface.h → client/CCastleInterface.h

@@ -3,10 +3,10 @@
 
 
 
-#include "global.h"
+#include "../global.h"
 #include <SDL.h>
-#include "client/GUIBase.h"
-#include "hch/CMusicBase.h"
+#include "GUIBase.h"
+#include "../hch/CMusicBase.h"
 //#include "boost/tuple/tuple.hpp"
 class CGTownInstance;
 class CTownHandler;

CCursorHandler.cpp → client/CCursorHandler.cpp

@@ -1,9 +1,9 @@
-#include "stdafx.h"
+#include "../stdafx.h"
 #include "CCursorHandler.h"
 #include "SDL.h"
 #include "SDL_Extensions.h"
 #include "CGameInfo.h"
-#include "hch/CDefHandler.h"
+#include "../hch/CDefHandler.h"
 
 /*
  * CCursorHandler.cpp, part of VCMI engine

CCursorHandler.h → client/CCursorHandler.h

@@ -1,6 +1,6 @@
 #ifndef __CCURSORHANDLER_H__
 #define __CCURSORHANDLER_H__
-#include "global.h"
+#include "../global.h"
 #include <vector>
 struct SDL_Thread;
 class CDefHandler;

CGameInfo.cpp → client/CGameInfo.cpp

@@ -1,6 +1,6 @@
-#include "stdafx.h"
+#include "../stdafx.h"
 #include "CGameInfo.h"
-#include "lib/VCMI_Lib.h"
+#include "../lib/VCMI_Lib.h"
 
 /*
  * CGameInfo.cpp, part of VCMI engine

CGameInfo.h → client/CGameInfo.h

@@ -1,6 +1,6 @@
 #ifndef __CGAMEINFO_H__
 #define __CGAMEINFO_H__
-#include "global.h"
+#include "../global.h"
 
 #include <vector>
 

CHeroWindow.cpp → client/CHeroWindow.cpp

@@ -1,24 +1,24 @@
-#include "stdafx.h"
+#include "../stdafx.h"
 #include "AdventureMapButton.h"
 #include "CAdvmapInterface.h"
-#include "CCallback.h"
+#include "../CCallback.h"
 #include "CCastleInterface.h"
 #include "CGameInfo.h"
 #include "CHeroWindow.h"
 #include "CMessage.h"
 #include "SDL.h"
 #include "SDL_Extensions.h"
-#include "client/CBitmapHandler.h"
-#include "client/Graphics.h"
-#include "client/CSpellWindow.h"
-#include "client/CConfigHandler.h"
-#include "global.h"
-#include "hch/CArtHandler.h"
-#include "hch/CDefHandler.h"
-#include "hch/CGeneralTextHandler.h"
-#include "hch/CHeroHandler.h"
-#include "hch/CLodHandler.h"
-#include "hch/CObjectHandler.h"
+#include "CBitmapHandler.h"
+#include "Graphics.h"
+#include "CSpellWindow.h"
+#include "CConfigHandler.h"
+#include "../global.h"
+#include "../hch/CArtHandler.h"
+#include "../hch/CDefHandler.h"
+#include "../hch/CGeneralTextHandler.h"
+#include "../hch/CHeroHandler.h"
+#include "../hch/CLodHandler.h"
+#include "../hch/CObjectHandler.h"
 #include <boost/algorithm/string/replace.hpp>
 #include <boost/assign/list_of.hpp>
 #include <boost/assign/std/vector.hpp>

CMT.cpp → client/CMT.cpp

@@ -1,46 +1,46 @@
 // CMT.cpp : Defines the entry point for the console application.
 //
-#include "stdafx.h"
+#include "../stdafx.h"
 #include <cmath>
 #include <string>
 #include <vector>
 #include <queue>
 #include <cmath>
 #include <boost/algorithm/string.hpp>
-#include "boost/filesystem/operations.hpp"
+#include <boost/filesystem/operations.hpp>
 #include <boost/thread.hpp>
 #include <SDL_ttf.h>
 #include <SDL_mixer.h>
 #include "SDL_Extensions.h"
 #include "SDL_framerate.h"
 #include "CGameInfo.h"
-#include "mapHandler.h"
-#include "global.h"
+#include "../mapHandler.h"
+#include "../global.h"
 #include "CPreGame.h"
 #include "CCastleInterface.h"
-#include "CConsoleHandler.h"
+#include "../CConsoleHandler.h"
 #include "CCursorHandler.h"
-#include "CGameState.h"
-#include "CCallback.h"
+#include "../lib/CGameState.h"
+#include "../CCallback.h"
 #include "CPlayerInterface.h"
 #include "CAdvmapInterface.h"
-#include "hch/CBuildingHandler.h"
-#include "hch/CVideoHandler.h"
-#include "hch/CHeroHandler.h"
-#include "hch/CCreatureHandler.h"
-#include "hch/CSpellHandler.h"
-#include "hch/CMusicHandler.h"
-#include "hch/CLodHandler.h"
-#include "hch/CDefHandler.h"
-#include "hch/CAmbarCendamo.h"
-#include "hch/CGeneralTextHandler.h"
-#include "client/Graphics.h"
-#include "client/Client.h"
-#include "client/CConfigHandler.h"
-#include "lib/Connection.h"
-#include "lib/VCMI_Lib.h"
+#include "../hch/CBuildingHandler.h"
+#include "../hch/CVideoHandler.h"
+#include "../hch/CHeroHandler.h"
+#include "../hch/CCreatureHandler.h"
+#include "../hch/CSpellHandler.h"
+#include "../hch/CMusicHandler.h"
+#include "../hch/CLodHandler.h"
+#include "../hch/CDefHandler.h"
+#include "../hch/CAmbarCendamo.h"
+#include "../hch/CGeneralTextHandler.h"
+#include "Graphics.h"
+#include "Client.h"
+#include "CConfigHandler.h"
+#include "../lib/Connection.h"
+#include "../lib/VCMI_Lib.h"
 #include <cstdlib>
-#include "lib/NetPacks.h"
+#include "../lib/NetPacks.h"
 
 #if __MINGW32__
 #undef main

CMessage.cpp → client/CMessage.cpp

@@ -1,19 +1,19 @@
-#include "stdafx.h"
+#include "../stdafx.h"
 #include "CMessage.h"
 #include "SDL_ttf.h"
-#include "hch/CDefHandler.h"
+#include "../hch/CDefHandler.h"
 #include "CGameInfo.h"
 #include "SDL_Extensions.h"
-#include "hch/CLodHandler.h"
+#include "../hch/CLodHandler.h"
 #include <boost/algorithm/string.hpp>
 #include <boost/algorithm/string/replace.hpp>
-#include "hch/CDefHandler.h"
+#include "../hch/CDefHandler.h"
 #include "CGameInfo.h"
 #include "SDL_Extensions.h"
 #include <sstream>
-#include "hch/CGeneralTextHandler.h"
-#include "client/Graphics.h"
-#include "client/GUIClasses.h"
+#include "../hch/CGeneralTextHandler.h"
+#include "Graphics.h"
+#include "GUIClasses.h"
 #include "AdventureMapButton.h"
 
 /*

CMessage.h → client/CMessage.h

@@ -1,7 +1,7 @@
 #ifndef __CMESSAGE_H__
 #define __CMESSAGE_H__
 
-#include "global.h"
+#include "../global.h"
 #include <SDL_ttf.h>
 #include <SDL.h>
 

CPlayerInterface.cpp → client/CPlayerInterface.cpp

@@ -1,7 +1,7 @@
-#include "stdafx.h"
+#include "../stdafx.h"
 #include "CAdvmapInterface.h"
 #include "CBattleInterface.h"
-#include "CCallback.h"
+#include "../CCallback.h"
 #include "CCastleInterface.h"
 #include "CCursorHandler.h"
 #include "CGameInfo.h"
@@ -13,22 +13,22 @@
 //#include "SDL_framerate.h"
 
 #include "SDL_framerate.h"
-#include "client/CConfigHandler.h"
-#include "client/CCreatureAnimation.h"
-#include "client/Graphics.h"
-#include "hch/CArtHandler.h"
-#include "hch/CGeneralTextHandler.h"
-#include "hch/CHeroHandler.h"
-#include "hch/CLodHandler.h"
-#include "hch/CObjectHandler.h"
-#include "lib/Connection.h"
-#include "hch/CSpellHandler.h"
-#include "hch/CTownHandler.h"
-#include "lib/CondSh.h"
-#include "lib/NetPacks.h"
-#include "map.h"
-#include "mapHandler.h"
-#include "timeHandler.h"
+#include "CConfigHandler.h"
+#include "CCreatureAnimation.h"
+#include "Graphics.h"
+#include "../hch/CArtHandler.h"
+#include "../hch/CGeneralTextHandler.h"
+#include "../hch/CHeroHandler.h"
+#include "../hch/CLodHandler.h"
+#include "../hch/CObjectHandler.h"
+#include "../lib/Connection.h"
+#include "../hch/CSpellHandler.h"
+#include "../hch/CTownHandler.h"
+#include "../lib/CondSh.h"
+#include "../lib/NetPacks.h"
+#include "../lib/map.h"
+#include "../mapHandler.h"
+#include "../timeHandler.h"
 #include <boost/lexical_cast.hpp>
 #include <boost/algorithm/string.hpp>
 #include <boost/algorithm/string/replace.hpp>

CPlayerInterface.h → client/CPlayerInterface.h

@@ -1,7 +1,7 @@
 #ifndef __CPLAYERINTERFACE_H__
 #define __CPLAYERINTERFACE_H__
-#include "global.h"
-#include "CGameInterface.h"
+#include "../global.h"
+#include "../CGameInterface.h"
 #include "SDL_framerate.h"
 #include <map>
 #include <list>

CPreGame.cpp → client/CPreGame.cpp

@@ -1,28 +1,28 @@
-#include "stdafx.h"
+#include "../stdafx.h"
 #include "CPreGame.h"
-#include "hch/CDefHandler.h"
+#include "../hch/CDefHandler.h"
 #include <ctime>
 #include <SDL.h>
 #include <boost/filesystem.hpp>   // includes all needed Boost.Filesystem declarations
 #include <boost/algorithm/string.hpp>
 //#include "boost/foreach.hpp"
 #include <zlib.h>
-#include "timeHandler.h"
+#include "../timeHandler.h"
 #include <sstream>
 #include "SDL_Extensions.h"
 #include "CGameInfo.h"
-#include "hch/CGeneralTextHandler.h"
+#include "../hch/CGeneralTextHandler.h"
 #include "CCursorHandler.h"
-#include "hch/CLodHandler.h"
-#include "hch/CTownHandler.h"
-#include "hch/CHeroHandler.h"
+#include "../hch/CLodHandler.h"
+#include "../hch/CTownHandler.h"
+#include "../hch/CHeroHandler.h"
 #include <cmath>
-#include "client/Graphics.h"
+#include "Graphics.h"
 #include <boost/thread.hpp>
 #include <boost/bind.hpp>
 #include <cstdlib>
-#include "lib/Connection.h"
-#include "hch/CMusicHandler.h"
+#include "../lib/Connection.h"
+#include "../hch/CMusicHandler.h"
 /*
  * CPreGame.cpp, part of VCMI engine
  *

CPreGame.h → client/CPreGame.h

@@ -1,11 +1,11 @@
 #ifndef __CPREGAME_H__
 #define __CPREGAME_H__
-#include "global.h"
+#include "../global.h"
 #include <set>
 #include <SDL.h>
-#include "StartInfo.h"
+#include "../StartInfo.h"
 #include "CMessage.h"
-#include "map.h"
+#include "../lib/map.h"
 #include <boost/function.hpp>
 #include <boost/bind.hpp>
 #include <cstdlib>

client/CSpellWindow.cpp

@@ -4,12 +4,12 @@
 #include "../hch/CObjectHandler.h"
 #include "../hch/CSpellHandler.h"
 #include "../hch/CGeneralTextHandler.h"
-#include "../CAdvmapInterface.h"
-#include "../CBattleInterface.h"
-#include "../CGameInfo.h"
-#include "../SDL_Extensions.h"
-#include "../CMessage.h"
-#include "../CPlayerInterface.h"
+#include "CAdvmapInterface.h"
+#include "CBattleInterface.h"
+#include "CGameInfo.h"
+#include "SDL_Extensions.h"
+#include "CMessage.h"
+#include "CPlayerInterface.h"
 #include <boost/bind.hpp>
 #include <sstream>
 

client/Client.cpp

@@ -1,8 +1,8 @@
 #include "../CCallback.h"
 #include "../CConsoleHandler.h"
-#include "../CGameInfo.h"
-#include "../CGameState.h"
-#include "../CPlayerInterface.h"
+#include "CGameInfo.h"
+#include "../lib/CGameState.h"
+#include "CPlayerInterface.h"
 #include "../StartInfo.h"
 #include "../hch/CArtHandler.h"
 #include "../hch/CDefObjInfoHandler.h"
@@ -16,7 +16,7 @@
 #include "../lib/Interprocess.h"
 #include "../lib/NetPacks.h"
 #include "../lib/VCMI_Lib.h"
-#include "../map.h"
+#include "../lib/map.h"
 #include "../mapHandler.h"
 #include "CConfigHandler.h"
 #include "Client.h"

client/GUIBase.cpp

@@ -1,6 +1,6 @@
 #include "GUIBase.h"
-#include "../SDL_extensions.h"
-#include "../CPlayerInterface.h"
+#include "SDL_extensions.h"
+#include "CPlayerInterface.h"
 
 /*
  * GUIBase.cpp, part of VCMI engine

client/GUIClasses.cpp

@@ -1,16 +1,16 @@
 #include "GUIClasses.h"
-#include "../SDL_Extensions.h"
+#include "SDL_Extensions.h"
 
 #include "../stdafx.h"
-#include "../CAdvmapInterface.h"
-#include "../CBattleInterface.h"
+#include "CAdvmapInterface.h"
+#include "CBattleInterface.h"
 #include "../CCallback.h"
-#include "../CCastleInterface.h"
-#include "../CCursorHandler.h"
-#include "../CGameInfo.h"
-#include "../CHeroWindow.h"
-#include "../CMessage.h"
-#include "../SDL_framerate.h"
+#include "CCastleInterface.h"
+#include "CCursorHandler.h"
+#include "CGameInfo.h"
+#include "CHeroWindow.h"
+#include "CMessage.h"
+#include "SDL_framerate.h"
 #include "CConfigHandler.h"
 #include "CCreatureAnimation.h"
 #include "Graphics.h"
@@ -22,7 +22,7 @@
 #include "../hch/CSpellHandler.h"
 #include "../hch/CTownHandler.h"
 #include "../lib/CondSh.h"
-#include "../map.h"
+#include "../lib/map.h"
 #include "../mapHandler.h"
 #include "../timeHandler.h"
 #include <boost/lexical_cast.hpp>

client/GUIClasses.h

@@ -2,7 +2,7 @@
 #define __GUICLASSES_H__
 
 #include "../global.h"
-#include "../SDL_framerate.h"
+#include "SDL_framerate.h"
 #include "GUIBase.h"
 #include "FunctionList.h"
 #include <set>

client/NetPacksClient.cpp

@@ -1,15 +1,15 @@
 #include "../lib/NetPacks.h"
 #include "../CCallback.h"
-#include "../client/Client.h"
-#include "../CPlayerInterface.h"
-#include "../CGameInfo.h"
+#include "Client.h"
+#include "CPlayerInterface.h"
+#include "CGameInfo.h"
 #include "../lib/Connection.h"
 #include "../hch/CGeneralTextHandler.h"
 #include "../hch/CDefObjInfoHandler.h"
 #include "../hch/CHeroHandler.h"
 #include "../hch/CObjectHandler.h"
 #include "../lib/VCMI_Lib.h"
-#include "../map.h"
+#include "../lib/map.h"
 #include "../hch/CSpellHandler.h"
 #include "../hch/CSoundBase.h"
 #include "../mapHandler.h"

SDL_Extensions.cpp → client/SDL_Extensions.cpp

@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "../stdafx.h"
 #include "SDL_Extensions.h"
 #include "SDL_ttf.h"
 #include "CGameInfo.h"
@@ -7,9 +7,9 @@
 #include <algorithm>
 #include "CMessage.h"
 #include <boost/algorithm/string.hpp>
-#include "hch/CDefHandler.h"
+#include "../hch/CDefHandler.h"
 #include <map>
-#include "client/Graphics.h"
+#include "Graphics.h"
 
 /*
  * SDL_Extensions.cpp, part of VCMI engine

SDL_Extensions.h → client/SDL_Extensions.h

@@ -3,7 +3,7 @@
 #include "SDL.h"
 #include "SDL_ttf.h"
 #include <string>
-#include "int3.h"
+#include "../int3.h"
 #include <vector>
 
 /*

SDL_framerate.cpp → client/SDL_framerate.cpp

@@ -6,7 +6,7 @@
  LGPL (c) A. Schiffler
  
  */
-#include "stdafx.h"
+#include "../stdafx.h"
 #include "SDL_framerate.h"
 
 /* 

hch/CAmbarCendamo.h

@@ -4,7 +4,7 @@
 #include <string>
 #include <vector>
 #include "../global.h"
-#include "../map.h"
+#include "../lib/map.h"
 #include "CCreatureHandler.h"
 
 class DLL_EXPORT CAmbarCendamo 

hch/CObjectHandler.cpp

@@ -16,10 +16,10 @@
 #include "CSoundBase.h"
 #include "../lib/VCMI_Lib.h"
 #include "../lib/IGameCallback.h"
-#include "../CGameState.h"
+#include "../lib/CGameState.h"
 #include "../lib/NetPacks.h"
 #include "../StartInfo.h"
-#include "../map.h"
+#include "../lib/map.h"
 
 /*
  * CObjectHandler.cpp, part of VCMI engine

CGameState.cpp → lib/CGameState.cpp

@@ -4,25 +4,25 @@
 #include <fstream>
 #include "CGameState.h"
 #include <boost/random/linear_congruential.hpp>
-#include "hch/CDefObjInfoHandler.h"
-#include "hch/CArtHandler.h"
-#include "hch/CBuildingHandler.h"
-#include "hch/CGeneralTextHandler.h"
-#include "hch/CTownHandler.h"
-#include "hch/CSpellHandler.h"
-#include "hch/CHeroHandler.h"
-#include "hch/CObjectHandler.h"
-#include "hch/CCreatureHandler.h"
-#include "lib/VCMI_Lib.h"
-#include "lib/Connection.h"
+#include "../hch/CDefObjInfoHandler.h"
+#include "../hch/CArtHandler.h"
+#include "../hch/CBuildingHandler.h"
+#include "../hch/CGeneralTextHandler.h"
+#include "../hch/CTownHandler.h"
+#include "../hch/CSpellHandler.h"
+#include "../hch/CHeroHandler.h"
+#include "../hch/CObjectHandler.h"
+#include "../hch/CCreatureHandler.h"
+#include "VCMI_Lib.h"
+#include "Connection.h"
 #include "map.h"
-#include "StartInfo.h"
-#include "lib/NetPacks.h"
+#include "../StartInfo.h"
+#include "NetPacks.h"
 #include <boost/foreach.hpp>
 #include <boost/thread.hpp>
 #include <boost/thread/shared_mutex.hpp>
 
-#include "lib/RegisterTypes.cpp"
+#include "RegisterTypes.cpp"
 boost::rand48 ran;
 
 #ifdef min

CGameState.h → lib/CGameState.h

@@ -1,14 +1,14 @@
 #ifndef __CGAMESTATE_H__
 #define __CGAMESTATE_H__
-#include "global.h"
+#include "../global.h"
 #ifndef _MSC_VER
-#include "hch/CCreatureHandler.h"
-#include "lib/VCMI_Lib.h"
+#include "../hch/CCreatureHandler.h"
+#include "VCMI_Lib.h"
 #include "map.h"
 #endif
 #include <set>
 #include <vector>
-#include "lib/StackFeature.h"
+#include "StackFeature.h"
 #ifdef _WIN32
 #include <tchar.h>
 #else

lib/NetPacks.h

@@ -1,7 +1,7 @@
 #ifndef __NETPACKS_H__
 #define __NETPACKS_H__
 #include "../global.h"
-#include "../CGameState.h"
+#include "CGameState.h"
 #include "BattleAction.h"
 #include "HeroBonus.h"
 #include <set>

lib/NetPacksLib.cpp

@@ -1,12 +1,12 @@
 #define VCMI_DLL
-#include "../lib/NetPacks.h"
+#include "NetPacks.h"
 #include "../hch/CGeneralTextHandler.h"
 #include "../hch/CDefObjInfoHandler.h"
 #include "../hch/CArtHandler.h"
 #include "../hch/CHeroHandler.h"
 #include "../hch/CObjectHandler.h"
-#include "../lib/VCMI_Lib.h"
-#include "../map.h"
+#include "VCMI_Lib.h"
+#include "map.h"
 #include "../hch/CSpellHandler.h"
 #include <boost/bind.hpp>
 #include <boost/foreach.hpp>

map.cpp → lib/map.cpp

@@ -1,9 +1,9 @@
 #define VCMI_DLL
-#include "stdafx.h"
+#include "../stdafx.h"
 #include "map.h"
-#include "hch/CObjectHandler.h"
-#include "hch/CDefObjInfoHandler.h"
-#include "lib/VCMI_Lib.h"
+#include "../hch/CObjectHandler.h"
+#include "../hch/CDefObjInfoHandler.h"
+#include "VCMI_Lib.h"
 #include <zlib.h>
 #include <boost/crc.hpp>
 

map.h → lib/map.h

@@ -8,10 +8,10 @@
 #include <map>
 #include <set>
 #include <list>
-#include "global.h"
+#include "../global.h"
 #ifndef _MSC_VER
-#include "hch/CObjectHandler.h"
-#include "hch/CDefObjInfoHandler.h"
+#include "../hch/CObjectHandler.h"
+#include "../hch/CDefObjInfoHandler.h"
 #endif
 
 /*

server/CGameHandler.cpp

@@ -6,11 +6,11 @@
 #include "../hch/CObjectHandler.h"
 #include "../hch/CSpellHandler.h"
 #include "../hch/CTownHandler.h"
-#include "../CGameState.h"
+#include "../lib/CGameState.h"
 #include "../lib/CondSh.h"
 #include "../lib/NetPacks.h"
 #include "../lib/VCMI_Lib.h"
-#include "../map.h"
+#include "../lib/map.h"
 #include "CGameHandler.h"
 #include <boost/bind.hpp>
 #include <boost/date_time/posix_time/posix_time_types.hpp> //no i/o just types

server/CGameHandler.h

@@ -4,7 +4,7 @@
 #include "../global.h"
 #include <set>
 #include "../client/FunctionList.h"
-#include "../CGameState.h"
+#include "../lib/CGameState.h"
 #include "../lib/Connection.h"
 #include "../lib/IGameCallback.h"
 #include "../lib/BattleAction.h"

server/CVCMIServer.cpp

@@ -20,7 +20,7 @@
 #include <boost/interprocess/mapped_region.hpp>
 #include <boost/interprocess/shared_memory_object.hpp>
 #include "../StartInfo.h"
-#include "../map.h"
+#include "../lib/map.h"
 #include "../hch/CLodHandler.h" 
 #include "../lib/Interprocess.h"
 #include "../lib/VCMI_Lib.h"