Replace float scale with int scale

TerryCavanagh · Aug 27, 2024 · db611bd · db611bd
1 parent 2bc2f31
commit db611bd
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 9 deletions.
diff --git a/desktop_version/src/Input.cpp b/desktop_version/src/Input.cpp
@@ -1989,11 +1989,11 @@ static void menuactionpress(void)
             music.playef(Sound_CRY);
             break;
         case 1:
-            touch::scale += 0.5;
+            touch::scale += 5;
             music.playef(Sound_VIRIDIAN);
-            if (touch::scale > 2)
+            if (touch::scale > 20)
             {
-                touch::scale = 0.5;
+                touch::scale = 5;
             }
             game.savestatsandsettings_menu();
             break;

diff --git a/desktop_version/src/Render.cpp b/desktop_version/src/Render.cpp
@@ -784,9 +784,10 @@ static void menurender(void)
             font::print_wrap(PR_CEN, -1, 65, loc::gettext("Change the scale of the UI buttons."), tr, tg, tb);
 
             char buffer[SCREEN_WIDTH_CHARS + 1];
+            float scale = (float)touch::scale / 10.0;
             vformat_buf(buffer, sizeof(buffer), loc::gettext("Current scale: {scale}.{extra}x"), "scale:int, extra:int",
-                (int)touch::scale,
-                (int)((float)((float)touch::scale - (int)touch::scale) * 10)
+                (int) scale,
+                (int) ((float) ((float) scale - (int) scale) * 10)
             );
             font::print(PR_CEN, -1, 75, buffer, tr, tg, tb);
             break;

diff --git a/desktop_version/src/Touch.cpp b/desktop_version/src/Touch.cpp
@@ -15,7 +15,7 @@ namespace touch
 {
     std::vector<VVV_Finger> fingers;
     TouchButton buttons[NUM_TOUCH_BUTTONS];
-    float scale;
+    int scale;
 
     int get_rect(TouchButton* button, SDL_Rect* rect)
     {
@@ -35,12 +35,12 @@ namespace touch
         int scale_x = rect.w / SCREEN_WIDTH_PIXELS;
         int scale_y = rect.h / SCREEN_HEIGHT_PIXELS;
 
-        return SDL_ceil(SDL_min(scale_x, scale_y) * scale);
+        return SDL_ceil(SDL_min(scale_x, scale_y) * ((float) scale / 10.f));
     }
 
     void init(void)
     {
-        scale = 1;
+        scale = 10;
 
         for (int i = 0; i < NUM_TOUCH_BUTTONS; i++)
         {

diff --git a/desktop_version/src/Touch.h b/desktop_version/src/Touch.h
@@ -46,7 +46,7 @@ namespace touch
 {
     extern std::vector<VVV_Finger> fingers;
     extern TouchButton buttons[NUM_TOUCH_BUTTONS];
-    extern float scale;
+    extern int scale;
 
     void refresh_buttons(void);
     void reset(void);