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
#	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/NetPacksLib.cpp
View File

@@ -28,6 +28,8 @@
#include "StartInfo.h"
#include "CPlayerState.h"
VCMI_LIB_NAMESPACE_BEGIN
DLL_LINKAGE void SetResources::applyGs(CGameState *gs)
{
@@ -1698,3 +1700,5 @@ DLL_LINKAGE void EntitiesChanged::applyGs(CGameState * gs)
for(const auto & change : changes)
gs->updateEntity(change.metatype, change.entityIndex, change.data);
}
VCMI_LIB_NAMESPACE_END