From 2c88845b9e4eb54a4ac04f16588bd6f45ceaaaf1 Mon Sep 17 00:00:00 2001 From: Ivan Savenko Date: Thu, 20 Sep 2012 16:14:23 +0000 Subject: [PATCH] - compile fix --- client/CMusicHandler.h | 2 +- lib/CModHandler.cpp | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/client/CMusicHandler.h b/client/CMusicHandler.h index b208e1db2..ef0643047 100644 --- a/client/CMusicHandler.h +++ b/client/CMusicHandler.h @@ -44,7 +44,7 @@ private: std::map soundChunks; Mix_Chunk *GetSoundChunk(soundBase::soundID soundID); - Mix_Chunk *CSoundHandler::GetSoundChunk(std::string &sound); + Mix_Chunk *GetSoundChunk(std::string &sound); //have entry for every currently active channel //boost::function will be NULL if callback was not set diff --git a/lib/CModHandler.cpp b/lib/CModHandler.cpp index 4ca0e13bb..acdf29e71 100644 --- a/lib/CModHandler.cpp +++ b/lib/CModHandler.cpp @@ -1,8 +1,8 @@ #include "StdInc.h" #include "CModHandler.h" #include "JsonNode.h" -#include "Filesystem\CResourceLoader.h" -#include "Filesystem\ISimpleResourceLoader.h" +#include "Filesystem/CResourceLoader.h" +#include "Filesystem/ISimpleResourceLoader.h" /* * CModHandler.h, part of VCMI engine * @@ -69,13 +69,13 @@ void CModHandler::loadConfigFromFile (std::string name) //TODO: read mods from Mods/ folder - auto & configList = CResourceHandler::get()->getResourcesWithName (ResourceID("CONFIG/MODS/HOTA/MOD", EResType::TEXT)); + auto & configList = CResourceHandler::get()->getResourcesWithName (ResourceID("CONFIG/MODS/HOTA/MOD", EResType::TEXT)); - BOOST_FOREACH(auto & entry, configList) - { - auto stream = entry.getLoader()->load (entry.getResourceName()); - std::unique_ptr textData (new ui8[stream->getSize()]); - stream->read (textData.get(), stream->getSize()); + BOOST_FOREACH(auto & entry, configList) + { + auto stream = entry.getLoader()->load (entry.getResourceName()); + std::unique_ptr textData (new ui8[stream->getSize()]); + stream->read (textData.get(), stream->getSize()); tlog3 << "\t\tFound mod file: " << entry.getResourceName() << "\n"; const JsonNode config ((char*)textData.get(), stream->getSize());