X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fevents.c;h=d1f69f993a8732fcbfa3dad61e7aa67de1ebe9d0;hb=fd064dd67e4b52b0a98dfb6f91c67303ce1aed4c;hp=e371b63455b1384f0762765c6269bdf1850b1650;hpb=1e99bc0a89b3d120e8fbc193e307af741ad4efbc;p=rocksndiamonds.git

diff --git a/src/events.c b/src/events.c
index e371b634..d1f69f99 100644
--- a/src/events.c
+++ b/src/events.c
@@ -19,7 +19,7 @@
 #include "editor.h"
 #include "files.h"
 #include "tape.h"
-#include "cartoons.h"
+#include "anim.h"
 #include "network.h"
 
 
@@ -289,9 +289,6 @@ void HandleMouseCursor()
 
 void EventLoop(void)
 {
-  unsigned int sync_frame_delay = 0;
-  unsigned int sync_frame_delay_value = GAME_FRAME_DELAY;
-
   while (1)
   {
     if (PendingEvent())
@@ -308,11 +305,11 @@ void EventLoop(void)
     if (game_status == GAME_MODE_PLAYING)
       HandleGameActions();
 
-    /* refresh window contents from drawing buffer, if needed */
+    /* always copy backbuffer to visible screen for every video frame */
     BackToFront();
 
-    if (game_status != GAME_MODE_PLAYING)
-      WaitUntilDelayReached(&sync_frame_delay, sync_frame_delay_value);
+    /* reset video frame delay to default (may change again while playing) */
+    SetVideoFrameDelay(MenuFrameDelay);
 
     if (game_status == GAME_MODE_QUIT)
       return;
@@ -463,10 +460,13 @@ void HandleWindowEvent(WindowEvent *event)
 	event_name, event->data1, event->data2);
 #endif
 
+#if 0
+  // (not needed, as the screen gets redrawn every 20 ms anyway)
   if (event->event == SDL_WINDOWEVENT_SIZE_CHANGED ||
       event->event == SDL_WINDOWEVENT_RESIZED ||
       event->event == SDL_WINDOWEVENT_EXPOSED)
     SDLRedrawWindow();
+#endif
 
   if (event->event == SDL_WINDOWEVENT_RESIZED && !video.fullscreen_enabled)
   {
@@ -480,8 +480,10 @@ void HandleWindowEvent(WindowEvent *event)
       int new_xpercent = (100 * new_window_width  / video.width);
       int new_ypercent = (100 * new_window_height / video.height);
 
-      setup.window_scaling_percent = video.window_scaling_percent =
-	MIN(MAX(MIN_WINDOW_SCALING_PERCENT, MIN(new_xpercent, new_ypercent)),
+      // (extreme window scaling allowed, but cannot be saved permanently)
+      video.window_scaling_percent = MIN(new_xpercent, new_ypercent);
+      setup.window_scaling_percent =
+	MIN(MAX(MIN_WINDOW_SCALING_PERCENT, video.window_scaling_percent),
 	    MAX_WINDOW_SCALING_PERCENT);
 
       video.window_width  = new_window_width;
@@ -1355,9 +1357,11 @@ void HandleKey(Key key, int key_status)
 
   if ((key == KSYM_minus ||
        key == KSYM_plus ||
+       key == KSYM_equal ||	// ("Shift-=" is "+" on US keyboards)
        key == KSYM_0) &&
       ((GetKeyModState() & KMOD_Control) ||
-       (GetKeyModState() & KMOD_Alt)) &&
+       (GetKeyModState() & KMOD_Alt) ||
+       (GetKeyModState() & KMOD_Meta)) &&
       video.window_scaling_available &&
       !video.fullscreen_enabled)
   {
@@ -1518,18 +1522,6 @@ void HandleKey(Key key, int key_status)
 	    HandleHallOfFame(0, 0, 0, +1 * SCROLL_PAGE, MB_MENU_MARK);
 	  break;
 
-#ifdef DEBUG
-	case KSYM_0:
-	  GameFrameDelay = (GameFrameDelay == 500 ? GAME_FRAME_DELAY : 500);
-	  break;
-
-	case KSYM_b:
-	  setup.sp_show_border_elements = !setup.sp_show_border_elements;
-	  printf("Supaplex border elements %s\n",
-		 setup.sp_show_border_elements ? "enabled" : "disabled");
-	  break;
-#endif
-
 	default:
 	  break;
       }
@@ -1549,20 +1541,6 @@ void HandleKey(Key key, int key_status)
 	  break;
 
 #ifdef DEBUG
-	case KSYM_0:
-	  if (key == KSYM_0)
-	  {
-	    if (GameFrameDelay == 500)
-	      GameFrameDelay = GAME_FRAME_DELAY;
-	    else
-	      GameFrameDelay = 500;
-	  }
-	  else
-	    GameFrameDelay = (key - KSYM_0) * 10;
-	  printf("Game speed == %d%% (%d ms delay between two frames)\n",
-		 GAME_FRAME_DELAY * 100 / GameFrameDelay, GameFrameDelay);
-	  break;
-
 	case KSYM_d:
 	  if (options.debug)
 	  {
@@ -1598,6 +1576,41 @@ void HandleKey(Key key, int key_status)
 	return;
       }
   }
+
+#ifdef DEBUG
+  if (game_status == GAME_MODE_PLAYING || !setup.debug.frame_delay_game_only)
+  {
+    boolean mod_key_pressed = ((GetKeyModState() & KMOD_Control) ||
+			       (GetKeyModState() & KMOD_Alt) ||
+			       (GetKeyModState() & KMOD_Meta));
+
+    for (i = 0; i < NUM_DEBUG_FRAME_DELAY_KEYS; i++)
+    {
+      if (key == setup.debug.frame_delay_key[i] &&
+	  (mod_key_pressed || !setup.debug.frame_delay_use_mod_key))
+      {
+	GameFrameDelay = (GameFrameDelay != setup.debug.frame_delay[i] ?
+			  setup.debug.frame_delay[i] : GAME_FRAME_DELAY);
+
+	if (!setup.debug.frame_delay_game_only)
+	  MenuFrameDelay = GameFrameDelay;
+
+	SetVideoFrameDelay(GameFrameDelay);
+
+	if (GameFrameDelay > ONE_SECOND_DELAY)
+	  Error(ERR_DEBUG, "frame delay == %d ms", GameFrameDelay);
+	else if (GameFrameDelay != 0)
+	  Error(ERR_DEBUG, "frame delay == %d ms (max. %d fps / %d %%)",
+		GameFrameDelay, ONE_SECOND_DELAY / GameFrameDelay,
+		GAME_FRAME_DELAY * 100 / GameFrameDelay);
+	else
+	  Error(ERR_DEBUG, "frame delay == 0 ms (maximum speed)");
+
+	break;
+      }
+    }
+  }
+#endif
 }
 
 void HandleNoEvent()
@@ -1621,15 +1634,6 @@ void HandleNoEvent()
   {
     case GAME_MODE_MAIN:
       DrawPreviewLevelAnimation();
-      DoAnimation();
-      break;
-
-    case GAME_MODE_LEVELS:
-    case GAME_MODE_LEVELNR:
-    case GAME_MODE_SETUP:
-    case GAME_MODE_INFO:
-    case GAME_MODE_SCORES:
-      DoAnimation();
       break;
 
     case GAME_MODE_EDITOR: