Mercurial > mm7

changeset 721:f39d5902c85a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
m
author Ritor1
date Wed, 20 Mar 2013 17:48:51 +0600
parents 05f7a11f4f20
children 70c5a87a1307
files mm7_1.cpp mm7_2.cpp mm7_4.cpp mm7_6.cpp
diffstat 4 files changed, 13 insertions(+), 17 deletions(-) [+]
line wrap: on
line diff
--- a/mm7_1.cpp	Tue Mar 19 23:41:29 2013 +0600
+++ b/mm7_1.cpp	Wed Mar 20 17:48:51 2013 +0600
@@ -5163,7 +5163,7 @@
       }
       else
       {
-        sprintf(pTmpBuf2, pGlobalTXT_LocalizationStrings[471], pItemsTable->pItems[v23].pUnidentifiedName);
+        sprintfex(pTmpBuf2, pGlobalTXT_LocalizationStrings[471], pItemsTable->pItems[v23].pUnidentifiedName);
         ShowStatusBarString(pTmpBuf2, 2u);
         if ( v22->uItemID == 506 )
           _449B7E_toggle_bit(pParty->_quest_bits, 184, 1u);
--- a/mm7_2.cpp	Tue Mar 19 23:41:29 2013 +0600
+++ b/mm7_2.cpp	Wed Mar 20 17:48:51 2013 +0600
@@ -12139,7 +12139,7 @@
         if ( pParty->pPickedItem.uItemID )
           return 1;
         v24 = (int)pItemsTable->pItems[v20].pUnidentifiedName;
-        sprintf(pTmpBuf2, pGlobalTXT_LocalizationStrings[471], v24);
+        sprintfex(pTmpBuf2, pGlobalTXT_LocalizationStrings[471], v24);
         ShowStatusBarString(pTmpBuf2, 2u);
         if ( v19->uItemID == 506 )
           _449B7E_toggle_bit(pParty->_quest_bits, 184, 1u);
--- a/mm7_4.cpp	Tue Mar 19 23:41:29 2013 +0600
+++ b/mm7_4.cpp	Wed Mar 20 17:48:51 2013 +0600
@@ -10068,7 +10068,7 @@
     v2 = pTransitionStrings[uHouse_ExitPic];
     if ( !v2 )
     {
-      sprintf(pTmpBuf, pGlobalTXT_LocalizationStrings[411], v0);
+      sprintfex(pTmpBuf, pGlobalTXT_LocalizationStrings[411], v0);
       v2 = pTmpBuf;
     }
     v3 = v2;
@@ -12279,10 +12279,7 @@
       v14 = pMapStats->GetMapInfo(pCurrentMapName);
       if ( v14 )
       {
-        v20 = pMapStats->pInfos[v14].pName;
-        v18 = pGlobalTXT_LocalizationStrings[410];
-LABEL_10:
-        sprintf(sHouseName, v18, v20);
+        sprintfex(sHouseName, pGlobalTXT_LocalizationStrings[410], pMapStats->pInfos[v14].pName);
         goto LABEL_20;
       }
       v21 = pGlobalTXT_LocalizationStrings[79];
@@ -12295,9 +12292,8 @@
   v16 = pMapStats->GetMapInfo(v15);
   if ( v16 )
   {
-    v20 = pMapStats->pInfos[v16].pName;
-    v18 = pGlobalTXT_LocalizationStrings[411];
-    goto LABEL_10;
+    sprintfex(sHouseName, pGlobalTXT_LocalizationStrings[411], pMapStats->pInfos[v16].pName);
+    goto LABEL_20;
   }
   v21 = pGlobalTXT_LocalizationStrings[73];
 LABEL_19:
--- a/mm7_6.cpp	Tue Mar 19 23:41:29 2013 +0600
+++ b/mm7_6.cpp	Wed Mar 20 17:48:51 2013 +0600
@@ -1416,9 +1416,9 @@
     Dst.uItemID = pActor->uCarriedItemID;
     v9 = pItemsTable->pItems[Dst.uItemID].pUnidentifiedName;
     if ( v14 )
-      sprintf(pTmpBuf2, (char*)pGlobalTXT_LocalizationStrings[490], v14, v9);
+      sprintfex(pTmpBuf2, (char*)pGlobalTXT_LocalizationStrings[490], v14, v9);
     else
-      sprintf(pTmpBuf2, (char*)pGlobalTXT_LocalizationStrings[471], v9);
+      sprintfex(pTmpBuf2, (char*)pGlobalTXT_LocalizationStrings[471], v9);
     ShowStatusBarString(pTmpBuf2, 2u);
     v4 = Dst.uItemID;
     v5 = Dst.uItemID;
@@ -1466,9 +1466,9 @@
       pActor->array_000234[3].Reset();
       v11 = pItemsTable->pItems[Dst.uItemID].pUnidentifiedName;
       if ( v14 )
-        sprintf(pTmpBuf2, pGlobalTXT_LocalizationStrings[490], v14, v11);
+        sprintfex(pTmpBuf2, pGlobalTXT_LocalizationStrings[490], v14, v11);
       else
-        sprintf(pTmpBuf2, pGlobalTXT_LocalizationStrings[471], v11);
+        sprintfex(pTmpBuf2, pGlobalTXT_LocalizationStrings[471], v11);
       ShowStatusBarString(pTmpBuf2, 2u);
       if ( !pParty->AddItem(&Dst) )
         pParty->SetHoldingItem(&Dst);
@@ -1485,9 +1485,9 @@
   pItemsTable->GenerateItem(v7, pActor->pMonsterInfo.uTreasureType, &Dst);
   v10 = pItemsTable->pItems[Dst.uItemID].pUnidentifiedName;
   if ( v14 )
-    sprintf(pTmpBuf2, pGlobalTXT_LocalizationStrings[490], v14, v10);
+    sprintfex(pTmpBuf2, pGlobalTXT_LocalizationStrings[490], v14, v10);
   else
-    sprintf(pTmpBuf2, pGlobalTXT_LocalizationStrings[471], v10);
+    sprintfex(pTmpBuf2, pGlobalTXT_LocalizationStrings[471], v10);
   ShowStatusBarString(pTmpBuf2, 2u);
   v8 = pParty;
   if ( !pParty->AddItem(&Dst) )
@@ -6319,7 +6319,7 @@
           }
           else
           {
-            sprintf(pTmpBuf2, (char*)pGlobalTXT_LocalizationStrings[471], pItemsTable->pItems[v450].pUnidentifiedName);
+            sprintfex(pTmpBuf2, (char*)pGlobalTXT_LocalizationStrings[471], pItemsTable->pItems[v450].pUnidentifiedName);
             ShowStatusBarString(pTmpBuf2, 2u);
             if ( !pParty->AddItem(&pSpriteObjects[v445].stru_24) )
               pParty->SetHoldingItem(&pSpriteObjects[v445].stru_24);