Mercurial > mm7

diff mm7_1.cpp @ 726:9d13d2ec35a6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Слияние
author Ritor1
date Fri, 22 Mar 2013 01:29:46 +0600
parents 70c5a87a1307 735dab8d3c9a
children 585490c29945
line wrap: on
line diff
--- a/mm7_1.cpp	Fri Mar 22 01:29:25 2013 +0600
+++ b/mm7_1.cpp	Fri Mar 22 01:29:46 2013 +0600
@@ -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);