projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added optional button to restart game (door, panel and touch variants)
[rocksndiamonds.git]
/
src
/
init.c
diff --git
a/src/init.c
b/src/init.c
index 33c47f98e9c423f7c056b7d74a53ded8173e8826..62a5d0ff860865ef4d203e8b71f2b30da8b23ff7 100644
(file)
--- a/
src/init.c
+++ b/
src/init.c
@@
-1649,7
+1649,7
@@
static void set_graphic_parameters_ext(int graphic, int *parameter,
g->draw_yoffset = parameter[GFX_ARG_DRAW_YOFFSET];
// use a different default value for global animations and toons
g->draw_yoffset = parameter[GFX_ARG_DRAW_YOFFSET];
// use a different default value for global animations and toons
- if ((graphic >= IMG_GFX_GLOBAL_ANIM_1 && graphic <= IMG_GFX_GLOBAL_ANIM_
8
) ||
+ if ((graphic >= IMG_GFX_GLOBAL_ANIM_1 && graphic <= IMG_GFX_GLOBAL_ANIM_
32
) ||
(graphic >= IMG_TOON_1 && graphic <= IMG_TOON_20))
g->draw_masked = TRUE;
(graphic >= IMG_TOON_1 && graphic <= IMG_TOON_20))
g->draw_masked = TRUE;
@@
-5493,9
+5493,7
@@
static void InitSetup(void)
static void InitGameInfo(void)
{
game.restart_level = FALSE;
static void InitGameInfo(void)
{
game.restart_level = FALSE;
-
game.request_active = FALSE;
game.request_active = FALSE;
- game.request_active_or_moving = FALSE;
game.use_masked_elements_initial = FALSE;
}
game.use_masked_elements_initial = FALSE;
}
@@
-6479,8
+6477,8
@@
void DisplayExitMessage(char *format, va_list ap)
BackToFront();
BackToFront();
- // deactivate toons on error message screen
- setup.
to
ons = FALSE;
+ // deactivate toons
and global animations
on error message screen
+ setup.
global_animati
ons = FALSE;
WaitForEventToContinue();
}
WaitForEventToContinue();
}
@@
-6673,7
+6671,7
@@
static boolean WaitForApiThreads(void)
return TRUE;
// deactivate global animations (not accessible in game state "loading")
return TRUE;
// deactivate global animations (not accessible in game state "loading")
- setup.
to
ons = FALSE;
+ setup.
global_animati
ons = FALSE;
// set game state to "loading" to be able to show busy animation
SetGameStatus(GAME_MODE_LOADING);
// set game state to "loading" to be able to show busy animation
SetGameStatus(GAME_MODE_LOADING);