Mercurial > mm7

diff mm7_5.cpp @ 266:006188b68143

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Nomad
date Mon, 18 Feb 2013 10:06:38 +0200
parents fb890fb66cad
children b34b53ee874d 1f0af5cac2dd
line wrap: on
line diff
--- a/mm7_5.cpp	Mon Feb 18 10:04:47 2013 +0200
+++ b/mm7_5.cpp	Mon Feb 18 10:06:38 2013 +0200
@@ -3505,7 +3505,7 @@
           goto _sprintex_2args_draw_status_and_continue;
         case UIMSG_ShowStatus_Player:
           pPlayer5 = pPlayers[uMessageParam];
-          sprintf(pTmpBuf, pGlobalTXT_LocalizationStrings[429], pPlayer5->pName, pClassNames[pPlayer5->classType]);// "%s the %s"
+          sprintfex(pTmpBuf, pGlobalTXT_LocalizationStrings[429], pPlayer5->pName, pClassNames[pPlayer5->classType]);// "%s the %s"
           strcat(pTmpBuf, ": ");
           v107 = pPlayer5->GetMajorConditionIdx();
           strcat(pTmpBuf, aCharacterConditionNames[v107]);
@@ -16096,7 +16096,7 @@
         {
           v10 = v6->pName;
           v11 = pTmpBuf;
-          sprintf(pTmpBuf, pGlobalTXT_LocalizationStrings[429], v10, aNPCProfessionNames[v9]);
+          sprintfex(pTmpBuf, pGlobalTXT_LocalizationStrings[429], v10, aNPCProfessionNames[v9]);
         }
         else
         {
@@ -16910,26 +16910,11 @@
     strcat(a2, "%s\t%03d:\t%03d%s\t000\n");
 
     v23 = static_sub_417BB5_out_string;
-    sprintf(
-      static_sub_417BB5_out_string,
-      a2,
-      pSkillDesc[v28],
-      pGlobalTXT_LocalizationStrings[431],      // Normal
-      (char *)v35 + 3,
-      v35 + 5,
-      pNormalSkillDesc[v28],
-      pGlobalTXT_LocalizationStrings[433],      // Expert
-      (char *)v35 + 3,
-      v35 + 5,
-      pExpertSkillDesc[v28],
-      pGlobalTXT_LocalizationStrings[432],      // Master
-      (char *)v35 + 3,
-      v35 + 5,
-      pMasterSkillDesc[v28],
-      pGlobalTXT_LocalizationStrings[96],       // Grand
-      (char *)v35 + 3,
-      v35 + 5,
-      pGrandSkillDesc[v28]);
+    sprintf(static_sub_417BB5_out_string, a2, pSkillDesc[v28], pGlobalTXT_LocalizationStrings[431],      // Normal
+      (char *)v35 + 3, v35 + 5, pNormalSkillDesc[v28], pGlobalTXT_LocalizationStrings[433],      // Expert
+      (char *)v35 + 3, v35 + 5, pExpertSkillDesc[v28], pGlobalTXT_LocalizationStrings[432],      // Master
+      (char *)v35 + 3, v35 + 5, pMasterSkillDesc[v28], pGlobalTXT_LocalizationStrings[96],       // Grand
+      (char *)v35 + 3, v35 + 5, pGrandSkillDesc[v28]);
   }
   else
   {