projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added option for magic wall timer of zero for native BD engine
[rocksndiamonds.git]
/
src
/
events.c
diff --git
a/src/events.c
b/src/events.c
index 648b035f0a9e1702dfa22fc5cfe30aed15fdca4e..2e3c7ca9bbd232639c4d62e34153f2cd1ed2b0ea 100644
(file)
--- a/
src/events.c
+++ b/
src/events.c
@@
-40,6
+40,7
@@
static DelayCounter special_cursor_delay = { 1000 };
static boolean special_cursor_enabled = FALSE;
static boolean stop_processing_events = FALSE;
static boolean special_cursor_enabled = FALSE;
static boolean stop_processing_events = FALSE;
+static boolean is_global_anim_event = FALSE;
// forward declarations for internal use
// forward declarations for internal use
@@
-1551,6
+1552,15
@@
static int HandleDropFileEvent(char *filename)
// add extracted level or artwork set to tree info structure
AddTreeSetToTreeInfo(tree_node, directory, top_dir, tree_type);
// 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);
// update menu screen (and possibly change current level set)
DrawScreenAfterAddingSet(top_dir, tree_type);
@@
-2204,6
+2214,10
@@
void HandleKey(Key key, int key_status)
// reset flag to ignore repeated "key pressed" events after key release
ignore_repeated_key = FALSE;
// 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;
}
return;
}
@@
-2259,9
+2273,9
@@
void HandleKey(Key key, int key_status)
}
// some key events are handled like clicks for global animations
}
// 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 (click && HandleGlobalAnimClicks(-1, -1, MB_LEFTBUTTON, TRUE))
{
@@
-2821,9
+2835,13
@@
boolean DoKeysymAction(int keysym)
{
Key key = (Key)(-keysym);
{
Key key = (Key)(-keysym);
+ is_global_anim_event = TRUE;
+
HandleKey(key, KEY_PRESSED);
HandleKey(key, KEY_RELEASED);
HandleKey(key, KEY_PRESSED);
HandleKey(key, KEY_RELEASED);
+ is_global_anim_event = FALSE;
+
return TRUE;
}
return TRUE;
}