diff --git a/src/sys/nact.cpp b/src/sys/nact.cpp index 630741a..eb66dec 100644 --- a/src/sys/nact.cpp +++ b/src/sys/nact.cpp @@ -409,6 +409,7 @@ void NACT::wait_after_open_menu() } void NACT::sys_sleep(int ms) { + pump_events(); ags->update_screen(); SDL_Delay(ms); } diff --git a/src/sys/nact.h b/src/sys/nact.h index 78894d3..6b07a6c 100644 --- a/src/sys/nact.h +++ b/src/sys/nact.h @@ -266,7 +266,7 @@ public: void fatal(const char* msg, ...); private: - bool pump_events(); + void pump_events(); void on_syswmevent(SDL_SysWMmsg* msg); }; diff --git a/src/sys/nact_input.cpp b/src/sys/nact_input.cpp index 2ed9cf5..2294e5d 100644 --- a/src/sys/nact_input.cpp +++ b/src/sys/nact_input.cpp @@ -15,13 +15,14 @@ static int mousex, mousey, fingers; -bool NACT::pump_events() +void NACT::pump_events() { SDL_Event e; while (SDL_PollEvent(&e)) { switch (e.type) { case SDL_QUIT: - return true; + terminate = true; + break; case SDL_MOUSEMOTION: mousex = e.motion.x; @@ -45,7 +46,6 @@ bool NACT::pump_events() break; } } - return false; } uint8 NACT::get_key() @@ -54,8 +54,7 @@ uint8 NACT::get_key() texthook_keywait(); - if (pump_events()) - terminate = true; + pump_events(); // キーボード&マウス const Uint8* key = SDL_GetKeyboardState(NULL); @@ -99,8 +98,7 @@ uint8 NACT::get_key() void NACT::get_cursor(int* x, int* y) { - if (pump_events()) - terminate = true; + pump_events(); *x = mousex; *y = mousey; }