From: Holger Schemel <holger.schemel@virtion.de>
Date: Mon, 28 Oct 2024 19:07:07 +0000 (+0100)
Subject: fixed resetting screen number when scrolling info screen by scrollbar
X-Git-Tag: 4.4.0.0-test-4~110
X-Git-Url: https://git.artsoft.org/?a=commitdiff_plain;h=f232f8fc6532e0761706bb163c91e6e12e5310de;p=rocksndiamonds.git

fixed resetting screen number when scrolling info screen by scrollbar
---

diff --git a/src/screens.c b/src/screens.c
index 98fe6867..4fd73c38 100644
--- a/src/screens.c
+++ b/src/screens.c
@@ -4260,8 +4260,31 @@ void HandleInfoScreen_Generic(int mx, int my, int dx, int dy, int button)
 
   if (button == MB_MENU_INITIALIZE)
   {
+    if (position_set_by_scrollbar)
+    {
+      int items_max = screen_gadget[SCREEN_CTRL_ID_SCROLL_VERTICAL]->scrollbar.items_max;
+      int items_visible = screen_gadget[SCREEN_CTRL_ID_SCROLL_VERTICAL]->scrollbar.items_visible;
+
+      // check if scrollbar was moved by one screen, or to top or bottom position
+      if (ABS(dy - start_pos) == items_visible - 1 || dy == 0 || dy == items_max - items_visible)
+      {
+        // use dynamic "next screen" calculation instead of adding static offset
+        // (required for text using multiple fonts with different vertical sizes)
+        HandleInfoScreen(0, 0, 0, SIGN(dy - start_pos) * SCROLL_PAGE, MB_MENU_MARK);
+      }
+      else
+      {
+        start_pos = dy;
+
+        DrawInfoScreen_GenericText(wrapped_text, wrapped_tmi, start_pos);
+      }
+
+      return;
+    }
+
     num_screens = 0;
     screen_nr = 0;
+    start_pos = 0;
 
     if (info_mode == INFO_MODE_CREDITS)
     {
@@ -4329,31 +4352,7 @@ void HandleInfoScreen_Generic(int mx, int my, int dx, int dy, int button)
       return;
     }
 
-    if (position_set_by_scrollbar)
-    {
-      int items_max = screen_gadget[SCREEN_CTRL_ID_SCROLL_VERTICAL]->scrollbar.items_max;
-      int items_visible = screen_gadget[SCREEN_CTRL_ID_SCROLL_VERTICAL]->scrollbar.items_visible;
-
-      // check if scrollbar was moved by one screen, or to top or bottom position
-      if (ABS(dy - start_pos) == items_visible - 1 || dy == 0 || dy == items_max - items_visible)
-      {
-        // use dynamic "next screen" calculation instead of adding static offset
-        // (required for text using multiple fonts with different vertical sizes)
-        HandleInfoScreen(0, 0, 0, SIGN(dy - start_pos) * SCROLL_PAGE, MB_MENU_MARK);
-
-        return;
-      }
-
-      start_pos = dy;
-
-      DrawInfoScreen_GenericText(wrapped_text, wrapped_tmi, start_pos);
-    }
-    else
-    {
-      start_pos = 0;
-
-      DrawInfoScreen_GenericScreen(screen_nr, num_screens, use_global_screens);
-    }
+    DrawInfoScreen_GenericScreen(screen_nr, num_screens, use_global_screens);
   }
   else if (button == MB_MENU_LEAVE)
   {