games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-07-15 01:24:45 +02:00
Code Issues Releases Activity

* moved a few files

Browse Source
This commit is contained in:
mateuszb
2009-05-20 10:08:56 +00:00
parent 4c0936a3dc
commit 429b226517
44 changed files with 211 additions and 211 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
CCallback.cpp
View File

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

2
CCallback.h
View File

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

14
AdventureMapButton.cpp → client/AdventureMapButton.cpp
View File

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

4
AdventureMapButton.h → client/AdventureMapButton.h
View File

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

26
CAdvmapInterface.cpp → client/CAdvmapInterface.cpp
View File

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

4
CAdvmapInterface.h → client/CAdvmapInterface.h
View File

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

28
CBattleInterface.cpp → client/CBattleInterface.cpp
View File

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

4
CBattleInterface.h → client/CBattleInterface.h
View File

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

24
CCastleInterface.cpp → client/CCastleInterface.cpp
View File

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

6
CCastleInterface.h → client/CCastleInterface.h
View File

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

4
CCursorHandler.cpp → client/CCursorHandler.cpp
View File

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

2
CCursorHandler.h → client/CCursorHandler.h
View File

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

4
CGameInfo.cpp → client/CGameInfo.cpp
View File

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

2
CGameInfo.h → client/CGameInfo.h
View File

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

26
CHeroWindow.cpp → client/CHeroWindow.cpp
View File

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

0
CHeroWindow.h → client/CHeroWindow.h
View File

46
CMT.cpp → client/CMT.cpp
View File

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

14
CMessage.cpp → client/CMessage.cpp
View File

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

2
CMessage.h → client/CMessage.h
View File

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

36
CPlayerInterface.cpp → client/CPlayerInterface.cpp
View File

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

4
CPlayerInterface.h → client/CPlayerInterface.h
View File

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

20
CPreGame.cpp → client/CPreGame.cpp
View File

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

6
CPreGame.h → client/CPreGame.h
View File

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

12
client/CSpellWindow.cpp
View File

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

8
client/Client.cpp
View File

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

4
client/GUIBase.cpp
View File

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

20
client/GUIClasses.cpp
View File

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

2
client/GUIClasses.h
View File

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

8
client/NetPacksClient.cpp
View File

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

6
SDL_Extensions.cpp → client/SDL_Extensions.cpp
View File

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

2
SDL_Extensions.h → client/SDL_Extensions.h
View File

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

2
SDL_framerate.cpp → client/SDL_framerate.cpp
View File

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

0
SDL_framerate.h → client/SDL_framerate.h
View File

2
hch/CAmbarCendamo.h
View File

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

4
hch/CObjectHandler.cpp
View File

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

28
CGameState.cpp → lib/CGameState.cpp
View File

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

8
CGameState.h → lib/CGameState.h
View File

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

2
lib/NetPacks.h
View File

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

6
lib/NetPacksLib.cpp
View File

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

8
map.cpp → lib/map.cpp
View File

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

6
map.h → lib/map.h
View File

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

4
server/CGameHandler.cpp
View File

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

2
server/CGameHandler.h
View File

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

2
server/CVCMIServer.cpp
View File

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