Mercurial > mm7

comparison UI/UISaveLoad.cpp @ 1652:42055a4bd550

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Слияние
author Ritor1
date Wed, 18 Sep 2013 09:21:38 +0600
parents afc1c3514dd5
children e013b92030e3
comparison
equal deleted inserted replaced
1651:d65f6e73f213 1652:42055a4bd550
9 9
10 #include "..\MapInfo.h" 10 #include "..\MapInfo.h"
11 #include "..\GUIWindow.h" 11 #include "..\GUIWindow.h"
12 #include "..\GUIFont.h" 12 #include "..\GUIFont.h"
13 #include "..\Render.h" 13 #include "..\Render.h"
14 #include "..\IndoorCamera.h"
15 #include "..\LOD.h" 14 #include "..\LOD.h"
16 #include "..\SaveLoad.h" 15 #include "..\SaveLoad.h"
17 #include "..\texts.h" 16 #include "..\texts.h"
18 17
19 #include "..\mm7_data.h" 18 #include "..\mm7_data.h"
78 { 77 {
79 v2 = uTextureID_load_up; 78 v2 = uTextureID_load_up;
80 v3 = uTextureID_LS_loadU; 79 v3 = uTextureID_LS_loadU;
81 } 80 }
82 pRenderer->DrawTextureIndexed(241, 302, pIcons_LOD->GetTexture(v3)); 81 pRenderer->DrawTextureIndexed(241, 302, pIcons_LOD->GetTexture(v3));
83 pRenderer->DrawTextureIndexed (18, 139, pIcons_LOD->GetTexture(v2)); 82 pRenderer->DrawTextureIndexed( 18, 139, pIcons_LOD->GetTexture(v2));
84 pRenderer->DrawTextureIndexed(351, 302, pIcons_LOD->GetTexture(uTextureID_x_u)); 83 pRenderer->DrawTextureIndexed(351, 302, pIcons_LOD->GetTexture(uTextureID_x_u));
85 v1 = 255; 84 v1 = 255;
86 } 85 }
87 if ( pSavegameUsedSlots[uLoadGameUI_SelectedSlot] ) 86 if ( pSavegameUsedSlots[uLoadGameUI_SelectedSlot] )
88 { 87 {
146 LABEL_23: 145 LABEL_23:
147 auto day = aDayNames[HIDWORD(pOurHour) % 7]; 146 auto day = aDayNames[HIDWORD(pOurHour) % 7];
148 auto ampm = aAMPMNames[HIDWORD(pAMPM2)]; 147 auto ampm = aAMPMNames[HIDWORD(pAMPM2)];
149 auto month = aMonthNames[pMonthNum]; 148 auto month = aMonthNames[pMonthNum];
150 //sprintf(pTmpBuf.data(), "%s %d:%02d%s\n%d %s %d", _d, v17, (int)32, _a, 3, _m, pFilesID); 149 //sprintf(pTmpBuf.data(), "%s %d:%02d%s\n%d %s %d", _d, v17, (int)32, _a, 3, _m, pFilesID);
151 sprintf(pTmpBuf.data(), "%s %d:%02d%s\n%d %s %d", day, pHour, pMinutes, ampm, 7 * v16 + HIDWORD(pOurHour) % 7 + 1, month, pYear); 150 sprintfex(pTmpBuf.data(), "%s %d:%02d%s\n%d %s %d", day, pHour, pMinutes, ampm, 7 * v16 + HIDWORD(pOurHour) % 7 + 1, month, pYear);
152 pWindow.DrawTitleText(pFontSmallnum, 0, 0, 0, pTmpBuf.data(), 3u); 151 pWindow.DrawTitleText(pFontSmallnum, 0, 0, 0, pTmpBuf.data(), 3u);
153 v1 = 255; 152 v1 = 255;
154 } 153 }
155 if ( pGUIWindow_CurrentMenu->receives_keyboard_input_2 == WINDOW_INPUT_CONFIRMED) 154 if ( pGUIWindow_CurrentMenu->receives_keyboard_input_2 == WINDOW_INPUT_CONFIRMED)
156 { 155 {