games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-07-15 01:24:45 +02:00
Code Issues Releases Activity

-(linux) Moved all (I hope) files created by VCMI to ~/.vcmi to prevents crash on launch from read-only directory

Browse Source 
- minor fixes for #362 #835 #836
This commit is contained in:
Ivan Savenko
2011-11-01 12:58:01 +00:00
parent ede7fd5a7a
commit 0f2e00c780
12 changed files with 66 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
lib/CObjectHandler.cpp
View File

@ -115,11 +115,17 @@ static void readCreatures(const JsonNode &creature, std::vector< std::pair <ui16
creInfo.first = cre->idNumber;
}
}
assert(creInfo.first != -1); // ensure we found the creature
if (creInfo.first != -1)
{
creInfo.second = creature["number"].Float();
creInfo.second = creature["number"].Float();
storage.push_back(creInfo);
storage.push_back(creInfo);
}
else
{
//FIXME: localization issues. switch to numeric ID's in bank config?
tlog0<<"Unknown creature in bank config: "<<creName<<"\n";
}
}
// Bank helper. Process a bank level.
@ -3158,7 +3164,7 @@ void CGCreature::joinDecision(const CGHeroInstance *h, int cost, ui32 accept) co
void CGCreature::fight( const CGHeroInstance *h ) const
{
//split stacks
int totalCount; //TODO: multiple creature types in a stack?
//TODO: multiple creature types in a stack?
int basicType = stacks.begin()->second->type->idNumber;
cb->setObjProperty(id, ObjProperty::MONSTER_RESTORE_TYPE, basicType); //store info about creature stack