diff mm7_1.cpp @ 1231:182b910c528d

Слияние
author Ritor1
date Sun, 09 Jun 2013 10:18:51 +0600
parents eb419a6d48fe 96a81634669e
children 77ea5c5f2c0b
line wrap: on
line diff
--- a/mm7_1.cpp	Sun Jun 09 10:16:10 2013 +0600
+++ b/mm7_1.cpp	Sun Jun 09 10:18:51 2013 +0600
@@ -383,14 +383,14 @@
   v18 = (signed __int64)__PAIR__(v4, v5) % 60;
   v17 = (signed __int64)__PAIR__(v6, v7) % 60;
   v9 = v8 % 24;
-  strcpy(pTmpBuf, "\r020");
+  strcpy(pTmpBuf.data(), "\r020");
   if ( (unsigned int)v8 / 0x18 )
   {
     v10 = pGlobalTXT_LocalizationStrings[57];   // Days
     if ( v19 <= 1 )
       v10 = pGlobalTXT_LocalizationStrings[56]; // Day
-    sprintfex(pTmpBuf2, "%d %s ", (int)v19, v10);
-    strcat(pTmpBuf, pTmpBuf2);
+    sprintfex(pTmpBuf2.data(), "%d %s ", (int)v19, v10);
+    strcat(pTmpBuf.data(), pTmpBuf2.data());
   }
   if ( v9 )
   {
@@ -398,8 +398,8 @@
       v11 = pGlobalTXT_LocalizationStrings[109];// Hour
     else
       v11 = pGlobalTXT_LocalizationStrings[110];// Hours
-    sprintfex(pTmpBuf2, "%d %s ", (int)v9, v11);
-    strcat(pTmpBuf, pTmpBuf2);
+    sprintfex(pTmpBuf2.data(), "%d %s ", (int)v9, v11);
+    strcat(pTmpBuf.data(), pTmpBuf2.data());
   }
   if ( v17 && !v19 )
   {
@@ -407,8 +407,8 @@
       v12 = pGlobalTXT_LocalizationStrings[437];// Minute
     else
       v12 = pGlobalTXT_LocalizationStrings[436];// Minutes
-    sprintfex(pTmpBuf2, "%d %s ", (int)v17, v12);
-    strcat(pTmpBuf, pTmpBuf2);
+    sprintfex(pTmpBuf2.data(), "%d %s ", (int)v17, v12);
+    strcat(pTmpBuf.data(), pTmpBuf2.data());
   }
   if ( v18 && !v9 )
   {
@@ -416,10 +416,10 @@
       v13 = pGlobalTXT_LocalizationStrings[439];// Second
     else
       v13 = pGlobalTXT_LocalizationStrings[438];// Seconds
-    sprintfex(pTmpBuf2, "%d %s ", (int)v18, v13);
-    strcat(pTmpBuf, pTmpBuf2);
+    sprintfex(pTmpBuf2.data(), "%d %s ", (int)v18, v13);
+    strcat(pTmpBuf.data(), pTmpBuf2.data());
   }
-  a1->DrawText(a2, 32, uY, 0, pTmpBuf, 0, 0, 0);
+  a1->DrawText(a2, 32, uY, 0, pTmpBuf.data(), 0, 0, 0);
 }
 
 //----- (0041F54A) --------------------------------------------------------
@@ -430,8 +430,8 @@
   if ( pTexture_RestUI_CurrentHourglassFrame )
     pTexture_RestUI_CurrentHourglassFrame->Release();
   pIcons_LOD->SyncLoadedFilesCount();
-  sprintf(pTmpBuf, "TERRA%03d", pParty->uCurrentMinute / 6 + 10 * pParty->uCurrentHour);
-  pTexture_RestUI_CurrentSkyFrame = pIcons_LOD->LoadTexturePtr(pTmpBuf, TEXTURE_16BIT_PALETTE);
+  sprintf(pTmpBuf.data(), "TERRA%03d", pParty->uCurrentMinute / 6 + 10 * pParty->uCurrentHour);
+  pTexture_RestUI_CurrentSkyFrame = pIcons_LOD->LoadTexturePtr(pTmpBuf.data(), TEXTURE_16BIT_PALETTE);
 }
 
 //----- (0041F5BE) --------------------------------------------------------
@@ -532,7 +532,7 @@
   {
     if ( _1_dont_share_with_followers___2_the_same_but_without_a_message__else_normal == 1 )
     {
-      sprintf(pTmpBuf2, pGlobalTXT_LocalizationStrings[467], uNumGold);// You found %lu gold!
+      sprintf(pTmpBuf2.data(), pGlobalTXT_LocalizationStrings[467], uNumGold);// You found %lu gold!
     }
     else
     {
@@ -601,11 +601,11 @@
       v3 = (signed int)(v4 * v3 / 100) / 100;
       if ( v3 < 1 )
         v3 = 1;
-      sprintf(pTmpBuf2, pGlobalTXT_LocalizationStrings[466], v4, v3);// You found %lu gold (followers take %lu)!
+      sprintf(pTmpBuf2.data(), pGlobalTXT_LocalizationStrings[466], v4, v3);// You found %lu gold (followers take %lu)!
     }
     else
     {
-      sprintf(pTmpBuf2, pGlobalTXT_LocalizationStrings[467], v4);// You found %lu gold!
+      sprintf(pTmpBuf2.data(), pGlobalTXT_LocalizationStrings[467], v4);// You found %lu gold!
     }
     v2 = 0;
   }
@@ -613,7 +613,7 @@
   pUIAnim_Gold->uAnimTime = v2;
   pUIAnim_Gold->uAnimLength = 8 * pIconsFrameTable->pIcons[(signed __int16)pUIAnim_Gold->uIconID].uAnimLength;
   if ( pTmpBuf2[0] )
-    ShowStatusBarString(pTmpBuf2, 2u);
+    ShowStatusBarString(pTmpBuf2.data(), 2u);
   pAudioPlayer->PlaySound(SOUND_GoldReceived, v2, v2, -1, v2, v2, v2, v2);
 }
 
@@ -923,8 +923,8 @@
       }
       else
       {
-        sprintfex(pTmpBuf2, pGlobalTXT_LocalizationStrings[471], pItemsTable->pItems[v23].pUnidentifiedName);
-        ShowStatusBarString(pTmpBuf2, 2u);
+        sprintfex(pTmpBuf2.data(), pGlobalTXT_LocalizationStrings[471], pItemsTable->pItems[v23].pUnidentifiedName);
+        ShowStatusBarString(pTmpBuf2.data(), 2u);
         if ( v22->uItemID == 506 )
           _449B7E_toggle_bit(pParty->_quest_bits, 184, 1u);
         if ( v22->uItemID == 455 )
@@ -1084,7 +1084,7 @@
           if ( v20 )
           {
             pParty->uFlags |= 2u;
-            strcpy(byte_5B0938, v20);
+            strcpy(byte_5B0938.data(), v20);
             sub_4451A8_press_any_key(0, 0, 0);
           }
         }