shweet/snivy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

moar...
Some checks failed
Build / Build Game (push) Has been cancelled
Details

Browse Source
This commit is contained in:
shweet
2026-02-28 22:16:26 -05:00
parent e2a2d2c464
commit acb1505308
3 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/resource/xml/anm2.cpp
View File

@@ -17,9 +17,9 @@ namespace game::resource::xml
Anm2& Anm2::operator=(const Anm2&) = default; Anm2& Anm2::operator=(const Anm2&) = default;
Anm2& Anm2::operator=(Anm2&&) = default; Anm2& Anm2::operator=(Anm2&&) = default;
void Anm2::init(XMLDocument& document, Flags flags, const physfs::Path& archive) void Anm2::init(XMLDocument& document, Flags anm2Flags, const physfs::Path& archive)
{ {
this->flags = flags; this->flags = anm2Flags;
auto element = document.RootElement(); auto element = document.RootElement();
if (!element) return; if (!element) return;
@@ -298,13 +298,14 @@ namespace game::resource::xml
isValid = true; isValid = true;
} }
Anm2::Anm2(const std::filesystem::path& path, Flags flags) Anm2::Anm2(const std::filesystem::path& path, Flags anm2Flags)
{ {
XMLDocument document; XMLDocument document;
auto pathString = path.string();
if (document.LoadFile(path.c_str()) != XML_SUCCESS) if (document.LoadFile(pathString.c_str()) != XML_SUCCESS)
{ {
logger.error(std::format("Failed to initialize anm2: {} ({})", path.string(), document.ErrorStr())); logger.error(std::format("Failed to initialize anm2: {} ({})", pathString, document.ErrorStr()));
isValid = false; isValid = false;
return; return;
} }
@@ -313,12 +314,12 @@ namespace game::resource::xml
this->path = path.string(); this->path = path.string();
init(document, flags); init(document, anm2Flags);
logger.info(std::format("Initialized anm2: {}", path.string())); logger.info(std::format("Initialized anm2: {}", pathString));
} }
Anm2::Anm2(const physfs::Path& path, Flags flags) Anm2::Anm2(const physfs::Path& path, Flags anm2Flags)
{ {
XMLDocument document; XMLDocument document;
@@ -329,7 +330,7 @@ namespace game::resource::xml
} }
this->path = path; this->path = path;
init(document, flags, path.directory_get()); init(document, anm2Flags, path.directory_get());
logger.info(std::format("Initialized anm2: {}", path.c_str())); logger.info(std::format("Initialized anm2: {}", path.c_str()));
} }

2
src/resource/xml/anm2.hpp
View File

@@ -172,6 +172,6 @@ namespace game::resource::xml
bool is_valid() const; bool is_valid() const;
private: private:
void init(tinyxml2::XMLDocument& document, Flags flags, const util::physfs::Path& archive = {}); void init(tinyxml2::XMLDocument& document, Flags anm2Flags, const util::physfs::Path& archive = {});
}; };
} }

2
src/resource/xml/character.cpp
View File

@@ -190,8 +190,6 @@ namespace game::resource::xml
} }
} }
auto itemSchemaPath = physfs::Path(archive + "/" + "items.xml");
if (auto itemSchemaPath = physfs::Path(archive + "/" + "items.xml"); itemSchemaPath.is_valid()) if (auto itemSchemaPath = physfs::Path(archive + "/" + "items.xml"); itemSchemaPath.is_valid())
itemSchema = Item(itemSchemaPath); itemSchema = Item(itemSchemaPath);
else else