// simulate key release events for still pressed keys
key_joystick_mapping = 0;
for (i = 0; i < MAX_PLAYERS; i++)
+ {
stored_player[i].action = 0;
+ stored_player[i].snap_action = 0;
+ }
ClearJoystickState();
ClearPlayerMouseAction();
SDL_FingerID finger_id;
int counter;
Key key;
+ byte action;
} touch_info[NUM_TOUCH_FINGERS];
static void HandleFingerEvent_VirtualButtons(FingerEvent *event)
{
HandleKey(touch_info[i].key, KEY_RELEASED);
+ // undraw previous grid button when moving finger away
+ overlay.grid_button_action &= ~touch_info[i].action;
+
Error(ERR_DEBUG, "=> key == '%s', key_status == '%s' [slot %d] [2]",
getKeyNameFromKey(touch_info[i].key), "KEY_RELEASED", i);
}
touch_info[i].finger_id = event->fingerId;
touch_info[i].counter = Counter();
touch_info[i].key = key;
+ touch_info[i].action = grid_button_action;
}
else
{
touch_info[i].finger_id = 0;
touch_info[i].counter = 0;
touch_info[i].key = 0;
+ touch_info[i].action = JOY_NO_ACTION;
}
}
}
Error(ERR_DEBUG, "DROP TEXT EVENT: '%s'", text);
}
+static void HandleDropCompleteEvent(int files_succeeded, int files_failed)
+{
+ // only show request dialog if no other request dialog already active
+ if (game.request_active)
+ return;
+
+ if (files_succeeded > 0 && files_failed > 0)
+ Request("New level or artwork set(s) added, "
+ "but some dropped file(s) failed!", REQ_CONFIRM);
+ else if (files_succeeded > 0)
+ Request("New level or artwork set(s) added!", REQ_CONFIRM);
+ else if (files_failed > 0)
+ Request("Failed to process dropped file(s)!", REQ_CONFIRM);
+}
+
void HandleDropEvent(Event *event)
{
+ static boolean confirm_on_drop_complete = FALSE;
static int files_succeeded = 0;
static int files_failed = 0;
{
case SDL_DROPBEGIN:
{
+ confirm_on_drop_complete = TRUE;
files_succeeded = 0;
files_failed = 0;
else
files_failed++;
+ // SDL_DROPBEGIN / SDL_DROPCOMPLETE did not exist in older SDL versions
+ if (!confirm_on_drop_complete)
+ {
+ // process all remaining events, including further SDL_DROPFILE events
+ ClearEventQueue();
+
+ HandleDropCompleteEvent(files_succeeded, files_failed);
+
+ files_succeeded = 0;
+ files_failed = 0;
+ }
+
break;
}
case SDL_DROPCOMPLETE:
{
- // only show request dialog if no other request dialog already active
- if (!game.request_active)
- {
- if (files_succeeded > 0 && files_failed > 0)
- Request("New level or artwork set(s) added, "
- "but some dropped file(s) failed!", REQ_CONFIRM);
- else if (files_succeeded > 0)
- Request("New level or artwork set(s) added!", REQ_CONFIRM);
- else if (files_failed > 0)
- Request("Failed to process dropped file(s)!", REQ_CONFIRM);
- }
+ HandleDropCompleteEvent(files_succeeded, files_failed);
break;
}
SetVideoFrameDelay(GameFrameDelay);
if (GameFrameDelay > ONE_SECOND_DELAY)
- Error(ERR_DEBUG, "frame delay == %d ms", GameFrameDelay);
+ Error(ERR_INFO, "frame delay == %d ms", GameFrameDelay);
else if (GameFrameDelay != 0)
- Error(ERR_DEBUG, "frame delay == %d ms (max. %d fps / %d %%)",
+ Error(ERR_INFO, "frame delay == %d ms (max. %d fps / %d %%)",
GameFrameDelay, ONE_SECOND_DELAY / GameFrameDelay,
GAME_FRAME_DELAY * 100 / GameFrameDelay);
else
- Error(ERR_DEBUG, "frame delay == 0 ms (maximum speed)");
+ Error(ERR_INFO, "frame delay == 0 ms (maximum speed)");
return TRUE;
}
{
options.debug = !options.debug;
- Error(ERR_DEBUG, "debug mode %s",
+ Error(ERR_INFO, "debug mode %s",
(options.debug ? "enabled" : "disabled"));
return TRUE;
}
else if (key == KSYM_v)
{
- Error(ERR_DEBUG, "currently using game engine version %d",
+ Error(ERR_INFO, "currently using game engine version %d",
game.engine_version);
return TRUE;
for (pnr = 0; pnr < MAX_PLAYERS; pnr++)
{
byte key_action = 0;
+ byte key_snap_action = 0;
if (setup.input[pnr].use_joystick)
continue;
{
ssi = setup.shortcut;
+ // also remember normal snap key when handling snap+direction keys
+ key_snap_action |= key_action & JOY_BUTTON_SNAP;
+
for (i = 0; i < NUM_DIRECTIONS; i++)
+ {
if (key == *key_info[i].key_snap)
- key_action |= key_info[i].action | JOY_BUTTON_SNAP;
+ {
+ key_action |= key_info[i].action | JOY_BUTTON_SNAP;
+ key_snap_action |= key_info[i].action;
+ }
+ }
}
if (key_status == KEY_PRESSED)
- stored_player[pnr].action |= key_action;
+ {
+ stored_player[pnr].action |= key_action;
+ stored_player[pnr].snap_action |= key_snap_action;
+ }
else
- stored_player[pnr].action &= ~key_action;
+ {
+ stored_player[pnr].action &= ~key_action;
+ stored_player[pnr].snap_action &= ~key_snap_action;
+ }
+
+ // restore snap action if one of several pressed snap keys was released
+ if (stored_player[pnr].snap_action)
+ stored_player[pnr].action |= JOY_BUTTON_SNAP;
if (tape.single_step && tape.recording && tape.pausing && !tape.use_mouse)
{