Mercurial > mm7

diff UIRest.cpp @ 962:0423c40d7e88

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
UpdateWindows and pWindow->Release
author Ritor1
date Tue, 07 May 2013 17:32:23 +0600
parents 5a12082c803d
children e865f349aa41
line wrap: on
line diff
--- a/UIRest.cpp	Mon May 06 17:33:40 2013 +0600
+++ b/UIRest.cpp	Tue May 07 17:32:23 2013 +0600
@@ -60,15 +60,12 @@
         }
     pEventTimer->Pause();
     if ( dword_506F14 != 2 )
-        GUIWindow::Create(518u, 450u, 0, 0, WINDOW_Button, (int)pBtn_Rest, 0);
+        GUIWindow::Create(518, 450, 0, 0, WINDOW_PressedButton2, (int)pBtn_Rest, 0);
     _506F18_num_hours_to_sleep = 0;
     dword_506F14 = 0;
     uRestUI_FoodRequiredToRest = 2;
     if ( uCurrentlyLoadedLevelType == LEVEL_Outdoor)
-        uRestUI_FoodRequiredToRest = pOutdoor->GetNumFoodRequiredToRestInCurrentPos(
-        pParty->vPosition.x,
-        pParty->vPosition.y,
-        pParty->vPosition.z);
+        uRestUI_FoodRequiredToRest = pOutdoor->GetNumFoodRequiredToRestInCurrentPos(pParty->vPosition.x, pParty->vPosition.y, pParty->vPosition.z);
     if ( PartyHasDragon() )
         {
         v0 = pParty->pPlayers;//[0].uClass;
@@ -223,7 +220,7 @@
             }
         else
         {
-          GUIWindow::Create(pButton_RestUI_Exit->uX, pButton_RestUI_Exit->uY, 0, 0, WINDOW_ExitRestWindow,
+          GUIWindow::Create(pButton_RestUI_Exit->uX, pButton_RestUI_Exit->uY, 0, 0, WINDOW_CloseRestWindowBtn,
            (int)pButton_RestUI_Exit, (int)pGlobalTXT_LocalizationStrings[81]);
         }
     }
\ No newline at end of file