# HG changeset patch # User zipi # Date 1377540715 -3600 # Node ID c987b5ed09af2b848774370258b4dabf16003734 # Parent bba0944c9b272ab1c77cd6cedc1e5b01ffa42927 footer array fix diff -r bba0944c9b27 -r c987b5ed09af UI/UiGame.cpp --- 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()); } } diff -r bba0944c9b27 -r c987b5ed09af mm7_3.cpp --- 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) -------------------------------------------------------- diff -r bba0944c9b27 -r c987b5ed09af mm7_data.cpp --- 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 byte_5C3427; // weak +//std::array byte_5C3427; // weak std::array GameUI_Footer_TimedString; std::array pFooterString; unsigned int GameUI_Footer_TimeLeft; diff -r bba0944c9b27 -r c987b5ed09af mm7_data.h --- 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 byte_5C3427; // weak +//extern std::array byte_5C3427; // weak extern std::array GameUI_Footer_TimedString; extern std::array pFooterString; extern unsigned int GameUI_Footer_TimeLeft;