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

Created obstacles.json from obstacles.txt.

Browse Source
This commit is contained in:
Frank Zago
2011-09-02 02:12:55 +00:00
parent fbf822ba11
commit 3cb92baf18
3 changed files with 125 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
lib/CHeroHandler.cpp
View File

@ -144,34 +144,19 @@ CHeroHandler::CHeroHandler()
void CHeroHandler::loadObstacles()
{
std::ifstream inp;
inp.open(DATA_DIR "/config/obstacles.txt", std::ios_base::in|std::ios_base::binary);
if(!inp.is_open())
{
tlog1<<"missing file: config/obstacles.txt"<<std::endl;
}
else
{
const int MAX_DUMP = 10000;
char dump[MAX_DUMP+1];
const JsonNode config(DATA_DIR "/config/obstacles.json");
for(int i=0; i<8; ++i)
{
inp.getline(dump, MAX_DUMP);
}
while(true)
{
CObstacleInfo obi;
inp>>obi.ID;
if(obi.ID == -1) break;
inp>>obi.defName;
inp>>obi.blockmap;
inp>>obi.allowedTerrains;
inp>>obi.posShift.first;
inp>>obi.posShift.second;
obstacles[obi.ID] = obi;
}
inp.close();
BOOST_FOREACH(const JsonNode &obs, config["obstacles"].Vector()) {
CObstacleInfo obi;
obi.ID = obs["id"].Float();
obi.defName = obs["defname"].String();
obi.blockmap = obs["blockmap"].String();
obi.allowedTerrains = obs["terrains"].String();
obi.posShift.first = obs["shift_x"].Float();
obi.posShift.second = obs["shift_y"].Float();
obstacles[obi.ID] = obi;
}
}