Mercurial > mm7

diff GUIWindow.cpp @ 471:c43f156a95c9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
ArmorShopDialog crash fixed. All shops show its items
author Gloval
date Mon, 25 Feb 2013 23:33:15 +0400
parents e5cf03a3d98e
children 7f1b00901cf7
line wrap: on
line diff
--- a/GUIWindow.cpp	Mon Feb 25 17:58:00 2013 +0400
+++ b/GUIWindow.cpp	Mon Feb 25 23:33:15 2013 +0400
@@ -1233,8 +1233,8 @@
 
 
 //----- (004B1854) --------------------------------------------------------
-char *GUIWindow::_4B1854(__int64 a2)
-{
+void GUIWindow::DrawCurrentTime( __int64 a2 )
+	{
   unsigned int v2; // edi@1
   unsigned int v3; // esi@1
   unsigned int v4; // ebp@1
@@ -1263,7 +1263,7 @@
   v16 = (signed __int64)__PAIR__(v4, v5) % 60;
   v7 = v6 % 24;
   strcpy(pTmpBuf, pGlobalTXT_LocalizationStrings[532]);
-  if ( (unsigned int)v6 / 0x18 )
+  if ( (unsigned int)v6 /24 )
   {
     v8 = pGlobalTXT_LocalizationStrings[57];
     if ( v18 <= 1 )
@@ -1283,24 +1283,24 @@
   if ( v16 && !v18 )
   {
     if ( v16 <= 1 )
-      v10 = pGlobalTXT_LocalizationStrings[437];
+      v10 = pGlobalTXT_LocalizationStrings[437];//"Minute"
     else
-      v10 = pGlobalTXT_LocalizationStrings[436];
+      v10 = pGlobalTXT_LocalizationStrings[436]; //"Minutes"
     sprintf(pTmpBuf2, "%d %s ", v16, v10);
     strcat(pTmpBuf, pTmpBuf2);
   }
   if ( v17 && !v7 )
   {
     if ( v17 <= 1 )
-      v11 = pGlobalTXT_LocalizationStrings[439];
+      v11 = pGlobalTXT_LocalizationStrings[439]; //"Second"	
     else
-      v11 = pGlobalTXT_LocalizationStrings[438];
+      v11 = pGlobalTXT_LocalizationStrings[438]; //"Seconds"
     sprintf(pTmpBuf2, "%d %s ", v17, v11);
     strcat(pTmpBuf, pTmpBuf2);
   }
   v12 = GenerateColorAsCloseAsPossibleToR8G8B8InTargetFormat(0xFFu, 0xFFu, 0x9Bu);
   v13 = pFontArrus->CalcTextHeight(pTmpBuf, v15, 0, 0);
-  return v15->DrawTitleText(pFontArrus, 0, (212 - v13) / 2 + 101, v12, pTmpBuf, 3u);
+  v15->DrawTitleText(pFontArrus, 0, (212 - v13) / 2 + 101, v12, pTmpBuf, 3u);
 }