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

Merge pull request #2757 from IvanSavenko/filesystem_refactor

Browse Source 
Filesystem refactor - part 1
This commit is contained in:
Ivan Savenko
2023-09-07 10:51:02 +03:00
committed by GitHub
parent 5f07f3f091 f30355839f
commit f39fbe5151
237 changed files with 1926 additions and 1761 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/mapObjectConstructors/CObjectClassesHandler.cpp
View File

@ -112,7 +112,7 @@ std::vector<JsonNode> CObjectClassesHandler::loadLegacyData()
{
size_t dataSize = VLC->settings()->getInteger(EGameSettings::TEXTS_OBJECT);
CLegacyConfigParser parser("Data/Objects.txt");
CLegacyConfigParser parser(TextPath::builtin("Data/Objects.txt"));
auto totalNumber = static_cast<size_t>(parser.readNumber()); // first line contains number of objects to read and nothing else
parser.endLine();
@ -132,7 +132,7 @@ std::vector<JsonNode> CObjectClassesHandler::loadLegacyData()
std::vector<JsonNode> ret(dataSize);// create storage for 256 objects
assert(dataSize == 256);
CLegacyConfigParser namesParser("Data/ObjNames.txt");
CLegacyConfigParser namesParser(TextPath::builtin("Data/ObjNames.txt"));
for (size_t i=0; i<256; i++)
{
ret[i]["name"].String() = namesParser.readString();
@ -142,7 +142,7 @@ std::vector<JsonNode> CObjectClassesHandler::loadLegacyData()
JsonNode cregen1;
JsonNode cregen4;
CLegacyConfigParser cregen1Parser("data/crgen1");
CLegacyConfigParser cregen1Parser(TextPath::builtin("data/crgen1"));
do
{
JsonNode subObject;
@ -151,7 +151,7 @@ std::vector<JsonNode> CObjectClassesHandler::loadLegacyData()
}
while(cregen1Parser.endLine());
CLegacyConfigParser cregen4Parser("data/crgen4");
CLegacyConfigParser cregen4Parser(TextPath::builtin("data/crgen4"));
do
{
JsonNode subObject;