Mercurial > mm7

diff mm7_2.cpp @ 1033:3a5c8df8381d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* UI cleans and moves * Deleted many junk global variables.
author Nomad
date Tue, 21 May 2013 23:44:51 +0200
parents f93d17337113
children 39f42990698f
line wrap: on
line diff
--- a/mm7_2.cpp	Tue May 21 14:34:14 2013 +0200
+++ b/mm7_2.cpp	Tue May 21 23:44:51 2013 +0200
@@ -6673,7 +6673,7 @@
         pTexture_PCX.Load("lsave640.pcx", 0);
         pGUIWindow2 = GUIWindow::Create(0, 0, 640, 480, WINDOW_MainMenu, 0, 0);
         pCurrentScreen = SCREEN_LOADGAME;
-        GameUI_DrawLoadMenu(0);
+        LoadUI_Load(0);
       }
       pWindow = pGUIWindow_CurrentMenu;
     }
@@ -9511,8 +9511,7 @@
         {
          if ( pAudioPlayer->hAILRedbook )
           AIL_redbook_stop(pAudioPlayer->hAILRedbook);
-         extern MENU_STATE __cdecl CreditsMenu__Loop();
-         CreditsMenu__Loop();
+         MainMenuUI_Credits_Loop();
          break;
         }
         if (GetCurrentMenuID() == MENU_5 || GetCurrentMenuID() == MENU_LoadingProcInMainMenu)
@@ -11335,7 +11334,7 @@
     else
     {
       pAudioPlayer->StopChannels(-1, -1);
-      UI_CreateTravelDialogue();
+      TravelUI_Load();
     }
   }
   UpdateActors_ODM();