Skip to content

Commit 3d67fd7

Browse files
authored
Run QuitGame instead of DoSaveGame when quitting a game after pressing CTRL+Q (#388)
1 parent 8751f63 commit 3d67fd7

File tree

1 file changed

+15
-10
lines changed

1 file changed

+15
-10
lines changed

src/DETHRACE/common/utility.c

+15-10
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
#include "input.h"
1313
#include "loading.h"
1414
#include "loadsave.h"
15+
#include "main.h"
1516
#include "mainmenu.h"
1617
#include "network.h"
1718
#include "pd/sys.h"
@@ -44,18 +45,22 @@ br_pixelmap* gSource_for_16bit_palette;
4445
int CheckQuit(void) {
4546
LOG_TRACE8("()");
4647

47-
if (!gIn_check_quit && KeyIsDown(KEYMAP_CTRL_QUIT) && KeyIsDown(KEYMAP_CONTROL_ANY)) {
48-
gIn_check_quit = 1;
49-
while (AnyKeyDown()) {
50-
;
51-
}
48+
if (gIn_check_quit) {
49+
return 0;
50+
}
51+
if (!KeyIsDown(KEYMAP_CTRL_QUIT) || !KeyIsDown(KEYMAP_CONTROL_ANY)) {
52+
return 0;
53+
}
54+
gIn_check_quit = 1;
55+
while (AnyKeyDown()) {
56+
;
57+
}
5258

53-
if (DoVerifyQuit(1)) {
54-
DoSaveGame(1);
55-
}
56-
gIn_check_quit = 0;
59+
if (DoVerifyQuit(1)) {
60+
QuitGame();
5761
}
58-
return 0;
62+
gIn_check_quit = 0;
63+
return 1;
5964
}
6065

6166
// IDA: double __cdecl sqr(double pN)

0 commit comments

Comments
 (0)