drinkingtea/nostalgia
2
0
Fork 0
Code Issues 4 Pull Requests Actions Releases 13 Activity

[olympic] Change readClaw to take ref to TypeStore

Browse Source
This commit is contained in:
Gary Talent
2023-12-14 23:56:14 -06:00
parent 8b3b8d50d6
commit 4b824ddef4
5 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/olympic/keel/include/keel/asset.hpp
View File

@@ -31,7 +31,7 @@ ox::Result<T> readAsset(const ox::Buffer &buff) noexcept {
return ox::readClaw<T>(buff.data() + offset, buff.size() - offset);
}
ox::Result<ox::ModelObject> readAsset(ox::TypeStore *ts, const ox::Buffer &buff) noexcept;
ox::Result<ox::ModelObject> readAsset(ox::TypeStore &ts, const ox::Buffer &buff) noexcept;
struct AssetHdr {
ox::UUID uuid;

2
src/olympic/keel/include/keel/pack.hpp
View File

@@ -89,7 +89,7 @@ ox::Error preloadObj(
ox::CRStringView path) noexcept {
// load file
oxRequireM(buff, romFs.read(path));
oxRequireM(obj, keel::readAsset(&ts, buff));
oxRequireM(obj, keel::readAsset(ts, buff));
if (obj.type()->preloadable) {
oxOutf("preloading {}\n", path);
// preload