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

[keel] Make keel attempt to delete all existing assets when FS is changed

Browse Source
This commit is contained in:
Gary Talent
2025-07-30 00:36:56 -05:00
parent aacff3daf9
commit 07e5bf9054
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -25,12 +25,11 @@ ox::Error writeUuidHeader(ox::Writer_c auto &writer, ox::UUID const&uuid) noexce
template<typename T> template<typename T>
ox::Result<T> readAsset(ox::BufferView buff) noexcept { ox::Result<T> readAsset(ox::BufferView buff) noexcept {
std::size_t offset = 0;
auto const err = readUuidHeader(buff).error; auto const err = readUuidHeader(buff).error;
if (!err) { if (!err) {
offset = K1HdrSz; // the size of K1 headers buff += K1HdrSz; // the size of K1 headers
} }
auto out = ox::readClaw<T>(buff + offset); auto out = ox::readClaw<T>(buff);
OX_RETURN_ERROR(out); OX_RETURN_ERROR(out);
OX_RETURN_ERROR(ensureValid(out.value)); OX_RETURN_ERROR(ensureValid(out.value));
return out; return out;

3
src/olympic/keel/src/media.cpp
View File

@@ -261,6 +261,9 @@ namespace keel {
ox::Error setRomFs(Context &ctx, ox::UPtr<ox::FileSystem> &&fs, DuplicateSet &duplicateSet) noexcept { ox::Error setRomFs(Context &ctx, ox::UPtr<ox::FileSystem> &&fs, DuplicateSet &duplicateSet) noexcept {
ctx.rom = std::move(fs); ctx.rom = std::move(fs);
clearUuidMap(ctx); clearUuidMap(ctx);
#ifndef OX_BARE_METAL
ctx.assetManager.gc();
#endif
return buildUuidMap(ctx, &duplicateSet); return buildUuidMap(ctx, &duplicateSet);
} }