drinkingtea/jasper
2
0
Fork 0
Code Issues 2 Pull Requests Actions Releases Activity

Squashed 'deps/nostalgia/' changes from f987b02c..1af4da43

Browse Source 
1af4da43 [nostalgia] Update release notes
4fa879a0 [nostalgia/sample_project] Update NS_Logo.ng to final TileSheetV5 format
fd8f1a29 [nostalgia] Add release notes document
9fda2763 [nostalgia/gfx] Make TileSheetV5::defaultPalette a string instead of FileAddress
cda23ac4 [ox/std] Change ox::String::operator[](size_t) const return a reference
c36b244d [nostalgia/gfx] Cleanup, add PaletteV5, restore mistakenly removed function
335d278f [ox/oc] Fix integer read for signed/unsigned

git-subtree-dir: deps/nostalgia
git-subtree-split: 1af4da43ad5512cc654e7a18265eba52b6523adf
This commit is contained in:
Gary Talent
2025-01-21 22:58:02 -06:00
parent ec49463217
commit 6fdf744dd2
15 changed files with 183 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
deps/ox/src/ox/oc/read.hpp vendored
View File

@ -144,7 +144,11 @@ Error OrganicClawReader::field(const char *key, T *val) noexcept {
if (jv.empty()) {
*val = 0;
} else if (rightType) {
*val = static_cast<T>(jv.asUInt());
if constexpr(ox::is_signed_v<T>) {
*val = static_cast<T>(jv.asInt64());
} else {
*val = static_cast<T>(jv.asUInt64());
}
} else {
err = ox::Error(1, "Type mismatch");
}
@ -172,7 +176,8 @@ Error OrganicClawReader::field(const char *key, T *val) noexcept {
err = ox::Error(1, "Type mismatch");
}
}
} catch (Json::LogicError const&) {
} catch (Json::LogicError const&e) {
oxDebugf("JSON error: {}", e.what());
err = ox::Error(1, "error reading JSON data");
}
++m_fieldIt;

4
deps/ox/src/ox/std/string.hpp vendored
View File

@ -171,7 +171,7 @@ class BasicString {
constexpr bool operator>=(BasicString const&other) const noexcept;
constexpr char operator[](std::size_t i) const noexcept;
constexpr char const&operator[](std::size_t i) const noexcept;
constexpr char &operator[](std::size_t i) noexcept;
@ -490,7 +490,7 @@ constexpr bool BasicString<SmallStringSize_v>::operator>=(BasicString const&othe
}
template<std::size_t SmallStringSize_v>
constexpr char BasicString<SmallStringSize_v>::operator[](std::size_t i) const noexcept {
constexpr char const&BasicString<SmallStringSize_v>::operator[](std::size_t i) const noexcept {
return m_buff[i];
}