static boolean special_cursor_enabled = FALSE;
static boolean stop_processing_events = FALSE;
+static boolean is_global_anim_event = FALSE;
// forward declarations for internal use
Debug("event:dropfile", "filename == '%s'", filename);
// check and extract dropped zip files into correct user data directory
- if (!strSuffixLower(filename, ".zip"))
+ if (!strSuffixLower(filename, ".zip") &&
+ !strPrefixLower(filename, "fd:"))
{
Warn("file '%s' not supported", filename);
// add extracted level or artwork set to tree info structure
AddTreeSetToTreeInfo(tree_node, directory, top_dir, tree_type);
+ // force restart after adding level collection
+ if (getTreeInfoFromIdentifier(TREE_FIRST_NODE(tree_type), top_dir) == NULL)
+ {
+ Request("Program must be restarted after adding a new level collection!",
+ REQ_CONFIRM);
+
+ CloseAllAndExit(0);
+ }
+
// update menu screen (and possibly change current level set)
DrawScreenAfterAddingSet(top_dir, tree_type);
void HandleDropEvent(Event *event)
{
+ Debug("event:drop", (event->type == SDL_DROPBEGIN ? "SDL_DROPBEGIN" :
+ event->type == SDL_DROPFILE ? "SDL_DROPFILE" :
+ event->type == SDL_DROPTEXT ? "SDL_DROPTEXT" :
+ event->type == SDL_DROPCOMPLETE ? "SDL_DROPCOMPLETE" :
+ "(unknown drop event type)"));
+
static boolean confirm_on_drop_complete = FALSE;
static int num_level_sets_succeeded = 0;
static int num_artwork_sets_succeeded = 0;
static int old_mx = 0, old_my = 0;
boolean button_hold = FALSE;
boolean handle_gadgets = TRUE;
+ int game_status_last = game_status;
if (button_nr < 0)
{
if (handle_gadgets && HandleGadgets(mx, my, button))
{
- // do not handle this button event anymore
+ // do not handle this button event anymore with position on screen
mx = my = -32; // force mouse event to be outside screen tiles
+
+ // do not handle this button event anymore if game status has changed
+ if (game_status != game_status_last)
+ return;
}
if (button_hold && game_status == GAME_MODE_PLAYING && tape.pausing)
}
}
+static boolean HandleKeysSpeed(Key key, int key_status)
+{
+ if (game_status == GAME_MODE_PLAYING)
+ {
+ if (key == setup.shortcut.speed_fast ||
+ key == setup.shortcut.speed_slow)
+ {
+ int speed_factor = 4;
+
+ GameFrameDelay = (key_status != KEY_PRESSED ? setup.game_frame_delay :
+ key == setup.shortcut.speed_fast ? setup.game_frame_delay / speed_factor :
+ key == setup.shortcut.speed_slow ? setup.game_frame_delay * speed_factor :
+ setup.game_frame_delay);
+
+ GameFrameDelay = MIN(MAX(1, GameFrameDelay), 1000);
+
+ SetVideoFrameDelay(GameFrameDelay);
+
+ return TRUE;
+ }
+ }
+
+ return FALSE;
+}
+
boolean HandleKeysDebug(Key key, int key_status)
{
#ifdef DEBUG
{ &ski.snap, NULL, DEFAULT_KEY_SNAP, JOY_BUTTON_SNAP },
{ &ski.drop, NULL, DEFAULT_KEY_DROP, JOY_BUTTON_DROP }
};
+ boolean game_key_pressed = FALSE;
int joy = 0;
int i;
- if (HandleKeysDebug(key, key_status))
- return; // do not handle already processed keys again
+ // check if any game key is pressed (direction/snap/drop keys)
+ if (game_status == GAME_MODE_PLAYING)
+ {
+ int pnr;
+
+ for (pnr = 0; pnr < MAX_PLAYERS; pnr++)
+ {
+ ski = setup.input[pnr].key;
+
+ for (i = 0; i < NUM_PLAYER_ACTIONS; i++)
+ if (key == *key_info[i].key_custom)
+ game_key_pressed = TRUE;
+ }
+
+ ssi = setup.shortcut;
+
+ for (i = 0; i < NUM_DIRECTIONS; i++)
+ if (key == *key_info[i].key_snap)
+ game_key_pressed = TRUE;
+ }
+
+ // only handle speed or debug keys if no game key is pressed
+ if (!game_key_pressed)
+ {
+ if (HandleKeysSpeed(key, key_status))
+ return; // do not handle already processed keys again
+
+ if (HandleKeysDebug(key, key_status))
+ return; // do not handle already processed keys again
+ }
// map special keys (media keys / remote control buttons) to default keys
if (key == KSYM_PlayPause)
// reset flag to ignore repeated "key pressed" events after key release
ignore_repeated_key = FALSE;
+ // send key release event to global animation event handling
+ if (!is_global_anim_event)
+ HandleGlobalAnimClicks(-1, -1, KEY_RELEASED, FALSE);
+
return;
}
}
// some key events are handled like clicks for global animations
- boolean click = (key == KSYM_space ||
- key == KSYM_Return ||
- key == KSYM_Escape);
+ boolean click = (!is_global_anim_event && (key == KSYM_space ||
+ key == KSYM_Return ||
+ key == KSYM_Escape));
if (click && HandleGlobalAnimClicks(-1, -1, MB_LEFTBUTTON, TRUE))
{
}
if (game_status == GAME_MODE_MAIN &&
- setup.internal.info_screens_from_main &&
+ (setup.internal.info_screens_from_main ||
+ leveldir_current->info_screens_from_main) &&
(key >= KSYM_KP_1 && key <= KSYM_KP_9))
{
DrawInfoScreen_FromMainMenu(key - KSYM_KP_1 + 1);
{
int old_xpos = tile_cursor.xpos;
int old_ypos = tile_cursor.ypos;
- int new_xpos = old_xpos;
- int new_ypos = old_ypos;
+ int new_xpos = tile_cursor.xpos + dx;
+ int new_ypos = tile_cursor.ypos + dy;
- if (IN_LEV_FIELD(old_xpos + dx, old_ypos))
- new_xpos = old_xpos + dx;
+ if (!IN_LEV_FIELD(new_xpos, old_ypos) || !IN_SCR_FIELD(new_xpos, old_ypos))
+ new_xpos = old_xpos;
- if (IN_LEV_FIELD(old_xpos, old_ypos + dy))
- new_ypos = old_ypos + dy;
+ if (!IN_LEV_FIELD(old_xpos, new_ypos) || !IN_SCR_FIELD(old_xpos, new_ypos))
+ new_ypos = old_ypos;
SetTileCursorTargetXY(new_xpos, new_ypos);
}
int up = joy & JOY_UP;
int down = joy & JOY_DOWN;
int button = joy & JOY_BUTTON;
- int newbutton = (AnyJoystickButton() == JOY_BUTTON_NEW_PRESSED);
+ int anybutton = AnyJoystickButton();
+ int newbutton = (anybutton == JOY_BUTTON_NEW_PRESSED);
int dx = (left ? -1 : right ? 1 : 0);
int dy = (up ? -1 : down ? 1 : 0);
boolean use_delay_value_first = (joytest != joytest_last);
+ boolean new_button_event = (anybutton == JOY_BUTTON_NEW_PRESSED ||
+ anybutton == JOY_BUTTON_NEW_RELEASED);
- if (HandleGlobalAnimClicks(-1, -1, newbutton, FALSE))
+ if (new_button_event && HandleGlobalAnimClicks(-1, -1, newbutton, FALSE))
{
// do not handle this button event anymore
return;
{
Key key = (Key)(-keysym);
+ is_global_anim_event = TRUE;
+
HandleKey(key, KEY_PRESSED);
HandleKey(key, KEY_RELEASED);
+ is_global_anim_event = FALSE;
+
return TRUE;
}
projects / rocksndiamonds.git / blobdiff