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

Merge branch 'Zyx-develop' into develop

Browse Source 
Conflicts:
	lib/filesystem/AdapterLoaders.h
This commit is contained in:
AlexVinS
2016-01-27 18:53:41 +03:00
parent 3c84400262 bffdc2813d
commit d7c0c3759a
36 changed files with 496 additions and 171 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/CModHandler.cpp
View File

@ -2,6 +2,7 @@
#include "CModHandler.h"
#include "mapObjects/CObjectClassesHandler.h"
#include "JsonNode.h"
#include "filesystem/FileStream.h"
#include "filesystem/Filesystem.h"
#include "filesystem/AdapterLoaders.h"
#include "filesystem/CFilesystemLoader.h"
@ -901,6 +902,6 @@ void CModHandler::afterLoad()
}
modSettings["core"] = coreMod.saveLocalData();
std::ofstream file(*CResourceHandler::get()->getResourceName(ResourceID("config/modSettings.json")), std::ofstream::trunc);
FileStream file(*CResourceHandler::get()->getResourceName(ResourceID("config/modSettings.json")), std::ofstream::out | std::ofstream::trunc);
file << modSettings;
}