projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
minor whitespace change
[rocksndiamonds.git]
/
src
/
events.c
diff --git
a/src/events.c
b/src/events.c
index 2472fdf5f8978b048af638730299206544445255..80917b02007916c1b8957cc440b046b75bd32b3b 100644
(file)
--- a/
src/events.c
+++ b/
src/events.c
@@
-250,7
+250,11
@@
void HandleOtherEvents(Event *event)
#if defined(TARGET_SDL2)
case SDL_CONTROLLERBUTTONDOWN:
case SDL_CONTROLLERBUTTONUP:
#if defined(TARGET_SDL2)
case SDL_CONTROLLERBUTTONDOWN:
case SDL_CONTROLLERBUTTONUP:
+ // for any game controller button event, disable overlay buttons
+ SetOverlayEnabled(FALSE);
+
HandleSpecialGameControllerButtons(event);
HandleSpecialGameControllerButtons(event);
+
/* FALL THROUGH */
case SDL_CONTROLLERDEVICEADDED:
case SDL_CONTROLLERDEVICEREMOVED:
/* FALL THROUGH */
case SDL_CONTROLLERDEVICEADDED:
case SDL_CONTROLLERDEVICEREMOVED:
@@
-374,6
+378,8
@@
void ClearPlayerAction()
key_joystick_mapping = 0;
for (i = 0; i < MAX_PLAYERS; i++)
stored_player[i].action = 0;
key_joystick_mapping = 0;
for (i = 0; i < MAX_PLAYERS; i++)
stored_player[i].action = 0;
+
+ ClearJoystickState();
}
void SleepWhileUnmapped()
}
void SleepWhileUnmapped()
@@
-668,6
+674,9
@@
void HandleFingerEvent(FingerEvent *event)
"KEY_PRESSED");
int i;
"KEY_PRESSED");
int i;
+ // for any touch input event, enable overlay buttons (if activated)
+ SetOverlayEnabled(TRUE);
+
Error(ERR_DEBUG, "::: key '%s' was '%s' [fingerId: %lld]",
getKeyNameFromKey(key), key_status_name, event->fingerId);
Error(ERR_DEBUG, "::: key '%s' was '%s' [fingerId: %lld]",
getKeyNameFromKey(key), key_status_name, event->fingerId);
@@
-1148,9
+1157,16
@@
void HandleKeyEvent(KeyEvent *event)
#endif
#if defined(PLATFORM_ANDROID)
#endif
#if defined(PLATFORM_ANDROID)
- // always map the "back" button to the "escape" key on Android devices
if (key == KSYM_Back)
if (key == KSYM_Back)
+ {
+ // always map the "back" button to the "escape" key on Android devices
key = KSYM_Escape;
key = KSYM_Escape;
+ }
+ else
+ {
+ // for any key event other than "back" button, disable overlay buttons
+ SetOverlayEnabled(FALSE);
+ }
#endif
HandleKeyModState(keymod, key_status);
#endif
HandleKeyModState(keymod, key_status);
@@
-1526,9
+1542,11
@@
void HandleKey(Key key, int key_status)
int i;
#if defined(TARGET_SDL2)
int i;
#if defined(TARGET_SDL2)
- /* map special
"play/pause" media key to default key for play/pause action
s */
+ /* map special
keys (media keys / remote control buttons) to default key
s */
if (key == KSYM_PlayPause)
key = KSYM_space;
if (key == KSYM_PlayPause)
key = KSYM_space;
+ else if (key == KSYM_Select)
+ key = KSYM_Return;
#endif
HandleSpecialGameControllerKeys(key, key_status);
#endif
HandleSpecialGameControllerKeys(key, key_status);
@@
-1542,6
+1560,9
@@
void HandleKey(Key key, int key_status)
static boolean element_dropped[MAX_PLAYERS] = { FALSE,FALSE,FALSE,FALSE };
int pnr;
static boolean element_dropped[MAX_PLAYERS] = { FALSE,FALSE,FALSE,FALSE };
int pnr;
+ /* initialize unifying snap and drop buttons (EM engine) */
+ game_em.use_single_button = game_em.use_single_button_initial;
+
for (pnr = 0; pnr < MAX_PLAYERS; pnr++)
{
byte key_action = 0;
for (pnr = 0; pnr < MAX_PLAYERS; pnr++)
{
byte key_action = 0;
@@
-1588,6
+1609,9
@@
void HandleKey(Key key, int key_status)
if (tape.single_step && tape.recording && tape.pausing)
{
if (tape.single_step && tape.recording && tape.pausing)
{
+ /* do not unify snap and drop buttons in single-step mode (EM engine) */
+ game_em.use_single_button = FALSE;
+
if (key_status == KEY_PRESSED && key_action & KEY_MOTION)
{
TapeTogglePause(TAPE_TOGGLE_AUTOMATIC);
if (key_status == KEY_PRESSED && key_action & KEY_MOTION)
{
TapeTogglePause(TAPE_TOGGLE_AUTOMATIC);
@@
-1605,7
+1629,6
@@
void HandleKey(Key key, int key_status)
if (level.game_engine_type == GAME_ENGINE_TYPE_EM ||
level.game_engine_type == GAME_ENGINE_TYPE_SP)
{
if (level.game_engine_type == GAME_ENGINE_TYPE_EM ||
level.game_engine_type == GAME_ENGINE_TYPE_SP)
{
-
if (level.game_engine_type == GAME_ENGINE_TYPE_SP &&
getRedDiskReleaseFlag_SP() == 0)
stored_player[pnr].action &= ~KEY_BUTTON_DROP;
if (level.game_engine_type == GAME_ENGINE_TYPE_SP &&
getRedDiskReleaseFlag_SP() == 0)
stored_player[pnr].action &= ~KEY_BUTTON_DROP;