rnd-19981216-3

[rocksndiamonds.git] / src / events.c

diff --git a/src/events.c b/src/events.c
index 38f58f940148d45c43783061b548f1e26605f98a..e46b177553430e80ffb8fdac0ad6f0246d65921c 100644 (file)
--- a/src/events.c
+++ b/src/events.c
@@ -270,22 +270,24 @@ void HandleButton(int mx, int my, int button)
 {
   static int old_mx = 0, old_my = 0;
 
-  if (mx<0 || my<0)
+  if (button < 0)
   {
     mx = old_mx;
     my = old_my;
+    button = -button;
   }
   else
   {
     old_mx = mx;
     old_my = my;
 
-    HandleGadgets(mx,my, button);
     HandleVideoButtons(mx,my, button);
     HandleSoundButtons(mx,my, button);
     HandleGameButtons(mx,my, button);
   }
 
+  HandleGadgets(mx, my, button);
+
   switch(game_status)
   {
     case MAINMENU:
@@ -610,7 +612,7 @@ void HandleNoXEvent()
 {
   if (button_status && game_status != PLAYING)
   {
-    HandleButton(-1,-1, button_status);
+    HandleButton(0, 0, -button_status);
     return;
   }