X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fevents.c;h=039be790270c51f9eb82c11990f3d6986d67d1be;hb=5e8d9d0308f76bb35e7578a8859d6f01977d0f69;hp=edce9a9c4ac35ae3a8026938199847e2e3f24c10;hpb=4b0f1eb4220d2dbe4cffb288f745661b32c96a5b;p=rocksndiamonds.git

diff --git a/src/events.c b/src/events.c
index edce9a9c..039be790 100644
--- a/src/events.c
+++ b/src/events.c
@@ -65,12 +65,18 @@ void EventLoop(void)
     else			/* got no event, but don't be lazy... */
     {
       HandleNoXEvent();
-      Delay(1000);		/* don't use all CPU time when idle */
-    }
 
-    XSync(display,FALSE);
+      /* don't use all CPU time when idle; the main loop while playing
+	 has its own synchronization and is CPU friendly, too */
+
+      if (game_status != PLAYING)
+      {
+	XSync(display, FALSE);
+	Delay(10);
+      }
+    }
 
-    if (game_status==EXITGAME)
+    if (game_status == EXITGAME)
       return;
   }
 }
@@ -165,15 +171,22 @@ void HandleExposeEvent(XExposeEvent *event)
       for(yy=0;yy<SCR_FIELDY;yy++)
 	if (xx>=x1 && xx<=x2 && yy>=y1 && yy<=y2)
 	  DrawScreenField(xx,yy);
-    DrawPlayerField();
+    DrawPlayerField(JX,JY);
 
     SetDrawtoField(DRAW_DIRECT);
   }
 
-  if (soft_scrolling_on && game_status==PLAYING)
+  if (soft_scrolling_on && game_status == PLAYING)
+  {
+    int fx = FX, fy = FY;
+
+    fx += (local_player->MovDir & (MV_LEFT|MV_RIGHT) ? ScreenMovPos : 0);
+    fy += (local_player->MovDir & (MV_UP|MV_DOWN)    ? ScreenMovPos : 0);
+
     XCopyArea(display,fieldbuffer,backbuffer,gc,
-	      FX,FY, SXSIZE,SYSIZE,
+	      fx,fy, SXSIZE,SYSIZE,
 	      SX,SY);
+  }
 
   XCopyArea(display,drawto,window,gc, x,y, width,height, x,y);
 
@@ -278,16 +291,13 @@ void HandleButton(int mx, int my, int button)
       HandleSetupScreen(mx,my,0,0,button);
       break;
     case PLAYING:
-      HandleGameActions();
+      HandleGameActions(0);
       break;
     default:
       break;
   }
 }
 
-int GameSpeed = 2;
-int MoveSpeed = 8;
-
 void HandleKey(KeySym key, int key_status)
 {
   int joy = 0;
@@ -506,10 +516,11 @@ void HandleKey(KeySym key, int key_status)
 	case XK_8:
 	case XK_9:
 	  if (key == XK_0)
-	    GameSpeed = 50;
+	    GameFrameDelay = 500;
 	  else
-	    GameSpeed = key - XK_0;
-	  printf("GameSpeed == %d\n", GameSpeed);
+	    GameFrameDelay = (key - XK_0) * 10;
+	  printf("Game speed == %d%% (%d ms delay between two frames)\n",
+		 GAME_FRAME_DELAY * 100 / GameFrameDelay, GameFrameDelay);
 	  break;
 
 	case XK_a:
@@ -541,7 +552,7 @@ void HandleKey(KeySym key, int key_status)
 	case XK_Q:
 #endif
 	case XK_q:
-	  Dynamite = 1000;
+	  local_player->dynamite = 1000;
 	  break;
 
 	case XK_x:
@@ -582,15 +593,15 @@ void HandleKey(KeySym key, int key_status)
   		    }
 		    else
 		    {
-		      Delay(1000);
+		      Delay(1);
 		    }
 		  }
   
 		  /*
-		  Delay(160000 / num_steps);
+		  Delay(160 / num_steps);
 		  */
 		  /*
-		  Delay(120000 / num_steps);
+		  Delay(120 / num_steps);
 		  */
 		}
 	      }
@@ -609,30 +620,7 @@ void HandleKey(KeySym key, int key_status)
 		      0,0);
 	    XFlush(display);
 	    XSync(display,FALSE);
-	    Delay(1000000);
-	  }
-
-	  break;
-
-	case XK_z:
-	  {
-	    static int test_picture_pos = 0;
-
-	    printf("test picture %d\n", test_picture_pos);
-
-	    XCopyArea(display,test_pix[test_picture_pos],window,gc,
-		      0,0, 100,100,
-		      0,0);
-	    /*
-	    XCopyArea(display,test_clipmask[test_picture_pos],window,gc,
-		      0,0, 100,100,
-		      100,0);
-		      */
-	    XFlush(display);
-	    XSync(display,FALSE);
-	    Delay(1000000);
-
-	    test_picture_pos = (test_picture_pos + 1) % test_picture_count;
+	    Delay(1000);
 	  }
 
 	  break;
@@ -667,7 +655,11 @@ void HandleNoXEvent()
       break;
     case PLAYING:
       HandleJoystick();
-      HandleGameActions();
+
+      /*
+      HandleGameActions(0);
+      */
+
       break;
     default:
       break;
@@ -684,15 +676,10 @@ void HandleJoystick()
   int up	= joy & JOY_UP;
   int down	= joy & JOY_DOWN;
   int button	= joy & JOY_BUTTON;
-  int button1	= joy & JOY_BUTTON_1;
-  int button2	= joy & JOY_BUTTON_2;
   int newbutton	= (JoystickButton() == JOY_BUTTON_NEW_PRESSED);
   int dx	= (left ? -1	: right ? 1	: 0);
   int dy	= (up   ? -1	: down  ? 1	: 0);
 
-  if (game_status==PLAYING && (tape.playing || keyboard))
-    newbutton = ((joy & JOY_BUTTON) != 0);
-
   switch(game_status)
   {
     case MAINMENU:
@@ -712,15 +699,18 @@ void HandleJoystick()
 	HandleSetupScreen(0,0,dx,dy,newbutton ? MB_MENU_CHOICE : MB_MENU_MARK);
       break;
     }
+
     case HALLOFFAME:
       HandleHallOfFame(!newbutton);
       break;
+
     case HELPSCREEN:
       HandleHelpScreen(!newbutton);
       break;
+
     case PLAYING:
-    {
-      BOOL moved = FALSE, snapped = FALSE, bombed = FALSE;
+      if (tape.playing || keyboard)
+	newbutton = ((joy & JOY_BUTTON) != 0);
 
       if (GameOver && newbutton)
       {
@@ -733,58 +723,9 @@ void HandleJoystick()
       if (tape.pausing || PlayerGone)
 	joy = 0;
 
-      if (joy)
-      {
-	if (button1)
-	  snapped = SnapField(dx,dy);
-	else
-	{
-	  if (button2)
-	    bombed = PlaceBomb();
-	  moved = MoveFigure(dx,dy);
-	}
-
-	if (tape.recording && (moved || snapped || bombed))
-	{
-	  if (bombed && !moved)
-	    joy &= JOY_BUTTON;
-	  TapeRecordAction(joy);
-	}
-	else if (tape.playing && snapped)
-	  SnapField(0,0);			/* stop snapping */
-      }
-      else
-      {
-	DigField(0,0,0,0,DF_NO_PUSH);
-	SnapField(0,0);
-	PlayerFrame = 0;
-      }
-
-      if (tape.playing && !tape.pausing && !joy && tape.counter<tape.length)
-      {
-	int next_joy =
-	  tape.pos[tape.counter].joystickdata & (JOY_LEFT|JOY_RIGHT);
-
-	if (next_joy == JOY_LEFT || next_joy == JOY_RIGHT)
-	{
-	  int dx = (next_joy == JOY_LEFT ? -1 : +1);
-
-	  if (IN_LEV_FIELD(JX+dx,JY) && IS_PUSHABLE(Feld[JX+dx][JY]))
-	  {
-	    int el = Feld[JX+dx][JY];
-	    int push_delay = (IS_SB_ELEMENT(el) || el==EL_SONDE ? 2 : 10);
-
-	    if (tape.delay_played + push_delay >= tape.pos[tape.counter].delay)
-	    {
-	      PlayerMovDir = next_joy;
-	      PlayerFrame = FrameCounter % 4;
-	      PlayerPushing = TRUE;
-	    }
-	  }
-	}
-      }
+      HandleGameActions(joy);
       break;
-    }
+
     default:
       break;
   }