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

- removed multiple unused files

Browse Source 
- config folder with all json files is used via new FS API
- fixed campaigns loading. Replaced "detect h3m starts" heuristics with CCompessedStream::getNextBlock()
This commit is contained in:
Ivan Savenko
2012-08-02 11:03:26 +00:00
parent b3c17d2788
commit e67f8afdd9
60 changed files with 211 additions and 1397 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
client/AdventureMapClasses.cpp
View File

@ -3,6 +3,7 @@
#include "../CCallback.h"
#include "../lib/JsonNode.h"
#include "../lib/Filesystem/CResourceLoader.h"
#include "../lib/map.h"
#include "../lib/CObjectHandler.h"
#include "../lib/CGameState.h"
@ -479,7 +480,7 @@ std::map<int, std::pair<SDL_Color, SDL_Color> > CMinimap::loadColors(std::string
{
std::map<int, std::pair<SDL_Color, SDL_Color> > ret;
const JsonNode config(GameConstants::DATA_DIR + from);
const JsonNode config(ResourceID(from, EResType::TEXT));
BOOST_FOREACH(const JsonNode &m, config["MinimapColors"].Vector())
{
@ -513,7 +514,7 @@ CMinimap::CMinimap(const Rect &position):
aiShield(nullptr),
minimap(nullptr),
level(0),
colors(loadColors("/config/minimap.json"))
colors(loadColors("config/minimap.json"))
{
pos.w = position.w;
pos.h = position.h;