1
0
Fork 0
mirror of https://github.com/TerryCavanagh/VVVVVV.git synced 2024-12-23 01:59:43 +01:00

Call VVV_exit() when SDL_QUIT is received

This fixes a regression introduced by #535 where a quit signal (e.g.
Ctrl-C) sent to the window while the game was in unfocus pause wouldn't
close the game.

One problem was that key.quitProgram would only be checked when control
flow switched back to the outer loop in main(), which would only happen
when the loop order state machine switched to a delta function. As the
unfocused func table didn't have any delta functions, this means
key.quitProgram would never be checked.

So a naïve solution to this would just be to add a no-op delta func
entry to the unfocused func table. However, we then run into a separate
issue where a delta function at the end of a func list never reassigns
the active funcs, causing the game to be stuck in the unfocus pause
forever. Active func reassignment only happens after fixed funcs. So
then a naïve solution after that would be to simply add a no-op fixed
func entry after that. And indeed, that would fix the whole issue.

However, I want to do things the right way. And this does not seem like
the right way. Even putting aside the separate last-func-being-delta
issue, it mandates that every func list needs a delta function. Which
seems quite unnecessary to me.

Another solution I considered was copy-pasting the key.quitProgram check
to the inner loops, or adding some sort of signal propagation to
the inner loops - implemented by copy-pasting checks after each loop -
so we didn't need to copy-paste key.quitProgram... but that seems really
messy, too.

So, I realized that we could throw away key.quitProgram, and simply call
VVV_exit() directly when we receive an SDL_QUIT event. This fixes the
issue, this removes an unnecessary middleman variable, and it's pretty
cleanly and simply the right thing to do.
This commit is contained in:
Misa 2021-04-01 15:24:14 -07:00 committed by Ethan Lee
parent 4ebbfe476a
commit 03a0b1feb2
3 changed files with 3 additions and 4 deletions

View file

@ -5,6 +5,7 @@
#include <string.h> #include <string.h>
#include <utf8/unchecked.h> #include <utf8/unchecked.h>
#include "Exit.h"
#include "Game.h" #include "Game.h"
#include "Graphics.h" #include "Graphics.h"
#include "Music.h" #include "Music.h"
@ -36,7 +37,6 @@ KeyPoll::KeyPoll(void)
// 0..5 // 0..5
sensitivity = 2; sensitivity = 2;
quitProgram = 0;
keybuffer=""; keybuffer="";
leftbutton=0; rightbutton=0; middlebutton=0; leftbutton=0; rightbutton=0; middlebutton=0;
mx=0; my=0; mx=0; my=0;
@ -339,7 +339,7 @@ void KeyPoll::Poll(void)
/* Quit Event */ /* Quit Event */
case SDL_QUIT: case SDL_QUIT:
quitProgram = true; VVV_exit(0);
break; break;
} }
} }

View file

@ -37,7 +37,6 @@ public:
bool resetWindow; bool resetWindow;
bool quitProgram;
void toggleFullscreen(void); void toggleFullscreen(void);
int sensitivity; int sensitivity;

View file

@ -615,7 +615,7 @@ int main(int argc, char *argv[])
gamestate_funcs = get_gamestate_funcs(game.gamestate, &num_gamestate_funcs); gamestate_funcs = get_gamestate_funcs(game.gamestate, &num_gamestate_funcs);
loop_assign_active_funcs(); loop_assign_active_funcs();
while(!key.quitProgram) while (true)
{ {
f_time = SDL_GetTicks(); f_time = SDL_GetTicks();