games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-29 23:07:48 +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/CGameInfoCallback.cpp
View File

@@ -21,6 +21,8 @@
#include "mapping/CMap.h"
#include "CPlayerState.h"
VCMI_LIB_NAMESPACE_BEGIN
//TODO make clean
#define ERROR_VERBOSE_OR_NOT_RET_VAL_IF(cond, verbose, txt, retVal) do {if(cond){if(verbose)logGlobal->error("%s: %s",BOOST_CURRENT_FUNCTION, txt); return retVal;}} while(0)
#define ERROR_RET_IF(cond, txt) do {if(cond){logGlobal->error("%s: %s", BOOST_CURRENT_FUNCTION, txt); return;}} while(0)
@@ -999,3 +1001,5 @@ bool CGameInfoCallback::isTeleportEntrancePassable(const CGTeleport * obj, Playe
{
return obj && obj->isEntrance() && !isTeleportChannelImpassable(obj->channel, player);
}
VCMI_LIB_NAMESPACE_END