Mercurial > mm7

diff mm7_1.cpp @ 710:735dab8d3c9a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Town portal screen + misc gui const replacements
author Nomad
date Thu, 21 Mar 2013 20:30:17 +0200
parents d6236f6a9882
children 9d13d2ec35a6
line wrap: on
line diff
--- a/mm7_1.cpp	Thu Mar 21 12:37:49 2013 +0200
+++ b/mm7_1.cpp	Thu Mar 21 20:30:17 2013 +0200
@@ -738,7 +738,7 @@
   bRingsShownInCharScreen = 0;
   CharacterUI_LoadPaperdollTextures();
   pCurrentScreen = SCREEN_CASTING;
-  v2 = GUIWindow::Create(0, 0, 640, 480, (WindowType)(WINDOW_HouseInterior|WINDOW_Options), v1, 0);
+  v2 = GUIWindow::Create(0, 0, 640, 480, WINDOW_1F, v1, 0);
   pCharacterScreen_ExitBtn = v2->CreateButton(
                  394u,
                  318u,
@@ -749,7 +749,7 @@
                  0xA8u,
                  0,
                  0,
-                 pGlobalTXT_LocalizationStrings[79],
+                 pGlobalTXT_LocalizationStrings[79], // Close
                  (Texture *)(papredoll_dbrds[2] != -1 ? (int)&pIcons_LOD->pTextures[papredoll_dbrds[2]] : 0),
                  papredoll_dbrds[1] != -1 ? (int)&pIcons_LOD->pTextures[papredoll_dbrds[1]] : 0,
                  0);