projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
moved handling game music with negative ID from mixer to helper function
[rocksndiamonds.git]
/
src
/
init.c
diff --git
a/src/init.c
b/src/init.c
index ea7c8f9a744742b46fdf179a7d40ac3f5b719506..54f4277d736fc9843ce9a583c9983dc10fc0782e 100644
(file)
--- a/
src/init.c
+++ b/
src/init.c
@@
-97,6
+97,9
@@
void DrawInitAnim()
int sync_frame = FrameCounter;
int x, y;
int sync_frame = FrameCounter;
int x, y;
+ /* prevent OS (Windows) from complaining about program not responding */
+ CheckQuitEvent();
+
if (game_status != GAME_MODE_LOADING)
return;
if (game_status != GAME_MODE_LOADING)
return;
@@
-4835,6
+4838,7
@@
static void InitGlobal()
global.create_images_dir = NULL;
global.frames_per_second = 0;
global.create_images_dir = NULL;
global.frames_per_second = 0;
+ global.show_frames_per_second = FALSE;
global.border_status = GAME_MODE_LOADING;
global.anim_status = global.anim_status_next = GAME_MODE_LOADING;
global.border_status = GAME_MODE_LOADING;
global.anim_status = global.anim_status_next = GAME_MODE_LOADING;
@@
-5054,6
+5058,9
@@
static void InitSetup()
if (setup.options.verbose)
options.verbose = TRUE;
if (setup.options.verbose)
options.verbose = TRUE;
+
+ if (setup.debug.show_frames_per_second)
+ global.show_frames_per_second = TRUE;
}
static void InitGameInfo()
}
static void InitGameInfo()
@@
-6108,7
+6115,7
@@
void CloseAllAndExit(int exit_value)
CloseVideoDisplay();
ClosePlatformDependentStuff();
CloseVideoDisplay();
ClosePlatformDependentStuff();
- if (exit_value != 0)
+ if (exit_value != 0
&& !options.execute_command
)
{
/* fall back to default level set (current set may have caused an error) */
SaveLevelSetup_LastSeries_Deactivate();
{
/* fall back to default level set (current set may have caused an error) */
SaveLevelSetup_LastSeries_Deactivate();