Mercurial > mm7

diff 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
line wrap: on
line diff
--- a/UI/UISaveLoad.cpp	Wed Sep 18 09:21:32 2013 +0600
+++ b/UI/UISaveLoad.cpp	Wed Sep 18 09:21:38 2013 +0600
@@ -11,7 +11,6 @@
 #include "..\GUIWindow.h"
 #include "..\GUIFont.h"
 #include "..\Render.h"
-#include "..\IndoorCamera.h"
 #include "..\LOD.h"
 #include "..\SaveLoad.h"
 #include "..\texts.h"
@@ -80,7 +79,7 @@
       v3 = uTextureID_LS_loadU;
     }
     pRenderer->DrawTextureIndexed(241, 302, pIcons_LOD->GetTexture(v3));
-    pRenderer->DrawTextureIndexed (18, 139, pIcons_LOD->GetTexture(v2));
+    pRenderer->DrawTextureIndexed( 18, 139, pIcons_LOD->GetTexture(v2));
     pRenderer->DrawTextureIndexed(351, 302, pIcons_LOD->GetTexture(uTextureID_x_u));
     v1 = 255;
   }
@@ -148,7 +147,7 @@
     auto ampm = aAMPMNames[HIDWORD(pAMPM2)];
     auto month = aMonthNames[pMonthNum];
     //sprintf(pTmpBuf.data(), "%s %d:%02d%s\n%d %s %d", _d, v17, (int)32, _a, 3, _m, pFilesID);
-    sprintf(pTmpBuf.data(), "%s %d:%02d%s\n%d %s %d", day, pHour, pMinutes, ampm, 7 * v16 + HIDWORD(pOurHour) % 7 + 1, month, pYear);
+    sprintfex(pTmpBuf.data(), "%s %d:%02d%s\n%d %s %d", day, pHour, pMinutes, ampm, 7 * v16 + HIDWORD(pOurHour) % 7 + 1, month, pYear);
     pWindow.DrawTitleText(pFontSmallnum, 0, 0, 0, pTmpBuf.data(), 3u);
     v1 = 255;
   }