games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-04-23 12:08:45 +02:00
Code Issues Releases Activity

Formatting and cleanup

Browse Source
This commit is contained in:
Ivan Savenko 2023-04-17 16:19:56 +03:00
parent 365f552fa1
commit dd227d24c3
7 changed files with 18 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/ClientCommandManager.cpp
View File

@ -8,12 +8,10 @@
* *
*/ */
#include "StdInc.h" #include "StdInc.h"
#include "ClientCommandManager.h" #include "ClientCommandManager.h"
#include "Client.h" #include "Client.h"
#include "adventureMap/CInGameConsole.h" #include "adventureMap/CInGameConsole.h"
#include "adventureMap/CAdventureMapInterface.h"
#include "CPlayerInterface.h" #include "CPlayerInterface.h"
#include "PlayerLocalState.h" #include "PlayerLocalState.h"
#include "CServerHandler.h" #include "CServerHandler.h"

5
client/PlayerLocalState.h
View File

@ -34,9 +34,9 @@ class PlayerLocalState
std::vector<const CGHeroInstance *> wanderingHeroes; //our heroes on the adventure map (not the garrisoned ones) std::vector<const CGHeroInstance *> wanderingHeroes; //our heroes on the adventure map (not the garrisoned ones)
std::vector<const CGTownInstance *> ownedTowns; //our towns on the adventure map std::vector<const CGTownInstance *> ownedTowns; //our towns on the adventure map
void saveHeroPaths(std::map<const CGHeroInstance *, int3> & paths); void saveHeroPaths(std::map<const CGHeroInstance *, int3> & paths);
void loadHeroPaths(std::map<const CGHeroInstance *, int3> & paths); void loadHeroPaths(std::map<const CGHeroInstance *, int3> & paths);
public: public:
struct SpellbookLastSetting struct SpellbookLastSetting
{ {
@ -46,7 +46,8 @@ public:
int spellbookLastTabBattle = 4; int spellbookLastTabBattle = 4;
int spellbookLastTabAdvmap = 4; int spellbookLastTabAdvmap = 4;
template <typename Handler> void serialize( Handler &h, const int version ) template<typename Handler>
void serialize(Handler & h, const int version)
{ {
h & spellbookLastPageBattle; h & spellbookLastPageBattle;
h & spellbokLastPageAdvmap; h & spellbokLastPageAdvmap;

4
client/adventureMap/CAdventureMapInterface.cpp
View File

@ -27,7 +27,6 @@
#include "../windows/GUIClasses.h" #include "../windows/GUIClasses.h"
#include "../windows/InfoWindows.h" #include "../windows/InfoWindows.h"
#include "../CGameInfo.h" #include "../CGameInfo.h"
#include "../CMusicHandler.h"
#include "../CPlayerInterface.h" #include "../CPlayerInterface.h"
#include "../lobby/CSavingScreen.h" #include "../lobby/CSavingScreen.h"
#include "../render/CAnimation.h" #include "../render/CAnimation.h"
@ -48,9 +47,6 @@
#include "../../lib/mapObjects/CGTownInstance.h" #include "../../lib/mapObjects/CGTownInstance.h"
#include "../../lib/CPathfinder.h" #include "../../lib/CPathfinder.h"
#include "../../lib/mapping/CMap.h" #include "../../lib/mapping/CMap.h"
#include "../../lib/UnlockGuard.h"
#include "../../lib/TerrainHandler.h"
#include <SDL_keycode.h>
#define ADVOPT (conf.go()->ac) #define ADVOPT (conf.go()->ac)

2
client/adventureMap/CAdventureOptions.cpp
View File

@ -11,8 +11,6 @@
#include "StdInc.h" #include "StdInc.h"
#include "CAdventureOptions.h" #include "CAdventureOptions.h"
#include "CAdventureMapInterface.h"
#include "../CGameInfo.h" #include "../CGameInfo.h"
#include "../CPlayerInterface.h" #include "../CPlayerInterface.h"
#include "../PlayerLocalState.h" #include "../PlayerLocalState.h"

1
client/adventureMap/CInGameConsole.cpp
View File

@ -16,7 +16,6 @@
#include "../CPlayerInterface.h" #include "../CPlayerInterface.h"
#include "../PlayerLocalState.h" #include "../PlayerLocalState.h"
#include "../ClientCommandManager.h" #include "../ClientCommandManager.h"
#include "../adventureMap/CAdventureMapInterface.h"
#include "../gui/CGuiHandler.h" #include "../gui/CGuiHandler.h"
#include "../render/Colors.h" #include "../render/Colors.h"

1
client/mapView/MapRendererContext.cpp
View File

@ -18,7 +18,6 @@
#include "../CGameInfo.h" #include "../CGameInfo.h"
#include "../CPlayerInterface.h" #include "../CPlayerInterface.h"
#include "../PlayerLocalState.h" #include "../PlayerLocalState.h"
#include "../adventureMap/CAdventureMapInterface.h"
#include "../../lib/CPathfinder.h" #include "../../lib/CPathfinder.h"
#include "../../lib/Point.h" #include "../../lib/Point.h"