Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix type for filename in load*XML functions #4357

Merged
merged 1 commit into from
Mar 29, 2023
Merged

Fix type for filename in load*XML functions #4357

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/iomap.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ bool IOMap::loadMap(Map* map, const std::filesystem::path& fileName)
{
int64_t start = OTSYS_TIME();
try {
OTB::Loader loader{fileName, OTB::Identifier{{'O', 'T', 'B', 'M'}}};
OTB::Loader loader{fileName.string(), OTB::Identifier{{'O', 'T', 'B', 'M'}}};
auto& root = loader.parseTree();

PropStream propStream;
Expand Down
4 changes: 2 additions & 2 deletions src/iomap.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ class IOMap
map->spawnfile += "-spawn.xml";
}

return map->spawns.loadFromXml(map->spawnfile);
return map->spawns.loadFromXml(map->spawnfile.string());
}

/* Load the houses (not house tile-data)
Expand All @@ -125,7 +125,7 @@ class IOMap
map->housefile += "-house.xml";
}

return map->houses.loadHousesXML(map->housefile);
return map->houses.loadHousesXML(map->housefile.string());
}

const std::string& getLastErrorString() const { return errorString; }
Expand Down