Mercurial > mm7

changeset 1470:c987b5ed09af

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
footer array fix
author zipi
date Mon, 26 Aug 2013 19:11:55 +0100
parents bba0944c9b27
children 736973e11d11
files UI/UiGame.cpp mm7_3.cpp mm7_data.cpp mm7_data.h
diffstat 4 files changed, 7 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/UI/UiGame.cpp	Mon Aug 26 18:49:17 2013 +0100
+++ b/UI/UiGame.cpp	Mon Aug 26 19:11:55 2013 +0100
@@ -1387,7 +1387,7 @@
             for ( i = pFontLucida->GetLineWidth(GameUI_Footer_TimedString.data());
                 i > 450;
                 i = pFontLucida->GetLineWidth(GameUI_Footer_TimedString.data()) )
-                byte_5C3427[strlen(GameUI_Footer_TimedString.data())] = 0;
+                GameUI_Footer_TimedString[strlen(GameUI_Footer_TimedString.data()) - 1] = 0;
             }
         else
             {
@@ -1395,7 +1395,7 @@
             for ( j = pFontLucida->GetLineWidth(pFooterString.data());
                 j > 450;
                 j = pFontLucida->GetLineWidth(pFooterString.data()) )
-                GameUI_Footer_TimedString[strlen(pFooterString.data()) + 199] = 0;
+                pFooterString[strlen(pFooterString.data()) - 1] = 0;
             }
         }
     }
@@ -1428,7 +1428,7 @@
                 {
                 v4 = strlen(GameUI_Footer_TimedString.data());
                 v5 = pFontLucida;
-                byte_5C3427[v4] = 0;
+                GameUI_Footer_TimedString[v4 - 1] = 0;
                 v2 = pFontLucida->GetLineWidth(GameUI_Footer_TimedString.data());
                 }
             }
@@ -1441,7 +1441,7 @@
                 {
                 v7 = strlen(pFooterString.data());
                 v8 = pFontLucida;
-                GameUI_Footer_TimedString[v7 + 199] = 0;
+                pFooterString[v7 - 1] = 0;
                 v6 = pFontLucida->GetLineWidth(pFooterString.data());
                 }
             }
--- a/mm7_3.cpp	Mon Aug 26 18:49:17 2013 +0100
+++ b/mm7_3.cpp	Mon Aug 26 19:11:55 2013 +0100
@@ -7763,7 +7763,7 @@
   for ( i = pFontLucida->GetLineWidth(GameUI_Footer_TimedString.data());
         i > 450;
         i = pFontLucida->GetLineWidth(GameUI_Footer_TimedString.data()) )
-    byte_5C3427[strlen(GameUI_Footer_TimedString.data())] = 0;
+    GameUI_Footer_TimedString[strlen(GameUI_Footer_TimedString.data()) - 1] = 0;
 }
 
 //----- (0044C1D0) --------------------------------------------------------
--- a/mm7_data.cpp	Mon Aug 26 18:49:17 2013 +0100
+++ b/mm7_data.cpp	Mon Aug 26 19:11:55 2013 +0100
@@ -1072,7 +1072,7 @@
 int dword_5C3418; // weak
 int dword_5C341C; // weak
 int _5C3420_pDecoration;
-std::array<char, 777> byte_5C3427; // weak
+//std::array<char, 777> byte_5C3427; // weak
 std::array<char, 200> GameUI_Footer_TimedString;
 std::array<char, 200> pFooterString;
 unsigned int GameUI_Footer_TimeLeft;
--- a/mm7_data.h	Mon Aug 26 18:49:17 2013 +0100
+++ b/mm7_data.h	Mon Aug 26 19:11:55 2013 +0100
@@ -716,7 +716,7 @@
 extern int dword_5C3418; // weak
 extern int dword_5C341C; // weak
 extern int _5C3420_pDecoration;
-extern std::array<char, 777> byte_5C3427; // weak
+//extern std::array<char, 777> byte_5C3427; // weak
 extern std::array<char, 200> GameUI_Footer_TimedString;
 extern std::array<char, 200> pFooterString;
 extern unsigned int GameUI_Footer_TimeLeft;