games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-06 09:09:40 +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

3
lib/mapObjects/ObjectTemplate.cpp
View File

@@ -23,6 +23,8 @@
#include "CRewardableConstructor.h"
VCMI_LIB_NAMESPACE_BEGIN
static bool isOnVisitableFromTopList(int identifier, int type)
{
if(type == 2 || type == 3 || type == 4 || type == 5) //creature, hero, artifact, resource
@@ -571,3 +573,4 @@ void ObjectTemplate::recalculate()
calculateVisitableOffset();
}
VCMI_LIB_NAMESPACE_END