diff options
| author | Filip Gawin <filip.gawin@zoho.com> | 2019-08-16 20:17:15 +0200 |
|---|---|---|
| committer | Filip Gawin <filip.gawin@zoho.com> | 2019-08-27 21:18:47 +0200 |
| commit | 2fabbc3b4cab40220986f402569af64673cb4cd9 (patch) | |
| tree | 3278631a5e3dd19a0af92204e6bfb48702dd04f0 /src/core/Frontend.cpp | |
| parent | Cleanup (diff) | |
| download | re3-2fabbc3b4cab40220986f402569af64673cb4cd9.tar re3-2fabbc3b4cab40220986f402569af64673cb4cd9.tar.gz re3-2fabbc3b4cab40220986f402569af64673cb4cd9.tar.bz2 re3-2fabbc3b4cab40220986f402569af64673cb4cd9.tar.lz re3-2fabbc3b4cab40220986f402569af64673cb4cd9.tar.xz re3-2fabbc3b4cab40220986f402569af64673cb4cd9.tar.zst re3-2fabbc3b4cab40220986f402569af64673cb4cd9.zip | |
Diffstat (limited to 'src/core/Frontend.cpp')
| -rw-r--r-- | src/core/Frontend.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/core/Frontend.cpp b/src/core/Frontend.cpp index 1de5c94f..f4545f7b 100644 --- a/src/core/Frontend.cpp +++ b/src/core/Frontend.cpp @@ -95,7 +95,7 @@ bool GetMouseMoveRight(); bool GetPadInput(); bool GetMouseInput(); -char *FrontendFilenames[] = { +const char *FrontendFilenames[] = { "fe2_mainpanel_ul", "fe2_mainpanel_ur", "fe2_mainpanel_dl", @@ -126,7 +126,7 @@ char *FrontendFilenames[] = { "fe_radio9", // CHATTERBOX }; -char *MenuFilenames[] = { +const char *MenuFilenames[] = { "connection24", "", "findgame24", "", "hostgame24", "", @@ -1030,7 +1030,7 @@ int CMenuManager::FadeIn(int alpha) m_nCurrScreen == MENUPAGE_SAVING_IN_PROGRESS || m_nCurrScreen == MENUPAGE_DELETING) return alpha; - return min(m_nMenuFadeAlpha, alpha); + return Min(m_nMenuFadeAlpha, alpha); } #endif |