mirror of
https://github.com/vcmi/vcmi.git
synced 2024-12-24 22:14:36 +02:00
parent
043700f310
commit
869214f44b
@ -839,7 +839,9 @@ void CCreatureHandler::loadStackExp(Bonus & b, BonusList & bl, std::string & src
|
||||
case 'e':
|
||||
b.type = Bonus::DOUBLE_DAMAGE_CHANCE; break;
|
||||
case 'g':
|
||||
b.type = Bonus::SPELL_DAMAGE_REDUCTION; break;
|
||||
b.type = Bonus::SPELL_DAMAGE_REDUCTION;
|
||||
b.subtype = -1; //all magic schools
|
||||
break;
|
||||
case 'R':
|
||||
b.type = Bonus::ADDITIONAL_RETALIATION; break;
|
||||
|
||||
|
@ -798,9 +798,8 @@ DLL_EXPORT void SetObjectProperty::applyGs( CGameState *gs )
|
||||
return;
|
||||
}
|
||||
|
||||
if(what == ObjProperty::OWNER)
|
||||
{
|
||||
if(CArmedInstance *cai = dynamic_cast<CArmedInstance *>(obj))
|
||||
CArmedInstance *cai = dynamic_cast<CArmedInstance *>(obj);
|
||||
if(what == ObjProperty::OWNER && cai)
|
||||
{
|
||||
if(obj->ID == TOWNI_TYPE)
|
||||
{
|
||||
@ -816,8 +815,7 @@ DLL_EXPORT void SetObjectProperty::applyGs( CGameState *gs )
|
||||
obj->setProperty(what,val);
|
||||
nodeToMove->attachTo(cai->whereShouldBeAttached(gs));
|
||||
}
|
||||
}
|
||||
else
|
||||
else //not an armed instance
|
||||
{
|
||||
obj->setProperty(what,val);
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user