github/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-08-22 14:23:44 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed compilation errors and window closing issue on linux

Browse source
This commit is contained in:
KiritoDv 2022-05-19 15:45:16 -05:00
commit 4f1e4d312b
4 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
libultraship/libultraship/Lib/Fast3D/gfx_glx.cpp
View file

@ -156,6 +156,7 @@ static struct {
Atom atom_wm_delete_window; Atom atom_wm_delete_window;
bool is_fullscreen; bool is_fullscreen;
bool is_running = true;
void (*on_fullscreen_changed)(bool is_now_fullscreen); void (*on_fullscreen_changed)(bool is_now_fullscreen);
int keymap[256]; int keymap[256];
@ -399,7 +400,7 @@ static void gfx_glx_set_keyboard_callbacks(bool (*on_key_down)(int scancode), bo
} }
static void gfx_glx_main_loop(void (*run_one_game_iter)(void)) { static void gfx_glx_main_loop(void (*run_one_game_iter)(void)) {
while (1) { while (glx.is_running) {
run_one_game_iter(); run_one_game_iter();
} }
} }
@ -440,7 +441,7 @@ static void gfx_glx_handle_events(void) {
} }
} }
if (xev.type == ClientMessage && (Atom)xev.xclient.data.l[0] == glx.atom_wm_delete_window) { if (xev.type == ClientMessage && (Atom)xev.xclient.data.l[0] == glx.atom_wm_delete_window) {
exit(0); glx.is_running = false;
} }
} }
} }

4
libultraship/libultraship/Lib/Fast3D/gfx_opengl.cpp
View file

@ -33,8 +33,8 @@
#else #else
#include <SDL2/SDL.h> #include <SDL2/SDL.h>
#include <GL/glew.h> #include <GL/glew.h>
#define GL_GLEXT_PROTOTYPES 1 // #define GL_GLEXT_PROTOTYPES 1
#include <SDL2/SDL_opengles2.h> // #include <SDL2/SDL_opengles2.h>
#endif #endif
#include "gfx_cc.h" #include "gfx_cc.h"

3
libultraship/libultraship/Lib/Fast3D/gfx_sdl2.cpp
View file

@ -255,8 +255,9 @@ static void gfx_sdl_onkeyup(int scancode) {
} }
static void gfx_sdl_handle_events(void) { static void gfx_sdl_handle_events(void) {
#ifdef __SWITCH__
Ship::Switch::Update(); Ship::Switch::Update();
#endif
SDL_Event event; SDL_Event event;
while (SDL_PollEvent(&event)) { while (SDL_PollEvent(&event)) {
SohImGui::EventImpl event_impl; SohImGui::EventImpl event_impl;

2
soh/soh/OTRGlobals.cpp
View file

@ -61,7 +61,9 @@ extern "C" int AudioPlayer_GetDesiredBuffered(void);
// C->C++ Bridge // C->C++ Bridge
extern "C" void InitOTR() { extern "C" void InitOTR() {
#ifdef __SWITCH__
Ship::Switch::Init(); Ship::Switch::Init();
#endif
OTRGlobals::Instance = new OTRGlobals(); OTRGlobals::Instance = new OTRGlobals();
auto t = OTRGlobals::Instance->context->GetResourceManager()->LoadFile("version"); auto t = OTRGlobals::Instance->context->GetResourceManager()->LoadFile("version");