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

- fix uninitialized cursor

Browse Source 
- stubs for loading heroes and classes from mods (no real code yet)
- heroes loading uses string IDs for secondary skills, some cleanup in HeroHandler
This commit is contained in:
Ivan Savenko
2012-12-15 08:47:02 +00:00
parent 423a226e31
commit d2ee602b29
8 changed files with 1462 additions and 1413 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
lib/CModHandler.cpp
View File

@ -5,6 +5,11 @@
#include "Filesystem/CResourceLoader.h"
#include "Filesystem/ISimpleResourceLoader.h"
#include "CCreatureHandler.h"
#include "CArtHandler.h"
#include "CTownHandler.h"
#include "CHeroHandler.h"
/*
* CModHandler.h, part of VCMI engine
*
@ -131,6 +136,12 @@ std::vector<std::string> CModHandler::getActiveMods()
return activeMods;
}
template<typename Handler>
void handleData(Handler handler, const JsonNode & config)
{
handler->load(JsonUtils::assembleFromFiles(config.convertTo<std::vector<std::string> >()));
}
void CModHandler::loadActiveMods()
{
BOOST_FOREACH(std::string & modName, activeMods)
@ -139,9 +150,12 @@ void CModHandler::loadActiveMods()
const JsonNode config = JsonNode(ResourceID(modFileName));
VLC->townh->load(JsonUtils::assembleFromFiles(config ["factions"].convertTo<std::vector<std::string> >()));
VLC->creh->load( JsonUtils::assembleFromFiles(config["creatures"].convertTo<std::vector<std::string> >()));
VLC->arth->load( JsonUtils::assembleFromFiles(config["artifacts"].convertTo<std::vector<std::string> >()));
handleData(VLC->townh, config["factions"]);
handleData(VLC->creh, config["creatures"]);
handleData(VLC->arth, config["artifacts"]);
handleData(&VLC->heroh->classes, config["heroClasses"]);
handleData(VLC->heroh, config["heroes"]);
}
VLC->creh->buildBonusTreeForTiers(); //do that after all new creatures are loaded