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

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

Browse Source 
# Conflicts:
#	lib/Terrain.cpp
#	lib/Terrain.h
#	lib/battle/CBattleInfoEssentials.cpp
#	lib/rmg/ObstaclePlacer.cpp
#	lib/rmg/RiverPlacer.cpp
This commit is contained in:
Tomasz Zieliński
2022-09-27 07:50:17 +02:00
parent 25f66097cc 6ad468ecd3
commit f386f42166
636 changed files with 4774 additions and 971 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/CGameState.cpp
View File

@ -37,6 +37,8 @@
#include "serializer/CMemorySerializer.h"
#include "VCMIDirs.h"
VCMI_LIB_NAMESPACE_BEGIN
boost::shared_mutex CGameState::mutex;
template <typename T> class CApplyOnGS;
@ -3106,3 +3108,5 @@ CRandomGenerator & CGameState::getRandomGenerator()
{
return rand;
}
VCMI_LIB_NAMESPACE_END