games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-01-12 02:28:11 +02:00
Code Issues Releases Activity

Resolved #710.

Browse Source 
Minor fixes.
This commit is contained in:
DjWarmonger 2011-03-08 07:40:14 +00:00
parent 043700f310
commit 869214f44b
2 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/CCreatureHandler.cpp
View File

@ -839,7 +839,9 @@ void CCreatureHandler::loadStackExp(Bonus & b, BonusList & bl, std::string & src
case 'e': case 'e':
b.type = Bonus::DOUBLE_DAMAGE_CHANCE; break; b.type = Bonus::DOUBLE_DAMAGE_CHANCE; break;
case 'g': case 'g':
b.type = Bonus::SPELL_DAMAGE_REDUCTION; break; b.type = Bonus::SPELL_DAMAGE_REDUCTION;
b.subtype = -1; //all magic schools
break;
case 'R': case 'R':
b.type = Bonus::ADDITIONAL_RETALIATION; break; b.type = Bonus::ADDITIONAL_RETALIATION; break;

30
lib/NetPacksLib.cpp
View File

@ -798,26 +798,24 @@ DLL_EXPORT void SetObjectProperty::applyGs( CGameState *gs )
return; return;
} }
if(what == ObjProperty::OWNER) CArmedInstance *cai = dynamic_cast<CArmedInstance *>(obj);
if(what == ObjProperty::OWNER && cai)
{ {
if(CArmedInstance *cai = dynamic_cast<CArmedInstance *>(obj)) if(obj->ID == TOWNI_TYPE)
{ {
if(obj->ID == TOWNI_TYPE) CGTownInstance *t = static_cast<CGTownInstance*>(obj);
{ if(t->tempOwner < PLAYER_LIMIT)
CGTownInstance *t = static_cast<CGTownInstance*>(obj); gs->getPlayer(t->tempOwner)->towns -= t;
if(t->tempOwner < PLAYER_LIMIT) if(val < PLAYER_LIMIT)
gs->getPlayer(t->tempOwner)->towns -= t; gs->getPlayer(val)->towns.push_back(t);
if(val < PLAYER_LIMIT)
gs->getPlayer(val)->towns.push_back(t);
}
CBonusSystemNode *nodeToMove = cai->whatShouldBeAttached();
nodeToMove->detachFrom(cai->whereShouldBeAttached(gs));
obj->setProperty(what,val);
nodeToMove->attachTo(cai->whereShouldBeAttached(gs));
} }
CBonusSystemNode *nodeToMove = cai->whatShouldBeAttached();
nodeToMove->detachFrom(cai->whereShouldBeAttached(gs));
obj->setProperty(what,val);
nodeToMove->attachTo(cai->whereShouldBeAttached(gs));
} }
else else //not an armed instance
{ {
obj->setProperty(what,val); obj->setProperty(what,val);
} }