// 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;
}
}
}
event->pressure);
#endif
+ runtime.uses_touch_device = TRUE;
+
if (game_status != GAME_MODE_PLAYING)
return;
CloseAllAndExit(0);
}
-static boolean HandleDropFileEvent(char *filename)
+static int HandleDropFileEvent(char *filename)
{
Error(ERR_DEBUG, "DROP FILE EVENT: '%s'", filename);
{
Error(ERR_WARN, "file '%s' not supported", filename);
- return FALSE;
+ return TREE_TYPE_UNDEFINED;
}
+ TreeInfo *tree_node = NULL;
int tree_type = GetZipFileTreeType(filename);
char *directory = TREE_USERDIR(tree_type);
{
Error(ERR_WARN, "zip file '%s' has invalid content!", filename);
- return FALSE;
+ return TREE_TYPE_UNDEFINED;
}
- char *top_dir = ExtractZipFileIntoDirectory(filename, directory, tree_type);
-
- if (top_dir == NULL)
+ if (tree_type == TREE_TYPE_LEVEL_DIR &&
+ game_status == GAME_MODE_LEVELS &&
+ leveldir_current->node_parent != NULL)
{
- // error message already issued by "ExtractZipFileIntoDirectory()"
+ // extract new level set next to currently selected level set
+ tree_node = leveldir_current;
- return FALSE;
+ // get parent directory of currently selected level set directory
+ directory = getLevelDirFromTreeInfo(leveldir_current->node_parent);
+
+ // use private level directory instead of top-level package level directory
+ if (strPrefix(directory, options.level_directory) &&
+ strEqual(leveldir_current->node_parent->fullpath, "."))
+ directory = getUserLevelDir(NULL);
}
- AddUserTreeSetToTreeInfo(top_dir, tree_type);
+ // extract level or artwork set from zip file to target directory
+ char *top_dir = ExtractZipFileIntoDirectory(filename, directory, tree_type);
- // when adding new level set in main menu, select it as current level set
- if (tree_type == TREE_TYPE_LEVEL_DIR &&
- game_status == GAME_MODE_MAIN &&
- !game.request_active)
+ if (top_dir == NULL)
{
- // change current level set to newly added level set from zip file
- leveldir_current = getTreeInfoFromIdentifier(leveldir_first, top_dir);
+ // error message already issued by "ExtractZipFileIntoDirectory()"
- // change current level number to first level of newly added level set
- level_nr = leveldir_current->first_level;
+ return TREE_TYPE_UNDEFINED;
+ }
- // redraw screen to reflect changed level set
- DrawMainMenu();
+ // add extracted level or artwork set to tree info structure
+ AddTreeSetToTreeInfo(tree_node, directory, top_dir, tree_type);
- // save this level set and level number as last selected level set
- SaveLevelSetup_LastSeries();
- SaveLevelSetup_SeriesInfo();
- }
+ // update menu screen (and possibly change current level set)
+ DrawScreenAfterAddingSet(top_dir, tree_type);
- return TRUE;
+ return tree_type;
}
static void HandleDropTextEvent(char *text)
Error(ERR_DEBUG, "DROP TEXT EVENT: '%s'", text);
}
+static void HandleDropCompleteEvent(int num_level_sets_succeeded,
+ int num_artwork_sets_succeeded,
+ int num_files_failed)
+{
+ // only show request dialog if no other request dialog already active
+ if (game.request_active)
+ return;
+
+ // this case can happen with drag-and-drop with older SDL versions
+ if (num_level_sets_succeeded == 0 &&
+ num_artwork_sets_succeeded == 0 &&
+ num_files_failed == 0)
+ return;
+
+ char message[100];
+
+ if (num_level_sets_succeeded > 0 || num_artwork_sets_succeeded > 0)
+ {
+ char message_part1[50];
+
+ sprintf(message_part1, "New %s set%s added",
+ (num_artwork_sets_succeeded == 0 ? "level" :
+ num_level_sets_succeeded == 0 ? "artwork" : "level and artwork"),
+ (num_level_sets_succeeded +
+ num_artwork_sets_succeeded > 1 ? "s" : ""));
+
+ if (num_files_failed > 0)
+ sprintf(message, "%s, but %d dropped file%s failed!",
+ message_part1, num_files_failed, num_files_failed > 1 ? "s" : "");
+ else
+ sprintf(message, "%s!", message_part1);
+ }
+ else if (num_files_failed > 0)
+ {
+ sprintf(message, "Failed to process dropped file%s!",
+ num_files_failed > 1 ? "s" : "");
+ }
+
+ Request(message, REQ_CONFIRM);
+}
+
void HandleDropEvent(Event *event)
{
- static int files_succeeded = 0;
- static int files_failed = 0;
+ static boolean confirm_on_drop_complete = FALSE;
+ static int num_level_sets_succeeded = 0;
+ static int num_artwork_sets_succeeded = 0;
+ static int num_files_failed = 0;
switch (event->type)
{
case SDL_DROPBEGIN:
{
- files_succeeded = 0;
- files_failed = 0;
+ confirm_on_drop_complete = TRUE;
+ num_level_sets_succeeded = 0;
+ num_artwork_sets_succeeded = 0;
+ num_files_failed = 0;
break;
}
case SDL_DROPFILE:
{
- boolean success = HandleDropFileEvent(event->drop.file);
-
- if (success)
- files_succeeded++;
+ int tree_type = HandleDropFileEvent(event->drop.file);
+
+ if (tree_type == TREE_TYPE_LEVEL_DIR)
+ num_level_sets_succeeded++;
+ else if (tree_type == TREE_TYPE_GRAPHICS_DIR ||
+ tree_type == TREE_TYPE_SOUNDS_DIR ||
+ tree_type == TREE_TYPE_MUSIC_DIR)
+ num_artwork_sets_succeeded++;
else
- files_failed++;
+ num_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(num_level_sets_succeeded,
+ num_artwork_sets_succeeded,
+ num_files_failed);
+
+ num_level_sets_succeeded = 0;
+ num_artwork_sets_succeeded = 0;
+ num_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(num_level_sets_succeeded,
+ num_artwork_sets_succeeded,
+ num_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)
{