1
0
mirror of https://github.com/vcmi/vcmi.git synced 2025-01-12 02:28:11 +02:00

Minor fixes and tweaks.

This commit is contained in:
DjWarmonger 2011-02-22 14:23:09 +00:00
parent 6db7f1d610
commit 9d313d3d2c
3 changed files with 2 additions and 3 deletions

View File

@ -92,7 +92,7 @@ void BonusRule::fireRule()
if (!it->first.functor(it->second->object->source, it->first.value)) return; if (!it->first.functor(it->second->object->source, it->first.value)) return;
break; break;
case BonusCondition::id: 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; break;
case BonusCondition::valType: //ever needed? case BonusCondition::valType: //ever needed?
if (!it->first.functor(it->second->object->valType, it->first.value)) return; if (!it->first.functor(it->second->object->valType, it->first.value)) return;

View File

@ -1024,7 +1024,6 @@ void CCreatureHandler::loadMindImmunity(Bonus & b, BonusList & bl, std::string &
loadToIt (curVal, src, it, 4); loadToIt (curVal, src, it, 4);
if (curVal == 1) if (curVal == 1)
{ {
b.val = curVal;
b.limiter.reset (new RankRangeLimiter(i)); b.limiter.reset (new RankRangeLimiter(i));
break; //only one limiter here break; //only one limiter here
} }

View File

@ -56,7 +56,7 @@ namespace PrimarySkill
BONUS_NAME(FIRE_SPELL_DMG_PREMY) \ BONUS_NAME(FIRE_SPELL_DMG_PREMY) \
BONUS_NAME(WATER_SPELL_DMG_PREMY) \ BONUS_NAME(WATER_SPELL_DMG_PREMY) \
BONUS_NAME(WATER_WALKING) /*subtype 1 - without penalty, 2 - with penalty*/ \ 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(NEGATE_ALL_NATURAL_IMMUNITIES) \
BONUS_NAME(STACK_HEALTH) \ BONUS_NAME(STACK_HEALTH) \
BONUS_NAME(BLOCK_MORALE) \ BONUS_NAME(BLOCK_MORALE) \