X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fevents.c;h=18898fb2c8e1401c1a97d76580b6ddfc1a849914;hb=457e98ec0803cd9005a522018e7c255454d1e915;hp=10950bd9513e2a993531382756a07658583c7996;hpb=ff96039fa2e69d11a4fb72df8d070d4ff5477d5e;p=rocksndiamonds.git

diff --git a/src/events.c b/src/events.c
index 10950bd9..18898fb2 100644
--- a/src/events.c
+++ b/src/events.c
@@ -128,7 +128,7 @@ static boolean SkipPressedMouseMotionEvent(const Event *event)
   return FALSE;
 }
 
-static boolean WaitEventFiltered(Event *event)
+static boolean WaitValidEvent(Event *event)
 {
   WaitEvent(event);
 
@@ -152,7 +152,7 @@ static boolean WaitEventFiltered(Event *event)
 boolean NextValidEvent(Event *event)
 {
   while (PendingEvent())
-    if (WaitEventFiltered(event))
+    if (WaitValidEvent(event))
       return TRUE;
 
   return FALSE;
@@ -298,7 +298,8 @@ void HandleMouseCursor()
 	cursor_inside_playfield &&
 	DelayReached(&special_cursor_delay, special_cursor_delay_value))
     {
-      SetMouseCursor(CURSOR_PLAYFIELD);
+      if (level.game_engine_type != GAME_ENGINE_TYPE_MM)
+	SetMouseCursor(CURSOR_PLAYFIELD);
     }
   }
   else if (gfx.cursor_mode != CURSOR_DEFAULT)
@@ -341,12 +342,10 @@ void EventLoop(void)
 
 void ClearEventQueue()
 {
-  while (PendingEvent())
-  {
-    Event event;
-
-    WaitEvent(&event);
+  Event event;
 
+  while (NextValidEvent(&event))
+  {
     switch (event.type)
     {
       case EVENT_BUTTONRELEASE:
@@ -371,6 +370,13 @@ void ClearEventQueue()
   }
 }
 
+void ClearPlayerMouseAction()
+{
+  local_player->mouse_action.lx = 0;
+  local_player->mouse_action.ly = 0;
+  local_player->mouse_action.button = 0;
+}
+
 void ClearPlayerAction()
 {
   int i;
@@ -381,6 +387,29 @@ void ClearPlayerAction()
     stored_player[i].action = 0;
 
   ClearJoystickState();
+  ClearPlayerMouseAction();
+}
+
+void SetPlayerMouseAction(int mx, int my, int button)
+{
+  int lx = getLevelFromScreenX(mx);
+  int ly = getLevelFromScreenY(my);
+
+  ClearPlayerMouseAction();
+
+  if (!IN_GFX_FIELD_PLAY(mx, my) || !IN_LEV_FIELD(lx, ly))
+    return;
+
+  local_player->mouse_action.lx = lx;
+  local_player->mouse_action.ly = ly;
+  local_player->mouse_action.button = button;
+
+  if (tape.recording && tape.pausing && tape.use_mouse)
+  {
+    /* prevent button release or motion events from un-pausing a paused game */
+    if (button && !motion_status)
+      TapeTogglePause(TAPE_TOGGLE_MANUAL);
+  }
 }
 
 void SleepWhileUnmapped()
@@ -393,7 +422,8 @@ void SleepWhileUnmapped()
   {
     Event event;
 
-    WaitEvent(&event);
+    if (!WaitValidEvent(&event))
+      continue;
 
     switch (event.type)
     {
@@ -1324,14 +1354,16 @@ void HandleButton(int mx, int my, int button, int button_nr)
       HandleSetupScreen(mx, my, 0, 0, button);
       break;
 
-#if defined(TARGET_SDL2)
     case GAME_MODE_PLAYING:
+      SetPlayerMouseAction(mx, my, button);
+
+#if defined(TARGET_SDL2)
       HandleFollowFinger(mx, my, button);
 #endif
 
 #ifdef DEBUG
-      if (button == MB_PRESSED && !motion_status && IN_GFX_FIELD_PLAY(mx, my) &&
-	  GetKeyModState() & KMOD_Control)
+      if (button == MB_PRESSED && !motion_status && !button_hold &&
+	  IN_GFX_FIELD_PLAY(mx, my) && GetKeyModState() & KMOD_Control)
 	DumpTileFromScreen(mx, my);
 #endif
 
@@ -1622,7 +1654,7 @@ void HandleKey(Key key, int key_status)
 	  has_snapped[pnr] = FALSE;
 	}
       }
-      else if (tape.recording && tape.pausing)
+      else if (tape.recording && tape.pausing && !tape.use_mouse)
       {
 	/* prevent key release events from un-pausing a paused game */
 	if (key_status == KEY_PRESSED && key_action & KEY_ACTION)
@@ -1893,7 +1925,9 @@ void HandleKey(Key key, int key_status)
 void HandleNoEvent()
 {
   // if (button_status && game_status != GAME_MODE_PLAYING)
-  if (button_status && (game_status != GAME_MODE_PLAYING || tape.pausing))
+  if (button_status && (game_status != GAME_MODE_PLAYING ||
+			tape.pausing ||
+			level.game_engine_type == GAME_ENGINE_TYPE_MM))
   {
     HandleButton(0, 0, button_status, -button_status);
   }