From 22d71affbac0d1135f9dd2291cf631b5c4368dda Mon Sep 17 00:00:00 2001
From: Misa <infoteddy@infoteddy.info>
Date: Sat, 6 Mar 2021 18:14:44 -0800
Subject: [PATCH] De-duplicate number of menu text bytes

I've moved this to a define that gets declared in Game.h. I could've
made it a const int, but that's only legal in C++ mode.
---
 desktop_version/src/Game.cpp     | 2 +-
 desktop_version/src/Game.h       | 7 ++++---
 desktop_version/src/Graphics.cpp | 4 ++--
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/desktop_version/src/Game.cpp b/desktop_version/src/Game.cpp
index 6f4353eb..96ced9e1 100644
--- a/desktop_version/src/Game.cpp
+++ b/desktop_version/src/Game.cpp
@@ -6327,7 +6327,7 @@ void Game::createmenu( enum Menu::MenuName t, bool samemenu/*= false*/ )
                         static const char tmp[] = "   ";
                         prefix = tmp;
                     }
-                    char text[menutextbytes];
+                    char text[MENU_TEXT_BYTES];
                     SDL_snprintf(text, sizeof(text), "%s%s", prefix, ed.ListOfMetaData[i].title.c_str());
                     for (size_t ii = 0; text[ii] != '\0'; ++ii)
                     {
diff --git a/desktop_version/src/Game.h b/desktop_version/src/Game.h
index b0421374..d74386a5 100644
--- a/desktop_version/src/Game.h
+++ b/desktop_version/src/Game.h
@@ -14,10 +14,12 @@ namespace tinyxml2
     class XMLElement;
 }
 
+/* 40 chars (160 bytes) covers the entire screen, + 1 more for null terminator */
+#define MENU_TEXT_BYTES 161
+
 struct MenuOption
 {
-    char text[161]; // 40 chars (160 bytes) covers the entire screen, + 1 more for null terminator
-    // WARNING: should match Game::menutextbytes below
+    char text[MENU_TEXT_BYTES];
     bool active;
 };
 
@@ -252,7 +254,6 @@ public:
     int current_credits_list_index;
     int menuxoff, menuyoff;
     int menuspacing;
-    static const int menutextbytes = 161; // this is just sizeof(MenuOption::text), but doing that is non-standard
     std::vector<MenuStackFrame> menustack;
 
     void inline option(const char* text, bool active = true)
diff --git a/desktop_version/src/Graphics.cpp b/desktop_version/src/Graphics.cpp
index ce677c7b..187c86ac 100644
--- a/desktop_version/src/Graphics.cpp
+++ b/desktop_version/src/Graphics.cpp
@@ -1420,10 +1420,10 @@ void Graphics::drawmenu( int cr, int cg, int cb, bool levelmenu /*= false*/ )
             }
         }
 
-        char tempstring[Game::menutextbytes];
+        char tempstring[MENU_TEXT_BYTES];
         SDL_strlcpy(tempstring, opt.text, sizeof(tempstring));
 
-        char buffer[Game::menutextbytes];
+        char buffer[MENU_TEXT_BYTES];
         if ((int) i == game.currentmenuoption)
         {
             if (opt.active)