projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixed another problem with leaving scores screen on Android platform
[rocksndiamonds.git]
/
src
/
screens.c
diff --git
a/src/screens.c
b/src/screens.c
index d7b7aab06fec3fab3ef4c56128fcd1eede25b47d..ee5035ce0320569f35a9fb27e510a0123da9636d 100644
(file)
--- a/
src/screens.c
+++ b/
src/screens.c
@@
-4353,6
+4353,9
@@
static void DrawChooseTree(TreeInfo **ti_ptr)
boolean restart_music = (game_status != game_status_last_screen &&
game_status_last_screen != GAME_MODE_SCOREINFO);
boolean restart_music = (game_status != game_status_last_screen &&
game_status_last_screen != GAME_MODE_SCOREINFO);
+ scores.continue_on_return = (game_status == GAME_MODE_SCORES &&
+ game_status_last_screen == GAME_MODE_PLAYING);
+
if (CheckFadeAll())
fade_mask = REDRAW_ALL;
if (CheckFadeAll())
fade_mask = REDRAW_ALL;
@@
-4810,11
+4813,11
@@
static void HandleChooseTree(int mx, int my, int dx, int dy, int button,
}
#if defined(PLATFORM_ANDROID)
}
#if defined(PLATFORM_ANDROID)
- //
touching the screen anywhere continues playing the next level
- if ((mx || my) && scores.continue_
playing
)
+ //
directly continue when touching the screen after playing
+ if ((mx || my) && scores.continue_
on_return
)
{
{
+ // ignore touch events until released
mx = my = 0;
mx = my = 0;
- button = MB_MENU_CHOICE;
}
#endif
}
#endif
@@
-5320,7
+5323,6
@@
static void DrawHallOfFame_setScoreEntries(void)
void DrawHallOfFame(int nr)
{
scores.last_level_nr = nr;
void DrawHallOfFame(int nr)
{
scores.last_level_nr = nr;
- scores.continue_on_return = (game_status_last_screen == GAME_MODE_PLAYING);
// (this is needed when called from GameEnd() after winning a game)
KeyboardAutoRepeatOn();
// (this is needed when called from GameEnd() after winning a game)
KeyboardAutoRepeatOn();