games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-25 22:42:04 +02:00
Code Issues Releases Activity

Further part of external dwellings handling. Still not done.

Browse Source 
Redone MetaString.
This commit is contained in:
Michał W. Urbańczyk
2009-07-09 19:15:22 +00:00
parent 83791aa3e1
commit 1d816b2eb9
11 changed files with 312 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/NetPacksLib.cpp
View File

@@ -179,7 +179,7 @@ DLL_EXPORT void GiveBonus::applyGs( CGameState *gs )
std::string &descr = h->bonuses.back().description;
if(!bdescr.texts.size()
if(!bdescr.message.size()
&& bonus.source == HeroBonus::OBJECT
&& (bonus.type == HeroBonus::LUCK || bonus.type == HeroBonus::MORALE || bonus.type == HeroBonus::MORALE_AND_LUCK)
&& gs->map->objects[bonus.id]->ID == 26) //it's morale/luck bonus from an event without description
@@ -189,7 +189,7 @@ DLL_EXPORT void GiveBonus::applyGs( CGameState *gs )
}
else
{
descr = toString(bdescr);
bdescr.toString(descr);
}
}
@@ -461,7 +461,7 @@ DLL_EXPORT void SetObjectProperty::applyGs( CGameState *gs )
DLL_EXPORT void SetHoverName::applyGs( CGameState *gs )
{
gs->map->objects[id]->hoverName = toString(name);
name.toString(gs->map->objects[id]->hoverName);
}
DLL_EXPORT void HeroLevelUp::applyGs( CGameState *gs )