projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixed stopping auto-playing next level on input on scores screen
[rocksndiamonds.git]
/
src
/
screens.c
diff --git
a/src/screens.c
b/src/screens.c
index 4937d2ce26af7feacd9275c6488e324b866165b8..44ea613339df9dcad6089f980d15bb4cb04f431e 100644
(file)
--- a/
src/screens.c
+++ b/
src/screens.c
@@
-4781,10
+4781,16
@@
static void HandleChooseTree(int mx, int my, int dx, int dy, int button,
return;
}
return;
}
- if (mx || my) // mouse input
+ // any mouse click or direction input stops playing the next level
+ if ((mx || my || dx || dy) && scores.was_just_playing)
{
scores.was_just_playing = FALSE;
{
scores.was_just_playing = FALSE;
+ level_nr = scores.last_level_nr;
+ LoadLevel(level_nr);
+ }
+ if (mx || my) // mouse input
+ {
x = (mx - amSX) / 32;
y = (my - amSY) / 32 - MENU_SCREEN_START_YPOS;
x = (mx - amSX) / 32;
y = (my - amSY) / 32 - MENU_SCREEN_START_YPOS;
@@
-4793,8
+4799,6
@@
static void HandleChooseTree(int mx, int my, int dx, int dy, int button,
}
else if (dx || dy) // keyboard or scrollbar/scrollbutton input
{
}
else if (dx || dy) // keyboard or scrollbar/scrollbutton input
{
- scores.was_just_playing = FALSE;
-
// move cursor instead of scrolling when already at start/end of list
if (dy == -1 * SCROLL_LINE && ti->cl_first == 0)
dy = -1;
// move cursor instead of scrolling when already at start/end of list
if (dy == -1 * SCROLL_LINE && ti->cl_first == 0)
dy = -1;