From 9d313d3d2c9d8efced5b0e2426eb462c2c37e0f1 Mon Sep 17 00:00:00 2001 From: DjWarmonger Date: Tue, 22 Feb 2011 14:23:09 +0000 Subject: [PATCH] Minor fixes and tweaks. --- AI/GeniusAI/ExpertSystem.cpp | 2 +- lib/CCreatureHandler.cpp | 1 - lib/HeroBonus.h | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/AI/GeniusAI/ExpertSystem.cpp b/AI/GeniusAI/ExpertSystem.cpp index b42a416a6..daadf842d 100644 --- a/AI/GeniusAI/ExpertSystem.cpp +++ b/AI/GeniusAI/ExpertSystem.cpp @@ -92,7 +92,7 @@ void BonusRule::fireRule() if (!it->first.functor(it->second->object->source, it->first.value)) return; break; case BonusCondition::id: - if (!it->first.functor(it->second->object->id, it->first.value)) return; + if (!it->first.functor(it->second->object->sid, it->first.value)) return; break; case BonusCondition::valType: //ever needed? if (!it->first.functor(it->second->object->valType, it->first.value)) return; diff --git a/lib/CCreatureHandler.cpp b/lib/CCreatureHandler.cpp index ea0947baf..85a2c9b2b 100644 --- a/lib/CCreatureHandler.cpp +++ b/lib/CCreatureHandler.cpp @@ -1024,7 +1024,6 @@ void CCreatureHandler::loadMindImmunity(Bonus & b, BonusList & bl, std::string & loadToIt (curVal, src, it, 4); if (curVal == 1) { - b.val = curVal; b.limiter.reset (new RankRangeLimiter(i)); break; //only one limiter here } diff --git a/lib/HeroBonus.h b/lib/HeroBonus.h index 678525ac2..d0a30a5b9 100644 --- a/lib/HeroBonus.h +++ b/lib/HeroBonus.h @@ -56,7 +56,7 @@ namespace PrimarySkill BONUS_NAME(FIRE_SPELL_DMG_PREMY) \ BONUS_NAME(WATER_SPELL_DMG_PREMY) \ BONUS_NAME(WATER_WALKING) /*subtype 1 - without penalty, 2 - with penalty*/ \ - BONUS_NAME(NO_SHOTING_PENALTY) \ + BONUS_NAME(NO_SHOTING_PENALTY) /* duplicates NO_DISTANCE_PENALTY or FREE_SHOOTHING?*/\ BONUS_NAME(NEGATE_ALL_NATURAL_IMMUNITIES) \ BONUS_NAME(STACK_HEALTH) \ BONUS_NAME(BLOCK_MORALE) \