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

Merge commit '420fa96463f59c4a4a7cd66b16b0ad01ab0d55e6'

Browse Source
This commit is contained in:
Gary Talent
2024-05-08 23:55:07 -05:00
parent 423212b2ad f624c720f9
commit 7d1641faee
44 changed files with 529 additions and 344 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/olympic/studio/applib/src/main.cpp
View File

@ -68,7 +68,7 @@ static ox::Error run(
static_cast<uint64_t>(time << 1)
});
// run app
auto const err = runApp(appName, projectDataDir, ox::UniquePtr<ox::FileSystem>(nullptr));
auto const err = runApp(appName, projectDataDir, ox::UPtr<ox::FileSystem>(nullptr));
oxAssert(err, "Something went wrong...");
return err;
}

4
src/olympic/studio/modlib/include/studio/imguiutil.hpp
View File

@ -29,9 +29,9 @@ ox::Result<T> getDragDropPayload(ox::CStringView name) noexcept {
if (!payload) {
return OxError(1, "No drag/drop payload");
}
return ox::readClaw<T>(
return ox::readClaw<T>({
reinterpret_cast<char const*>(payload->Data),
static_cast<size_t>(payload->DataSize));
static_cast<size_t>(payload->DataSize)});
}
ox::Error setDragDropPayload(ox::CStringView name, auto const &obj) noexcept {