X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fevents.c;h=2ef8fd6d4991a974defc5cc03b9bdb795b635a45;hb=4f767d54c7ac468e9a42e22caf716111be1ceba9;hp=ed76f9a655beac4341b36a1cb80bb4cfda26b5fb;hpb=f9a30d8f0565691424cc9fd2643a50a176dae903;p=rocksndiamonds.git

diff --git a/src/events.c b/src/events.c
index ed76f9a6..2ef8fd6d 100644
--- a/src/events.c
+++ b/src/events.c
@@ -22,6 +22,11 @@
 #include "joystick.h"
 #include "network.h"
 
+/* values for key_status */
+#define KEY_NOT_PRESSED		FALSE
+#define KEY_RELEASED		FALSE
+#define KEY_PRESSED		TRUE
+
 void EventLoop(void)
 {
   while(1)
@@ -272,23 +277,23 @@ void HandleButton(int mx, int my, int button)
     old_mx = mx;
     old_my = my;
 
-    HandleVideoButtons(mx,my,button);
-    HandleSoundButtons(mx,my,button);
-    HandleGameButtons(mx,my,button);
+    HandleVideoButtons(mx,my, button);
+    HandleSoundButtons(mx,my, button);
+    HandleGameButtons(mx,my, button);
   }
 
   switch(game_status)
   {
     case MAINMENU:
-      HandleMainMenu(mx,my,0,0,button);
+      HandleMainMenu(mx,my, 0,0, button);
       break;
 
     case TYPENAME:
-      HandleTypeName(0,XK_Return);
+      HandleTypeName(0, XK_Return);
       break;
 
     case CHOOSELEVEL:
-      HandleChooseLevel(mx,my,0,0,button);
+      HandleChooseLevel(mx,my, 0,0, button);
       break;
 
     case HALLOFFAME:
@@ -296,7 +301,7 @@ void HandleButton(int mx, int my, int button)
       break;
 
     case LEVELED:
-      LevelEd(mx,my,button);
+      LevelEd(mx,my, button);
       break;
 
     case HELPSCREEN:
@@ -304,11 +309,11 @@ void HandleButton(int mx, int my, int button)
       break;
 
     case SETUP:
-      HandleSetupScreen(mx,my,0,0,button);
+      HandleSetupScreen(mx,my, 0,0, button);
       break;
 
     case SETUPINPUT:
-      HandleSetupInputScreen(mx,my,0,0,button);
+      HandleSetupInputScreen(mx,my, 0,0, button);
       break;
 
     case PLAYING:
@@ -426,9 +431,17 @@ void HandleKey(KeySym key, int key_status)
     return;
   }
 
+
+
+#ifndef DEBUG
+
   if (game_status == PLAYING && (tape.playing || tape.pausing))
     return;
 
+#endif
+
+
+
   switch(game_status)
   {
     case TYPENAME:
@@ -496,7 +509,12 @@ void HandleKey(KeySym key, int key_status)
 	case XK_8:
 	case XK_9:
 	  if (key == XK_0)
-	    GameFrameDelay = 500;
+	  {
+	    if (GameFrameDelay == 500)
+	      GameFrameDelay = GAME_FRAME_DELAY;
+	    else
+	      GameFrameDelay = 500;
+	  }
 	  else
 	    GameFrameDelay = (key - XK_0) * 10;
 	  printf("Game speed == %d%% (%d ms delay between two frames)\n",
@@ -545,80 +563,6 @@ void HandleKey(KeySym key, int key_status)
 
 #if 0
 
-	case XK_x:
-
-	  {
-	    int i,j,k, num_steps = 8, step_size = TILEX / num_steps;
-	    static long scroll_delay=0;
-	    long scroll_delay_value = 4*4 / num_steps;
-
-	    printf("Scroll test\n");
-
-	    for(i=0;i<3;i++)
-	    {
-	      for(j=0;j<SCR_FIELDX;j++)
-	      {
-		for(k=0;k<num_steps;k++)
-		{
-		  int xxx = j*TILEX+k*step_size;
-		  int done = 0;
-
-		  while(!done)
-		  {
-  		    if (DelayReached(&scroll_delay, scroll_delay_value))
-  		    {
-  		      XCopyArea(display,fieldbuffer,window,gc,
-  				SX+xxx,SY,
-  				SXSIZE-xxx,SYSIZE,
-  				SX,SY);
-  		      XCopyArea(display,fieldbuffer,window,gc,
-  				SX,SY,
-  				xxx,SYSIZE,
-  				SX+SXSIZE-xxx,SY);
-  
-  		      XFlush(display);
-  		      XSync(display,FALSE);
-
-		      done = 1;
-  		    }
-		    else
-		    {
-		      Delay(1);
-		    }
-		  }
-  
-		  /*
-		  Delay(160 / num_steps);
-		  */
-		  /*
-		  Delay(120 / num_steps);
-		  */
-		}
-	      }
-	    }
-	  }
-
-	  break;
-
-	case XK_y:
-	  /*
-	  {
-	    printf("FX = %d, FY = %d\n", FX,FY);
-
-	    XCopyArea(display,fieldbuffer,window,gc,
-		      0,0,
-		      MIN(WIN_XSIZE,FXSIZE),MIN(WIN_YSIZE,FYSIZE),
-		      0,0);
-	    XFlush(display);
-	    XSync(display,FALSE);
-	    Delay(1000);
-	  }
-	  */
-
-	  printf("direct_draw == %d\n", setup.direct_draw);
-
-	  break;
-
 	case XK_z:
 	  {
 	    int i;
@@ -634,20 +578,6 @@ void HandleKey(KeySym key, int key_status)
 	    printf("\n");
 	  }
 
-	  break;
-
-	case XK_t:
-	  {
-	    char *color[] = { "yellow", "red", "green", "blue" };
-
-	    do
-	      TestPlayer = (TestPlayer + 1) % MAX_PLAYERS;
-	    while(!stored_player[TestPlayer].active);
-
-	    printf("TestPlayer = %d (%s player)\n",
-		   TestPlayer, color[TestPlayer]);
-	  }
-
 	  break;
 #endif
 #endif
@@ -666,36 +596,17 @@ void HandleNoXEvent()
 {
   if (button_status && game_status != PLAYING)
   {
-    HandleButton(-1,-1,button_status);
+    HandleButton(-1,-1, button_status);
     return;
   }
 
   if (options.network)
     HandleNetworking();
 
-  switch(game_status)
-  {
-    case MAINMENU:
-    case CHOOSELEVEL:
-    case HALLOFFAME:
-    case HELPSCREEN:
-    case SETUP:
-    case SETUPINPUT:
-      HandleJoystick();
-      break;
-
-    case PLAYING:
-      HandleJoystick();
-
-      /*
-      HandleGameActions(0);
-      */
+  HandleJoystick();
 
-      break;
-
-    default:
-      break;
-  }
+  if (game_status == PLAYING)
+    HandleGameActions();
 }
 
 static int HandleJoystickForAllPlayers()
@@ -742,7 +653,7 @@ void HandleJoystick()
     {
       static long joystickmove_delay = 0;
 
-      if (joystick && !button && !DelayReached(&joystickmove_delay,150))
+      if (joystick && !button && !DelayReached(&joystickmove_delay, 150))
 	newbutton = dx = dy = 0;
 
       if (game_status==MAINMENU)
@@ -777,7 +688,6 @@ void HandleJoystick()
 	return;
       }
 
-      HandleGameActions();
       break;
 
     default: