1
0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-25 22:42:04 +02:00

Merged GUI refactoring into develop, fixed conflicts

This commit is contained in:
Ivan Savenko
2014-08-09 15:00:45 +03:00
119 changed files with 13087 additions and 12229 deletions

View File

@@ -17,7 +17,7 @@
#include "../lib/CSoundBase.h"
#include "../lib/StartInfo.h"
#include "mapHandler.h"
#include "GUIClasses.h"
#include "windows/GUIClasses.h"
#include "../lib/CConfigHandler.h"
#include "gui/SDL_Extensions.h"
#include "battle/CBattleInterface.h"
@@ -26,6 +26,8 @@
#include "../lib/BattleState.h"
#include "../lib/GameConstants.h"
#include "gui/CGuiHandler.h"
#include "widgets/MiscWidgets.h"
#include "widgets/AdventureMapClasses.h"
#include "CMT.h"
//macros to avoid code duplication - calls given method with given arguments if interface for specific player is present