X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fevents.c;h=04f69108527feaca46f5eca02ce2fc30b82f3ad9;hb=edaa850fd2d2cae7ec31961fae3d56487e710c71;hp=d9ba05860c5c30011bd6591314127116e1766af6;hpb=21d0254832a6e675aaef376da44990ec678c1568;p=rocksndiamonds.git

diff --git a/src/events.c b/src/events.c
index d9ba0586..04f69108 100644
--- 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 is_global_anim_event = FALSE;
 
 
 // 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);
 
+  // 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);
 
@@ -1976,6 +1986,31 @@ static void HandleKeysSpecial(Key key)
   }
 }
 
+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
@@ -2063,6 +2098,9 @@ void HandleKey(Key key, int key_status)
   int joy = 0;
   int i;
 
+  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
 
@@ -2205,7 +2243,8 @@ void HandleKey(Key key, int key_status)
     ignore_repeated_key = FALSE;
 
     // send key release event to global animation event handling
-    HandleGlobalAnimClicks(-1, -1, KEY_RELEASED, FALSE);
+    if (!is_global_anim_event)
+      HandleGlobalAnimClicks(-1, -1, KEY_RELEASED, FALSE);
 
     return;
   }
@@ -2262,9 +2301,9 @@ void HandleKey(Key key, int key_status)
   }
 
   // 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))
   {
@@ -2824,9 +2863,13 @@ boolean DoKeysymAction(int keysym)
   {
     Key key = (Key)(-keysym);
 
+    is_global_anim_event = TRUE;
+
     HandleKey(key, KEY_PRESSED);
     HandleKey(key, KEY_RELEASED);
 
+    is_global_anim_event = FALSE;
+
     return TRUE;
   }