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

Created dwellings.json from cregens.txt.

Browse Source
This commit is contained in:
Frank Zago
2011-09-03 14:14:43 +00:00
parent 04995938dc
commit 029b77e7c4
3 changed files with 123 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
lib/CObjectHandler.cpp
View File

@ -27,6 +27,7 @@
#include <boost/format.hpp>
#include <boost/algorithm/string/trim.hpp>
#include "CBuildingHandler.h"
#include "../lib/JsonNode.h"
using namespace boost::assign;
@ -181,27 +182,23 @@ void CObjectHandler::readConfigLine(std::ifstream &istr, int g)
void CObjectHandler::loadObjects()
{
tlog5 << "\t\tReading cregens \n";
cregens.resize(110); //TODO: hardcoded value - change
for(size_t i=0; i < cregens.size(); ++i)
{
tlog5 << "\t\tReading cregens \n";
cregens.resize(110); //TODO: hardcoded value - change
for(size_t i=0; i < cregens.size(); ++i)
{
cregens[i]=-1;
}
std::ifstream ifs(DATA_DIR "/config/cregens.txt");
while(!ifs.eof())
{
int dw, cr;
ifs >> dw >> cr;
cregens[dw]=cr;
}
tlog5 << "\t\tDone loading objects!\n";
cregens[i]=-1;
}
ifs.close();
ifs.clear();
const JsonNode config(DATA_DIR "/config/dwellings.json");
BOOST_FOREACH(const JsonNode &dwelling, config["dwellings"].Vector())
{
cregens[dwelling["dwelling"].Float()] = dwelling["creature"].Float();
}
tlog5 << "\t\tDone loading cregens!\n";
{
int k = -1;
ifs.open(DATA_DIR "/config/resources.txt");
std::ifstream ifs(DATA_DIR "/config/resources.txt");
ifs >> k;
int pom;
for(int i=0;i<k;i++)
@ -7112,4 +7109,4 @@ int GrowthInfo::totalGrowth() const
ret += entry.count;
return ret;
}
}