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

[nostalgia,olympic] Cleanup

Browse Source
This commit is contained in:
Gary Talent
2024-12-13 22:00:03 -06:00
parent fcac134af0
commit a5271f6cf6
27 changed files with 64 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
deps/nostalgia/src/olympic/turbine/src/gba/gfx.cpp vendored
View File

@ -44,7 +44,7 @@ ox::Bounds getWindowBounds(Context&) noexcept {
}
ox::Error setWindowBounds(Context&, ox::Bounds const&) noexcept {
return OxError(1, "setWindowBounds not supported on GBA");
return ox::Error(1, "setWindowBounds not supported on GBA");
}
}

2
deps/nostalgia/src/olympic/turbine/src/gba/turbine.cpp vendored
View File

@ -55,7 +55,7 @@ OX_ALLOW_UNSAFE_BUFFERS_BEGIN
}
}
OX_ALLOW_UNSAFE_BUFFERS_END
return OxError(1);
return ox::Error(1);
}
ox::Result<ContextUPtr> init(

2
deps/nostalgia/src/olympic/turbine/src/glfw/clipboard.cpp vendored
View File

@ -30,7 +30,7 @@ ox::Result<BaseClipboardObject*> getClipboardData(Context &ctx, ox::StringView t
if (ctx.clipboard && ctx.clipboard->typeId() == typeId) {
return ctx.clipboard.get();
}
return OxError(1);
return ox::Error(1);
}
}

4
deps/nostalgia/src/olympic/turbine/src/glfw/gfx.cpp vendored
View File

@ -204,7 +204,7 @@ ox::Error initGfx(Context &ctx) noexcept {
ctx.window = glfwCreateWindow(240 * Scale, 160 * Scale, ctx.keelCtx.appName.c_str(), nullptr, nullptr);
//ctx.window = glfwCreateWindow(876, 743, ctx.keelCtx.appName.c_str(), nullptr, nullptr);
if (ctx.window == nullptr) {
return OxError(1, "Could not open GLFW window");
return ox::Error(1, "Could not open GLFW window");
}
glfwSetCursorPosCallback(ctx.window, handleGlfwCursorPosEvent);
glfwSetMouseButtonCallback(ctx.window, handleGlfwMouseButtonEvent);
@ -212,7 +212,7 @@ ox::Error initGfx(Context &ctx) noexcept {
glfwSetWindowUserPointer(ctx.window, &ctx);
glfwMakeContextCurrent(ctx.window);
if (!gladLoadGLES2Loader(reinterpret_cast<GLADloadproc>(glfwGetProcAddress))) {
return OxError(2, "Could not init Glad");
return ox::Error(2, "Could not init Glad");
}
#if TURBINE_USE_IMGUI
IMGUI_CHECKVERSION();