1
0
mirror of https://github.com/vcmi/vcmi.git synced 2025-04-23 12:08:45 +02:00
This commit is contained in:
AlexVinS 2016-08-30 11:45:05 +03:00
parent a50a32405d
commit cf1d5d0bc9
3 changed files with 11 additions and 1 deletions

View File

@ -30,6 +30,10 @@ CIdentifierStorage::CIdentifierStorage():
{ {
} }
CIdentifierStorage::~CIdentifierStorage()
{
}
void CIdentifierStorage::checkIdentifier(std::string & ID) void CIdentifierStorage::checkIdentifier(std::string & ID)
{ {
if (boost::algorithm::ends_with(ID, ".")) if (boost::algorithm::ends_with(ID, "."))
@ -558,6 +562,10 @@ CModHandler::CModHandler()
} }
CModHandler::~CModHandler()
{
}
void CModHandler::loadConfigFromFile (std::string name) void CModHandler::loadConfigFromFile (std::string name)
{ {
std::string paths; std::string paths;

View File

@ -69,6 +69,7 @@ class CIdentifierStorage
std::vector<ObjectData> getPossibleIdentifiers(const ObjectCallback & callback); std::vector<ObjectData> getPossibleIdentifiers(const ObjectCallback & callback);
public: public:
CIdentifierStorage(); CIdentifierStorage();
virtual ~CIdentifierStorage();
/// request identifier for specific object name. /// request identifier for specific object name.
/// Function callback will be called during ID resolution phase of loading /// Function callback will be called during ID resolution phase of loading
void requestIdentifier(std::string scope, std::string type, std::string name, const std::function<void(si32)> & callback); void requestIdentifier(std::string scope, std::string type, std::string name, const std::function<void(si32)> & callback);
@ -291,6 +292,7 @@ public:
} modules; } modules;
CModHandler(); CModHandler();
virtual ~CModHandler();
std::string normalizeIdentifier(const std::string & scope, const std::string & remoteScope, const std::string & identifier) const; std::string normalizeIdentifier(const std::string & scope, const std::string & remoteScope, const std::string & identifier) const;

View File

@ -68,7 +68,7 @@ void LibClasses::loadFilesystem()
CResourceHandler::load("config/filesystem.json"); CResourceHandler::load("config/filesystem.json");
logGlobal->infoStream()<<"\t Data loading: "<<loadTime.getDiff(); logGlobal->infoStream()<<"\t Data loading: "<<loadTime.getDiff();
modh = new CModHandler; modh = new CModHandler();
logGlobal->infoStream()<<"\tMod handler: "<<loadTime.getDiff(); logGlobal->infoStream()<<"\tMod handler: "<<loadTime.getDiff();
modh->loadMods(); modh->loadMods();