projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixed accidentally starting joystick calibration by moving joystick axis
[rocksndiamonds.git]
/
src
/
screens.c
diff --git
a/src/screens.c
b/src/screens.c
index 031d37dda6f90fc1cc8f715372213860726aef4e..b3d9111d7bd8359997ebdfa2d433fe78ebf37bf6 100644
(file)
--- a/
src/screens.c
+++ b/
src/screens.c
@@
-5443,7
+5443,7
@@
static struct TokenInfo setup_info_input[] =
{
{ TYPE_SWITCH, NULL, "Player:" },
{ TYPE_SWITCH, NULL, "Device:" },
{
{ TYPE_SWITCH, NULL, "Player:" },
{ TYPE_SWITCH, NULL, "Device:" },
- { TYPE_
ENTER_MENU,
NULL, "" },
+ { TYPE_
SWITCH,
NULL, "" },
{ TYPE_EMPTY, NULL, "" },
{ TYPE_EMPTY, NULL, "" },
{ TYPE_EMPTY, NULL, "" },
{ TYPE_EMPTY, NULL, "" },
{ TYPE_EMPTY, NULL, "" },
{ TYPE_EMPTY, NULL, "" },
@@
-6131,7
+6131,6
@@
void HandleSetupScreen_Input(int mx, int my, int dx, int dy, int button)
if (dx && choice == 0)
x = (dx < 0 ? 10 : 12);
else if ((dx && choice == 1) ||
if (dx && choice == 0)
x = (dx < 0 ? 10 : 12);
else if ((dx && choice == 1) ||
- (dx == +1 && choice == 2) ||
(dx == -1 && choice == pos_end))
button = MB_MENU_CHOICE;
else if (dy)
(dx == -1 && choice == pos_end))
button = MB_MENU_CHOICE;
else if (dy)
@@
-6404,7
+6403,7
@@
static boolean CalibrateJoystickMain(int player_nr)
while (result < 0)
{
while (result < 0)
{
-
if (PendingEvent())
/* got event */
+
while (PendingEvent())
/* got event */
{
Event event;
{
Event event;