games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-25 22:42:04 +02:00
Code Issues Releases Activity

Merge remote-tracking branch 'origin/develop' into terrain-rewrite

Browse Source 
# Conflicts:
#	lib/Terrain.cpp
#	lib/Terrain.h
This commit is contained in:
Tomasz Zieliński
2022-09-23 20:01:13 +02:00
parent f883395710 2b0f02c832
commit a5077245a8
96 changed files with 945 additions and 386 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
client/widgets/AdventureMapClasses.cpp
View File

@@ -14,6 +14,7 @@
#include "MiscWidgets.h"
#include "CComponent.h"
#include "Images.h"
#include "../CGameInfo.h"
#include "../CMusicHandler.h"
@@ -26,8 +27,6 @@
#include "../gui/SDL_Pixels.h"
#include "../gui/SDL_Compat.h"
#include "../widgets/Images.h"
#include "../windows/InfoWindows.h"
#include "../windows/CAdvmapInterface.h"
#include "../windows/GUIClasses.h"