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

minor fixes:

Browse Source 
- vcmi can play music files from archives
- converted resource_reward fields in bank_config into json object, fixes 3000 gems reward in shipwreck
- some compile fixes for minizip
This commit is contained in:
Ivan Savenko
2013-07-31 11:36:42 +00:00
parent 1d9139303a
commit ee09c5301e
10 changed files with 356 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lib/CObjectHandler.cpp
View File

@ -171,6 +171,7 @@ static void readCreatures(const JsonNode &creature, std::vector< std::pair <Crea
{
std::pair<CreatureID, si32> creInfo = std::make_pair(CreatureID::NONE, 0);
//TODO: replace numeric id's with mod-friendly string id's
creInfo.second = creature["number"].Float();
creInfo.first = CreatureID((si32)creature["id"].Float());
storage.push_back(creInfo);
@ -191,13 +192,7 @@ static void readBankLevel(const JsonNode &level, BankConfig &bc)
bc.upgradeChance = level["upgrade_chance"].Float();
bc.combatValue = level["combat_value"].Float();
bc.resources.resize(GameConstants::RESOURCE_QUANTITY);
idx = 0;
for(const JsonNode &resource : level["reward_resources"].Vector())
{
bc.resources[idx] = resource.Float();
idx ++;
}
bc.resources = Res::ResourceSet(level["reward_resources"]);
for(const JsonNode &creature : level["reward_creatures"].Vector())
{