Squashed 'deps/nostalgia/' changes from 5e90f8d4..3b874c6e
3b874c6e [turbine] Fix refresh logic to handle default refresh within value 6cf7bf96 [ox/std] Hopefully fix MSVC build e34df255 [nostalgia] Update developer-handbook non-error return 7eab2f92 [studio/modlib] Comment out logging in configio 3824788a [ox/std] Add non-const operator[] to Pair 1eac7e1e [ox/std] Add Pair 8798d2d7 [nostalgia/core] Fix getTileIdx(TileSheet, SubSheetId) f82db690 [nostalgia/core] Make load TileSheet functions take CompactTileSheet, in addition to FileAddresses 0dfa7c30 [studio/modlib] Make TaskRunner check that task is not null 2afade24 Merge commit 'fc2dec64389824a251fb258f6fd0a9074e521cc2' 3635702e [nostalgia] Cleanup config IO 6cbafc75 [nostalgia,keel] Make repair return ox::Error 0d7b89a0 [turbine] Add TimeMs alias to uint64_t e8f5c911 [studio/applib] Change updateHandler to 10 second interval 3cb3bc12 [nostalgia/core] Add valid and repair functions for PaletteV3 a2cec10c [keel] Add valid and repair functions for AssetManager git-subtree-dir: deps/nostalgia git-subtree-split: 3b874c6e6aa0b80783fc9d712c31bc837326337c
This commit is contained in:
@ -265,7 +265,7 @@ ox::Error engineCode() noexcept {
|
||||
auto [val, err] = foo(1);
|
||||
oxReturnError(err);
|
||||
doStuff(val);
|
||||
return OxError(0);
|
||||
return {};
|
||||
}
|
||||
|
||||
void anyCode() {
|
||||
@ -288,7 +288,7 @@ ox::Error engineCode() noexcept {
|
||||
auto valerr = foo(1);
|
||||
oxReturnError(valerr);
|
||||
doStuff(valerr.value);
|
||||
return OxError(0);
|
||||
return {};
|
||||
}
|
||||
```
|
||||
|
||||
@ -426,7 +426,7 @@ constexpr ox::Error model(T *h, ox::CommonPtrWith<NostalgiaPalette> auto *pal) n
|
||||
// it is also possible to provide the type name and type version as function arguments
|
||||
//h->setTypeInfo("net.drinkingtea.nostalgia.core.NostalgiaPalette", 1);
|
||||
oxReturnError(h->field("colors", &pal->colors));
|
||||
return OxError(0);
|
||||
return {};
|
||||
}
|
||||
|
||||
template<typename T>
|
||||
@ -438,7 +438,7 @@ constexpr ox::Error model(T *h, ox::CommonPtrWith<NostalgiaGraphic> auto *ng) no
|
||||
oxReturnError(h->field("defaultPalette", &ng->defaultPalette));
|
||||
oxReturnError(h->field("pal", &ng->pal));
|
||||
oxReturnError(h->field("pixels", &ng->pixels));
|
||||
return OxError(0);
|
||||
return {};
|
||||
}
|
||||
```
|
||||
|
||||
@ -475,7 +475,7 @@ constexpr Error model(T *h, ox::CommonPtrWith<FileAddress::Data> auto *obj) noex
|
||||
oxReturnError(h->fieldCString("path", &obj->path));
|
||||
oxReturnError(h->fieldCString("constPath", &obj->path));
|
||||
oxReturnError(h->field("inode", &obj->inode));
|
||||
return OxError(0);
|
||||
return {};
|
||||
}
|
||||
|
||||
template<typename T>
|
||||
@ -492,7 +492,7 @@ constexpr Error model(T *io, ox::CommonPtrWith<FileAddress> auto *fa) noexcept {
|
||||
fa->m_type = static_cast<FileAddressType>(type);
|
||||
oxReturnError(io->field("data", UnionView(&fa->m_data, static_cast<int>(fa->m_type))));
|
||||
}
|
||||
return OxError(0);
|
||||
return {};
|
||||
}
|
||||
|
||||
```
|
||||
|
Reference in New Issue
Block a user