From 7ecb9b7b0d3dae607c4111b2d95385e3755f2f63 Mon Sep 17 00:00:00 2001 From: Nekiro Date: Fri, 3 May 2019 20:23:37 +0200 Subject: [PATCH] Fixing field bug and other small stuff --- src/combat.cpp | 2 +- src/condition.cpp | 2 +- src/definitions.h | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/combat.cpp b/src/combat.cpp index 05dda4e..2e62e91 100644 --- a/src/combat.cpp +++ b/src/combat.cpp @@ -179,7 +179,7 @@ ReturnValue Combat::canDoCombat(Creature* caster, Tile* tile, bool aggressive) return RETURNVALUE_NOTENOUGHROOM; }*/ - if (tile->hasProperty(CONST_PROP_IMMOVABLEBLOCKPATH)) { + if (tile->hasProperty(CONST_PROP_IMMOVABLEBLOCKPATH) && tile->hasProperty(CONST_PROP_IMMOVABLENOFIELDBLOCKPATH)) { return RETURNVALUE_NOTENOUGHROOM; } diff --git a/src/condition.cpp b/src/condition.cpp index 053c1ea..e07d8d5 100644 --- a/src/condition.cpp +++ b/src/condition.cpp @@ -756,7 +756,7 @@ bool ConditionSoul::setParam(ConditionParam_t param, int32_t value) bool ConditionDamage::setParam(ConditionParam_t param, int32_t value) { - bool ret = Condition::setParam(param, value); + Condition::setParam(param, value); switch (param) { case CONDITION_PARAM_OWNER: diff --git a/src/definitions.h b/src/definitions.h index 344a22b..2dfc2c6 100644 --- a/src/definitions.h +++ b/src/definitions.h @@ -57,6 +57,7 @@ static constexpr auto CLIENT_VERSION_STR = "7.72"; #pragma warning(disable:4267) // 'var' : conversion from 'size_t' to 'type', possible loss of data #pragma warning(disable:4351) // new behavior: elements of array will be default initialized #pragma warning(disable:4458) // declaration hides class member +#pragma warning(disable:4018) // signed/unsigned mismatch #endif #define strcasecmp _stricmp