projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
renamed variable
[rocksndiamonds.git]
/
src
/
screens.c
diff --git
a/src/screens.c
b/src/screens.c
index 98c7b68ace401ba8fd957d093e854df88b90b466..576f1ff0566a054f1dd9d4fc2df1345cde67da33 100644
(file)
--- a/
src/screens.c
+++ b/
src/screens.c
@@
-8456,8
+8456,13
@@
static boolean CustomizeKeyboardMain(int player_nr)
while (!finished)
{
Event event;
while (!finished)
{
Event event;
+ unsigned int event_frame_delay = 0;
+ unsigned int event_frame_delay_value = GAME_FRAME_DELAY;
- if (NextValidEvent(&event))
+ // reset frame delay counter directly after updating screen
+ ResetDelayCounter(&event_frame_delay);
+
+ while (NextValidEvent(&event))
{
switch (event.type)
{
{
switch (event.type)
{
@@
-8528,6
+8533,10
@@
static boolean CustomizeKeyboardMain(int player_nr)
HandleOtherEvents(&event);
break;
}
HandleOtherEvents(&event);
break;
}
+
+ // do not handle events for longer than standard frame delay period
+ if (DelayReached(&event_frame_delay, event_frame_delay_value))
+ break;
}
BackToFront();
}
BackToFront();
@@
-8630,11
+8639,6
@@
static boolean ConfigureJoystickMapButtonsAndAxes(SDL_Joystick *joystick)
{ 282, 210, MARKER_AXIS_Y, "righty", },
};
{ 282, 210, MARKER_AXIS_Y, "righty", },
};
- unsigned int event_frame_delay = 0;
- unsigned int event_frame_delay_value = GAME_FRAME_DELAY;
-
- ResetDelayCounter(&event_frame_delay);
-
if (!bitmaps_initialized)
{
controller = LoadCustomImage("joystick/controller.png");
if (!bitmaps_initialized)
{
controller = LoadCustomImage("joystick/controller.png");
@@
-8766,6
+8770,12
@@
static boolean ConfigureJoystickMapButtonsAndAxes(SDL_Joystick *joystick)
screen_initialized = TRUE;
screen_initialized = TRUE;
+ unsigned int event_frame_delay = 0;
+ unsigned int event_frame_delay_value = GAME_FRAME_DELAY;
+
+ // reset frame delay counter directly after updating screen
+ ResetDelayCounter(&event_frame_delay);
+
while (NextValidEvent(&event))
{
switch (event.type)
while (NextValidEvent(&event))
{
switch (event.type)
@@
-9745,9
+9755,8
@@
static void CreateScreenMenubuttons(void)
int type = GD_TYPE_NORMAL_BUTTON;
boolean checked = FALSE;
int type = GD_TYPE_NORMAL_BUTTON;
boolean checked = FALSE;
- // do not use touch buttons if touch controls are disabled
- if (is_touch_button &&
- strEqual(setup.touch.control_type, TOUCH_CONTROL_OFF))
+ // do not use touch buttons if overlay touch buttons are disabled
+ if (is_touch_button && !setup.touch.overlay_buttons)
continue;
event_mask = menubutton_info[i].event_mask;
continue;
event_mask = menubutton_info[i].event_mask;