# HG changeset patch
# User Nomad
# Date 1351464573 -7200
# Node ID 2d5d13376e916f1698956b4c06c958b73080f20f
# Parent  f9a33f75bae3955ac23a7b0651e1fc0644a626ea# Parent  517e33e08d936b6a0fa1f2e79d5a9756fd974d8e
Merge

diff -r f9a33f75bae3 -r 2d5d13376e91 Actor.cpp
--- a/Actor.cpp	Mon Oct 29 00:41:51 2012 +0200
+++ b/Actor.cpp	Mon Oct 29 00:49:33 2012 +0200
@@ -180,7 +180,7 @@
   if ( (v6 & 3) != 2 )
     v5->uFlags = v6 + 1;
   v7 = const_2();
-  sprintfex(pContainer, "evt%02d", v7);
+  sprintf(pContainer, "evt%02d", v7);
   if ( !pParty->uAlignment )
   {
     v14 = "-b";
@@ -198,7 +198,7 @@
   array_5913D8[6] = 0;
   uNumDialogueNPCPortraits = 1;
   pTexture_Dialogue_Background = &pIcons_LOD->pTextures[v8];
-  sprintfex(pContainer, "npc%03u", v5->uPortraitID);
+  sprintf(pContainer, "npc%03u", v5->uPortraitID);
   v9 = 0;
   pDialogueNPCPortraits[0] = &pIcons_LOD->pTextures[pIcons_LOD->LoadTexture(pContainer, TEXTURE_16BIT_PALETTE)];
   dword_591084 = areWeLoadingTexture;
diff -r f9a33f75bae3 -r 2d5d13376e91 Allocator.cpp
--- a/Allocator.cpp	Mon Oct 29 00:41:51 2012 +0200
+++ b/Allocator.cpp	Mon Oct 29 00:49:33 2012 +0200
@@ -231,7 +231,7 @@
   v2 = this;
   v3 = this->uDumpsCount;
   this->uDumpsCount = v3 + 1;
-  sprintfex(Filename, "Mem%03i.txt", v3);
+  sprintf(Filename, "Mem%03i.txt", v3);
   v4 = fopen(Filename, "w");
   v5 = v4;
   if ( v4 )
diff -r f9a33f75bae3 -r 2d5d13376e91 AudioPlayer.cpp
--- a/AudioPlayer.cpp	Mon Oct 29 00:41:51 2012 +0200
+++ b/AudioPlayer.cpp	Mon Oct 29 00:49:33 2012 +0200
@@ -468,7 +468,7 @@
     memcpy(&v19, texture_frame_table_txt_parser(&Buf, &v18), sizeof(v19));
     if ( v19.field_0 && *v19.pProperties[0] != 47 )
     {
-      sprintfex(v2->pSounds[v2->uNumSounds].pSoundName, "%s", v19.pProperties[0]);
+      sprintf(v2->pSounds[v2->uNumSounds].pSoundName, "%s", v19.pProperties[0]);
       v9 = atoi(v19.pProperties[1]);
       v10 = v19.pProperties[2];
       v2->pSounds[v2->uNumSounds].uSoundID = v9;
diff -r f9a33f75bae3 -r 2d5d13376e91 GUIWindow.cpp
--- a/GUIWindow.cpp	Mon Oct 29 00:41:51 2012 +0200
+++ b/GUIWindow.cpp	Mon Oct 29 00:49:33 2012 +0200
@@ -1117,9 +1117,9 @@
     *(&pTexture_pagemask + v0) = &pIcons_LOD->pTextures[pIcons_LOD->LoadTexture(
                                                          (const char *)pLloydsBeacons_SomeYs[v0 + 4],
                                                          TEXTURE_16BIT_PALETTE)];
-    sprintfex(pTmpBuf, "tab%da", v0);
+    sprintf(pTmpBuf, "tab%da", v0);
     *(v1 - 1) = &pIcons_LOD->pTextures[pIcons_LOD->LoadTexture(pTmpBuf, TEXTURE_16BIT_PALETTE)];
-    sprintfex(pTmpBuf, "tab%db", v0++);
+    sprintf(pTmpBuf, "tab%db", v0++);
     *v1 = &pIcons_LOD->pTextures[pIcons_LOD->LoadTexture(pTmpBuf, TEXTURE_16BIT_PALETTE)];
     v1 += 2;
   }
@@ -1154,7 +1154,7 @@
   v2 = uSlot;
   v7 = uPlayer;
   v3 = uSlot + 1;
-  sprintfex(pContainerName, "data\\lloyd%d%d.pcx", uPlayer, uSlot + 1);
+  sprintf(pContainerName, "data\\lloyd%d%d.pcx", uPlayer, uSlot + 1);
   v4 = fopen(pContainerName, "rb");
   if ( v4 )
   {
@@ -1163,7 +1163,7 @@
   }
   else
   {
-    sprintfex(pContainerName, "lloyd%d%d.pcx", v7, v3);
+    sprintf(pContainerName, "lloyd%d%d.pcx", v7, v3);
     v5 = pNew_LOD->FindContainer(pContainerName, 1);
     if ( v5 )
       pSavegameThumbnails[v2].LoadFromFILE(v5, 0, 0);
@@ -1436,7 +1436,7 @@
   }
   else
   {
-    sprintfex(
+    sprintf(
       pTmpBuf,
       pGlobalTXT_LocalizationStrings[429],
       //p2DEvents_minus1_::08[13 * (unsigned int)ptr_507BC0->ptr_1C],
@@ -1568,7 +1568,7 @@
     v8 = pGlobalTXT_LocalizationStrings[57];
     if ( v18 <= 1 )
       v8 = pGlobalTXT_LocalizationStrings[56];
-    sprintfex(pTmpBuf2, "%d %s ", v18, v8);
+    sprintf(pTmpBuf2, "%d %s ", v18, v8);
     strcat(pTmpBuf, pTmpBuf2);
   }
   if ( v7 )
@@ -1577,7 +1577,7 @@
       v9 = pGlobalTXT_LocalizationStrings[109];
     else
       v9 = pGlobalTXT_LocalizationStrings[110];
-    sprintfex(pTmpBuf2, "%d %s ", v7, v9);
+    sprintf(pTmpBuf2, "%d %s ", v7, v9);
     strcat(pTmpBuf, pTmpBuf2);
   }
   if ( v16 && !v18 )
@@ -1586,7 +1586,7 @@
       v10 = pGlobalTXT_LocalizationStrings[437];
     else
       v10 = pGlobalTXT_LocalizationStrings[436];
-    sprintfex(pTmpBuf2, "%d %s ", v16, v10);
+    sprintf(pTmpBuf2, "%d %s ", v16, v10);
     strcat(pTmpBuf, pTmpBuf2);
   }
   if ( v17 && !v7 )
@@ -1595,7 +1595,7 @@
       v11 = pGlobalTXT_LocalizationStrings[439];
     else
       v11 = pGlobalTXT_LocalizationStrings[438];
-    sprintfex(pTmpBuf2, "%d %s ", v17, v11);
+    sprintf(pTmpBuf2, "%d %s ", v17, v11);
     strcat(pTmpBuf, pTmpBuf2);
   }
   v12 = GenerateColorAsCloseAsPossibleToR8G8B8InTargetFormat(0xFFu, 0xFFu, 0x9Bu);
@@ -2305,7 +2305,7 @@
                   0);
                 if ( v12->uFlags & 0x80 )
                 {
-                  sprintfex(pTmpBuf, pGlobalTXT_LocalizationStrings[408], v12->pName);
+                  sprintf(pTmpBuf, pGlobalTXT_LocalizationStrings[408], v12->pName);
                   pWindow->CreateButton(0x1E0u, v11 + 130, 0x8Cu, v11, 1, 0, 0x88u, 0x4Cu, 0, pTmpBuf, 0);
                 }
                 else
@@ -2432,7 +2432,7 @@
           v30 = v27;
           v29 = pGlobalTXT_LocalizationStrings[435];
         }
-        sprintfex(&byte_591180[100 * v26], v29, v30);
+        sprintf(&byte_591180[100 * v26], v29, v30);
         array_5913D8[v26 + 7] = (NPCData *)pWindow->CreateButton(
                                              *(&_4E5E50_transui_x + v26 + 6 * uNumDialogueNPCPortraits - 6),
                                              *(&_4E5EE0_transui_y + v26 + 6 * uNumDialogueNPCPortraits - 6),
diff -r f9a33f75bae3 -r 2d5d13376e91 GameUIs.cpp
--- a/GameUIs.cpp	Mon Oct 29 00:41:51 2012 +0200
+++ b/GameUIs.cpp	Mon Oct 29 00:49:33 2012 +0200
@@ -273,7 +273,7 @@
     v3 = v8;
     if ( !*v8 )
       v3 = "1.mm7";
-    sprintfex(pTmpBuf, "saves\\%s", v3);
+    sprintf(pTmpBuf, "saves\\%s", v3);
     if ( _access(pTmpBuf, 0) || _access(pTmpBuf, 6) )
     {
       v6 = pGlobalTXT_LocalizationStrings[72];
diff -r f9a33f75bae3 -r 2d5d13376e91 Items.cpp
--- a/Items.cpp	Mon Oct 29 00:41:51 2012 +0200
+++ b/Items.cpp	Mon Oct 29 00:49:33 2012 +0200
@@ -1752,11 +1752,11 @@
     v4 = item__getname_buffer;
     v10 = "%s";
 LABEL_10:
-    sprintfex(v4, v10, v11);
+    sprintf(v4, v10, v11);
     return v4;
   }
   v4 = item__getname_buffer;
-  sprintfex(item__getname_buffer, "%s", pItemsTable->pItems[v2].pName);
+  sprintf(item__getname_buffer, "%s", pItemsTable->pItems[v2].pName);
   if ( v1->uItemID == 601 )
   {
     v5 = v1->field_1A;
@@ -1802,7 +1802,7 @@
         || v7 == 67
         || v7 == 68 )
       {
-        sprintfex(
+        sprintf(
           item__getname_buffer,
           "%s %s",
           *(unsigned int *)&pItemsTable->pEnchantments[22].field_8[28 * v7 + 8],
diff -r f9a33f75bae3 -r 2d5d13376e91 LOD.cpp
--- a/LOD.cpp	Mon Oct 29 00:41:51 2012 +0200
+++ b/LOD.cpp	Mon Oct 29 00:49:33 2012 +0200
@@ -2416,7 +2416,7 @@
     File = FindContainer("pending", 0);
     if ( !File )
     {
-      sprintfex(Args, "Can't find %s!", pContainer);
+      sprintf(Args, "Can't find %s!", pContainer);
       Abortf(Args);
     }
   }
diff -r f9a33f75bae3 -r 2d5d13376e91 Render.cpp
--- a/Render.cpp	Mon Oct 29 00:41:51 2012 +0200
+++ b/Render.cpp	Mon Oct 29 00:49:33 2012 +0200
@@ -5112,8 +5112,8 @@
   signed int v15; // eax@11
   char v16; // zf@20
   int result; // eax@21
-  char v18; // [sp+Ch] [bp-ACh]@3
-  __int16 v19; // [sp+44h] [bp-74h]@3
+  char v18[58]; // [sp+Ch] [bp-ACh]@3
+ // __int16 v19; // [sp+44h] [bp-74h]@3
   char v20[48]; // [sp+48h] [bp-70h]@3
   char *v21; // [sp+78h] [bp-40h]@7
   char *v22; // [sp+7Ch] [bp-3Ch]@7
@@ -5153,7 +5153,7 @@
   memset(&v18, 0, 0x38u);
   v8 = Dst;
   v37 = 0;
-  v19 = 0;
+  *(_WORD *)&v18[56] = 0;
   Src = 10;
   v28 = 5;
   v29 = 1;
diff -r f9a33f75bae3 -r 2d5d13376e91 SaveLoad.cpp
--- a/SaveLoad.cpp	Mon Oct 29 00:41:51 2012 +0200
+++ b/SaveLoad.cpp	Mon Oct 29 00:49:33 2012 +0200
@@ -422,13 +422,13 @@
       {
         v39 = v69;
         v38 = (const char *)v70;
-        sprintfex(Str, "data\\lloyd%d%d.pcx", v70, v69);
+        sprintf(Str, "data\\lloyd%d%d.pcx", v70, v69);
         v8 = fopen(Str, "rb");
         if ( v8 )
         {
           v39 = v69;
           v38 = (const char *)v70;
-          sprintfex(Str, "lloyd%d%d.pcx", v70, v69);
+          sprintf(Str, "lloyd%d%d.pcx", v70, v69);
           fseek(v8, 0, 2);
           pDir.uDataSize = ftell(v8);
           rewind(v8);
@@ -439,7 +439,7 @@
           if ( pNew_LOD->Write(&pDir, DstBuf, 0) )
           {
             v39 = 207;
-            sprintfex(Str, pGlobalTXT_LocalizationStrings[612], 207);
+            sprintf(Str, pGlobalTXT_LocalizationStrings[612], 207);
           MessageBoxA(nullptr, Str, "E:\\WORK\\MSDEV\\MM7\\MM7\\Code\\LoadSave.cpp:857", 0);
             Size = 5080748;
           }
diff -r f9a33f75bae3 -r 2d5d13376e91 VideoPlayer.cpp
--- a/VideoPlayer.cpp	Mon Oct 29 00:41:51 2012 +0200
+++ b/VideoPlayer.cpp	Mon Oct 29 00:49:33 2012 +0200
@@ -919,7 +919,7 @@
       SetFilePointer(hMightVid, pMightVideoHeaders[i].uFileOffset, 0, FILE_BEGIN);
 
       if (uBinkVersion < 0x0003000000000000)
-        return BinkOpen(hMightVid, 0x08800000);
+        return BinkOpen(hMightVid, 0x8800000);
       else
         return BinkOpen(hMightVid, 0x82000000);
     }
@@ -930,7 +930,7 @@
       SetFilePointer(hMagicVid, pMagicVideoHeaders[i].uFileOffset, 0, FILE_BEGIN);
 
       if (uBinkVersion < 0x0003000000000000)
-        return BinkOpen(hMagicVid, 0x08800000);
+        return BinkOpen(hMagicVid, 0x8800000);
       else
         return BinkOpen(hMagicVid, 0x82000000);
     }
diff -r f9a33f75bae3 -r 2d5d13376e91 Weather.cpp
--- a/Weather.cpp	Mon Oct 29 00:41:51 2012 +0200
+++ b/Weather.cpp	Mon Oct 29 00:49:33 2012 +0200
@@ -9,7 +9,7 @@
 
 
 
-struct Weather *pWeather;
+struct Weather *pWeather = new Weather;
 
 
 
diff -r f9a33f75bae3 -r 2d5d13376e91 mm7_1.cpp
--- a/mm7_1.cpp	Mon Oct 29 00:41:51 2012 +0200
+++ b/mm7_1.cpp	Mon Oct 29 00:49:33 2012 +0200
@@ -212,7 +212,7 @@
   v4 = v79;
   if ( !pPlayer->uSkillPoints )
     v4 = 65535;
-  sprintfex(
+  sprintf(
     pTmpBuf,
     "%s ",
     pGlobalTXT_LocalizationStrings[206],        // Skills for
@@ -223,7 +223,7 @@
     pPlayer->uSkillPoints);
   pGUIWindow_CurrentMenu->DrawText(pFontArrus, 24, 18, 0, pTmpBuf, 0, 0, 0);
   v5 = 2 * LOBYTE(pFontLucida->uFontHeight) + 13;// Weapons,   Level
-  sprintfex(pTmpBuf, "%s\r400%s", pGlobalTXT_LocalizationStrings[242], pGlobalTXT_LocalizationStrings[131]);
+  sprintf(pTmpBuf, "%s\r400%s", pGlobalTXT_LocalizationStrings[242], pGlobalTXT_LocalizationStrings[131]);
   pGUIWindow_CurrentMenu->DrawText(pFontArrus, 24, v5, a5, pTmpBuf, 0, 0, 0);
   v6 = pGUIWindow_CurrentMenu;
   v70 = 0;
@@ -285,7 +285,7 @@
       {
         if ( !(v87 & 0xC0) )
         {
-          sprintfex(pTmpBuf, "%s\r400%2d", pSkillNames[v62], uY);
+          sprintf(pTmpBuf, "%s\r400%2d", pSkillNames[v62], uY);
           goto LABEL_28;
         }
         v16 = pGlobalTXT_LocalizationStrings[432];
@@ -298,7 +298,7 @@
         v50 = v58;
         v46 = v88;
       }
-      sprintfex(pTmpBuf, "%s ", pSkillNames[v62], v15, v46, v50, v54);
+      sprintf(pTmpBuf, "%s ", pSkillNames[v62], v15, v46, v50, v54);
 LABEL_28:
       pGUIWindow_CurrentMenu->DrawText(pFontLucida, 24, v5, v58, pTmpBuf, 0, 0, 0);
       v6 = pGUIWindow_CurrentMenu;
@@ -312,7 +312,7 @@
     v6->DrawText(pFontLucida, 24, v5, 0, pGlobalTXT_LocalizationStrings[153], 0, 0, 0);
   }
   uYa = v5 + 2 * LOBYTE(pFontLucida->uFontHeight) - 10;
-  sprintfex(pTmpBuf, "%s\r400%s", pGlobalTXT_LocalizationStrings[138], pGlobalTXT_LocalizationStrings[131]);
+  sprintf(pTmpBuf, "%s\r400%s", pGlobalTXT_LocalizationStrings[138], pGlobalTXT_LocalizationStrings[131]);
   pGUIWindow_CurrentMenu->DrawText(pFontArrus, 24, uYa, a5, pTmpBuf, 0, 0, 0);
   v17 = pGUIWindow_CurrentMenu;
   v71 = 0;
@@ -370,7 +370,7 @@
       {
         if ( !(v21 & 0xC0) )
         {
-          sprintfex(pTmpBuf, "%s\r400%2d", pSkillNames[v63], v23);
+          sprintf(pTmpBuf, "%s\r400%2d", pSkillNames[v63], v23);
           goto LABEL_58;
         }
         v25 = (v21 & 0x80u) != 0;
@@ -384,7 +384,7 @@
         v51 = v59;
         v47 = v89;
       }
-      sprintfex(pTmpBuf, "%s ", pSkillNames[v63], v24, v47, v51, v55);
+      sprintf(pTmpBuf, "%s ", pSkillNames[v63], v24, v47, v51, v55);
 LABEL_58:
       pGUIWindow_CurrentMenu->DrawText(pFontLucida, 24, uYa, v59, pTmpBuf, 0, 0, 0);
       v17 = pGUIWindow_CurrentMenu;
@@ -405,7 +405,7 @@
       0,
       0);
   v27 = 2 * LOBYTE(pFontLucida->uFontHeight) + 13;
-  sprintfex(pTmpBuf, "%s\r177%s", pGlobalTXT_LocalizationStrings[11], pGlobalTXT_LocalizationStrings[131]);
+  sprintf(pTmpBuf, "%s\r177%s", pGlobalTXT_LocalizationStrings[11], pGlobalTXT_LocalizationStrings[131]);
   pGUIWindow_CurrentMenu->DrawText(pFontArrus, 248, v27, a5, pTmpBuf, 0, 0, 0);
   v28 = pGUIWindow_CurrentMenu;
   v72 = 0;
@@ -464,7 +464,7 @@
       {
         if ( !(v90 & 0xC0) )
         {
-          sprintfex(pTmpBuf, "%s\r177%2d", pSkillNames[v64], uYb);
+          sprintf(pTmpBuf, "%s\r177%2d", pSkillNames[v64], uYb);
           goto LABEL_88;
         }
         v35 = pGlobalTXT_LocalizationStrings[432];
@@ -477,7 +477,7 @@
         v52 = v60;
         v48 = v91;
       }
-      sprintfex(pTmpBuf, "%s ", pSkillNames[v64], v34, v48, v52, v56);
+      sprintf(pTmpBuf, "%s ", pSkillNames[v64], v34, v48, v52, v56);
 LABEL_88:
       pGUIWindow_CurrentMenu->DrawText(pFontLucida, 248, v27, v60, pTmpBuf, 0, 0, 0);
       v28 = pGUIWindow_CurrentMenu;
@@ -493,7 +493,7 @@
     v28->DrawText(pFontLucida, 248, v27, 0, pGlobalTXT_LocalizationStrings[153], 0, 0, 0);
   }
   uYc = v27 + 2 * LOBYTE(pFontLucida->uFontHeight) - 10;
-  sprintfex(pTmpBuf, "%s\r177%s", pGlobalTXT_LocalizationStrings[143], pGlobalTXT_LocalizationStrings[131]);
+  sprintf(pTmpBuf, "%s\r177%s", pGlobalTXT_LocalizationStrings[143], pGlobalTXT_LocalizationStrings[131]);
   pGUIWindow_CurrentMenu->DrawText(pFontArrus, 248, uYc, a5, pTmpBuf, 0, 0, 0);
   v36 = pGUIWindow_CurrentMenu;
   v73 = 0;
@@ -552,7 +552,7 @@
       {
         if ( !(v40 & 0xC0) )
         {
-          sprintfex(pTmpBuf, "%s\r177%2d", pSkillNames[v65], v42);
+          sprintf(pTmpBuf, "%s\r177%2d", pSkillNames[v65], v42);
           goto LABEL_118;
         }
         v25 = (v40 & 0x80u) != 0;
@@ -566,7 +566,7 @@
         v53 = v61;
         v49 = v92;
       }
-      sprintfex(pTmpBuf, "%s ", pSkillNames[v65], v43, v49, v53, v57);
+      sprintf(pTmpBuf, "%s ", pSkillNames[v65], v43, v49, v53, v57);
 LABEL_118:
       LOBYTE(v38) = pGUIWindow_CurrentMenu->DrawText(pFontLucida, 248, uYc, v61, pTmpBuf, 0, 0, 0);
       v36 = pGUIWindow_CurrentMenu;
@@ -619,8 +619,8 @@
   v2 = GenerateColorAsCloseAsPossibleToR8G8B8InTargetFormat(0xFFu, 0xFFu, 0x9Bu);
   v3 = pIcons_LOD->LoadTexture("fr_award", TEXTURE_16BIT_PALETTE);
   pRenderer->DrawTextureIndexed(8u, 8u, (Texture *)(v3 != -1 ? (int)&pIcons_LOD->pTextures[v3] : 0));
-  sprintfex(pTmpBuf, "%s ", pGlobalTXT_LocalizationStrings[23], v2);// TODO check args
-  sprintfex(
+  sprintf(pTmpBuf, "%s ", pGlobalTXT_LocalizationStrings[23], v2);// TODO check args
+  sprintf(
     Source,
     pGlobalTXT_LocalizationStrings[429],
     &stru_AA1058[3].pSounds[6972 * v1 + 40720],
@@ -680,7 +680,7 @@
         break;
       v17 = pParty->uFine;
 LABEL_42:
-      sprintfex(pTmpBuf, v6, v17);
+      sprintf(pTmpBuf, v6, v17);
       v6 = pTmpBuf;
 LABEL_43:
       v14 = dword_723E84[v20 / 4];
@@ -1024,7 +1024,7 @@
         60,
         v0);
     v3 = pPlayer->GetActualLevel();
-    sprintfex(pTmpBuf, "%lu", v3);
+    sprintf(pTmpBuf, "%lu", v3);
     v4 = pPlayer->GetBaseLevel();
     if ( pPlayer->GetActualLevel() <= v4 )
       v5 = pPlayer->GetExperienceDisplayColor();
@@ -1052,7 +1052,7 @@
         pGlobalTXT_LocalizationStrings[107],
         60,
         v0);
-    sprintfex(pTmpBuf, "%d", pPlayer->sHealth);
+    sprintf(pTmpBuf, "%d", pPlayer->sHealth);
     v8 = pPlayer->GetMaxHealth();
     v9 = UI_GetHealthManaStringColor(pPlayer->sHealth, v8);
     pGUIWindow_CurrentMenu->DrawTextInRect(pFontArrus, v44, v7, v9, pTmpBuf, 84, v0);
@@ -1066,7 +1066,7 @@
         pGlobalTXT_LocalizationStrings[209],
         60,
         v0);
-    sprintfex(pTmpBuf, "%d", pPlayer->sMana);
+    sprintf(pTmpBuf, "%d", pPlayer->sMana);
     v11 = pPlayer->GetMaxMana();
     v12 = UI_GetHealthManaStringColor(pPlayer->sMana, v11);
     pGUIWindow_CurrentMenu->DrawTextInRect(pFontArrus, v44, v10, v12, pTmpBuf, 84, v0);
@@ -1081,7 +1081,7 @@
         60,
         v0);
     v14 = pPlayer->GetActualAC();
-    sprintfex(pTmpBuf, "%d", v14);
+    sprintf(pTmpBuf, "%d", v14);
     v15 = v0;
     v16 = pPlayer->GetBaseAC();
     v17 = pPlayer->GetActualAC();
@@ -1099,7 +1099,7 @@
         60,
         0);
     v20 = pPlayer->GetActualAttack(0);
-    sprintfex(pTmpBuf, "%+d", v20);
+    sprintf(pTmpBuf, "%+d", v20);
     pGUIWindow_CurrentMenu->DrawTextInRect(pFontArrus, v44, v19, 0, pTmpBuf, 84, 0);
     v21 = v45 + v19;
     if ( !v43 )
@@ -1124,7 +1124,7 @@
         60,
         0);
     v24 = pPlayer->GetRangedAttack();
-    sprintfex(pTmpBuf, "%+d", v24);
+    sprintf(pTmpBuf, "%+d", v24);
     pGUIWindow_CurrentMenu->DrawTextInRect(pFontArrus, v44, v23, 0, pTmpBuf, 84, 0);
     v25 = v45 + v23;
     if ( !v43 )
@@ -1159,7 +1159,7 @@
       --v30;
     }
     while ( v30 );
-    sprintfex(pTmpBuf, "%lu", v28);
+    sprintf(pTmpBuf, "%lu", v28);
     pGUIWindow_CurrentMenu->DrawTextInRect(pFontArrus, v44, v27, 0, pTmpBuf, 84, 0);
     v31 = v45 + v27;
     if ( !v43 )
@@ -1171,7 +1171,7 @@
         pGlobalTXT_LocalizationStrings[168],
         60,
         0);
-    sprintfex(pTmpBuf, "%lu", pPlayer->uSkillPoints);
+    sprintf(pTmpBuf, "%lu", pPlayer->uSkillPoints);
     pGUIWindow_CurrentMenu->DrawTextInRect(
       pFontArrus,
       v44,
@@ -1225,10 +1225,10 @@
     v39 = v46;
   }
   v40 = GetReputationString(v38);
-  sprintfex(pTmpBuf, "%s: ", pGlobalTXT_LocalizationStrings[180], v39, v40);
+  sprintf(pTmpBuf, "%s: ", pGlobalTXT_LocalizationStrings[180], v39, v40);
   pGUIWindow_CurrentMenu->DrawText(pFontArrus, 22, 323, 0, pTmpBuf, 0, 0, 0);
   v41 = pParty->GetPartyFame();
-  sprintfex(pTmpBuf, "\r261%s: %d", pGlobalTXT_LocalizationStrings[84], v41);// Fame
+  sprintf(pTmpBuf, "\r261%s: %d", pGlobalTXT_LocalizationStrings[84], v41);// Fame
   return pGUIWindow_CurrentMenu->DrawText(pFontArrus, 0, 323, 0, pTmpBuf, 0, 0, 0);
 }
 
@@ -2380,7 +2380,7 @@
     v10 = pGlobalTXT_LocalizationStrings[57];   // Days
     if ( v19 <= 1 )
       v10 = pGlobalTXT_LocalizationStrings[56]; // Day
-    sprintfex(pTmpBuf2, "%d %s ", v19, v10);
+    sprintf(pTmpBuf2, "%d %s ", v19, v10);
     strcat(pTmpBuf, pTmpBuf2);
   }
   if ( v9 )
@@ -2389,7 +2389,7 @@
       v11 = pGlobalTXT_LocalizationStrings[109];// Hour
     else
       v11 = pGlobalTXT_LocalizationStrings[110];// Hours
-    sprintfex(pTmpBuf2, "%d %s ", v9, v11);
+    sprintf(pTmpBuf2, "%d %s ", v9, v11);
     strcat(pTmpBuf, pTmpBuf2);
   }
   if ( v17 && !v19 )
@@ -2398,7 +2398,7 @@
       v12 = pGlobalTXT_LocalizationStrings[437];// Minute
     else
       v12 = pGlobalTXT_LocalizationStrings[436];// Minutes
-    sprintfex(pTmpBuf2, "%d %s ", v17, v12);
+    sprintf(pTmpBuf2, "%d %s ", v17, v12);
     strcat(pTmpBuf, pTmpBuf2);
   }
   if ( v18 && !v9 )
@@ -2407,7 +2407,7 @@
       v13 = pGlobalTXT_LocalizationStrings[439];// Second
     else
       v13 = pGlobalTXT_LocalizationStrings[438];// Seconds
-    sprintfex(pTmpBuf2, "%d %s ", v18, v13);
+    sprintf(pTmpBuf2, "%d %s ", v18, v13);
     strcat(pTmpBuf, pTmpBuf2);
   }
   return a1->DrawText(a2, 32, uY, 0, pTmpBuf, 0, 0, 0);
@@ -2646,7 +2646,7 @@
       v79.DrawText2(pFontArrus, 0x64u, ((signed int)v79.uFrameHeight >> 1) - v18, v19, v52, v57);
       goto LABEL_116;
     }
-    sprintfex(a1, pGlobalTXT_LocalizationStrings[463], *((int *)v3 + 2));
+    sprintf(a1, pGlobalTXT_LocalizationStrings[463], *((int *)v3 + 2));
     strcpy(Dest, "");
     strcpy(v64, "");
     v20 = v3[28];
@@ -2668,7 +2668,7 @@
           {
             v21 = v3[30];
             if ( v21 )
-              sprintfex(
+              sprintf(
                 Dest,
                 "%s: +%d",
                 pGlobalTXT_LocalizationStrings[11],
@@ -2683,11 +2683,11 @@
       v45 = (unsigned __int8)v3[32];
       v43 = pGlobalTXT_LocalizationStrings[203];
     }
-    sprintfex(Dest, "%s: +%d   %s: %dd%d", v43, v45, v48, v53, v58);
+    sprintf(Dest, "%s: +%d   %s: %dd%d", v43, v45, v48, v53, v58);
     v22 = v3[32];
     if ( v22 )
     {
-      sprintfex(Source, " +%d", (unsigned __int8)v22);
+      sprintf(Source, " +%d", (unsigned __int8)v22);
       strcat(Dest, Source);
     }
 LABEL_50:
@@ -2784,7 +2784,7 @@
       v79.uFrameX -= 12;
       if ( v77 )
       {
-        sprintfex(pTmpBuf, "%s: %lu", pGlobalTXT_LocalizationStrings[465], v77);
+        sprintf(pTmpBuf, "%s: %lu", pGlobalTXT_LocalizationStrings[465], v77);
         v40 = v82;
         v61 = 0;
         v56 = 0;
@@ -2803,22 +2803,22 @@
           Str = (char *)(v72 - 1168);
           if ( v72 != 1168 )
           {
-            sprintfex(v65, " %d:yr", v72 - 1168);
+            sprintf(v65, " %d:yr", v72 - 1168);
             strcat(pTmpBuf, v65);
           }
-          if ( (((v71 || Str) && ((sprintfex(v65, " %d:mo", v71), strcat(pTmpBuf, v65), v71) || Str) || v70)
-             && ((sprintfex(v65, " %d:dy", v70), strcat(pTmpBuf, v65), v71) || Str || v70)
+          if ( (((v71 || Str) && ((sprintf(v65, " %d:mo", v71), strcat(pTmpBuf, v65), v71) || Str) || v70)
+             && ((sprintf(v65, " %d:dy", v70), strcat(pTmpBuf, v65), v71) || Str || v70)
              || v69)
-            && ((sprintfex(v65, " %d:hr", v69), strcat(pTmpBuf, v65), v71) || Str || v70 || v69)
+            && ((sprintf(v65, " %d:hr", v69), strcat(pTmpBuf, v65), v71) || Str || v70 || v69)
             || v68 )
           {
-            sprintfex(v65, " %d:mn", v68);
+            sprintf(v65, " %d:mn", v68);
             strcat(pTmpBuf, v65);
           }
           v79.DrawText(v82, 100, v79.uFrameHeight - 2 * LOBYTE(v82->uFontHeight), 0, pTmpBuf, 0, 0, 0);
         }
         v37 = _this->GetValue();
-        sprintfex(pTmpBuf, "%s: %lu", pGlobalTXT_LocalizationStrings[465], v37);
+        sprintf(pTmpBuf, "%s: %lu", pGlobalTXT_LocalizationStrings[465], v37);
         v79.DrawText(v82, 100, v79.uFrameHeight - LOBYTE(v82->uFontHeight), 0, pTmpBuf, 0, 0, 0);
         v38 = _this->uAttributes;
         if ( BYTE1(v38) & 1 )
@@ -2862,7 +2862,7 @@
       v54 = pGlobalTXT_LocalizationStrings[449];
       v49 = "%s: %d";
 LABEL_64:
-      sprintfex(v64, v49, v54, v59);
+      sprintf(v64, v49, v54, v59);
       goto LABEL_65;
     }
     v25 = _this->_bonus_type;
@@ -2892,7 +2892,7 @@
       v50 = pGlobalTXT_LocalizationStrings[210];
       v46 = "%s: %s";
     }
-    sprintfex(v64, v46, v50, v55, v60);
+    sprintf(v64, v46, v50, v55, v60);
     goto LABEL_65;
   }
 }
@@ -3283,7 +3283,7 @@
     v37 = v112[6];
     if ( v37 )
     {
-      sprintfex(pTmpBuf, pGlobalTXT_LocalizationStrings[429], *v112, aNPCProfessionNames[(signed int)v37]);
+      sprintf(pTmpBuf, pGlobalTXT_LocalizationStrings[429], *v112, aNPCProfessionNames[(signed int)v37]);
       goto LABEL_59;
     }
     v77 = 2000;
@@ -3540,7 +3540,7 @@
   a4 = (char *)v106.uViewportY;
   if ( v119 )
   {
-    sprintfex(pTmpBuf, "%s", pGlobalTXT_LocalizationStrings[108], 0, v121->pMonsterInfo.uHP);
+    sprintf(pTmpBuf, "%s", pGlobalTXT_LocalizationStrings[108], 0, v121->pMonsterInfo.uHP);
     a1->DrawText(v56, 150, (int)a4, a5, pTmpBuf, 0, 0, 0);
     a4 = &a4[LOBYTE(v56->uFontHeight) - 3];
     v79 = v121->pMonsterInfo.uAC;
@@ -3550,7 +3550,7 @@
   }
   else
   {
-    sprintfex(pTmpBuf, "%s", pGlobalTXT_LocalizationStrings[108], 0, pGlobalTXT_LocalizationStrings[630]);
+    sprintf(pTmpBuf, "%s", pGlobalTXT_LocalizationStrings[108], 0, pGlobalTXT_LocalizationStrings[630]);
     a1->DrawText(v56, 150, (int)a4, a5, pTmpBuf, 0, 0, 0);
     v79 = (unsigned int)pGlobalTXT_LocalizationStrings[630];
     v75 = 0;
@@ -3558,7 +3558,7 @@
     a4 = &a4[LOBYTE(v56->uFontHeight) - 3];
     v67 = "%s";
   }
-  sprintfex(pTmpBuf, v67, v70, v75, v79);
+  sprintf(pTmpBuf, v67, v70, v75, v79);
   a1->DrawText(v56, 150, (int)a4, a5, pTmpBuf, 0, 0, 0);
   a4 = &a4[LOBYTE(v56->uFontHeight) - 6] + LOBYTE(v56->uFontHeight);
   v95 = pGlobalTXT_LocalizationStrings[87];
@@ -3574,12 +3574,12 @@
   v105 = pGlobalTXT_LocalizationStrings[54];
   if ( v116 )
   {
-    sprintfex(pTmpBuf, "%s", pGlobalTXT_LocalizationStrings[18], 0, (&v95)[4 * v121->pMonsterInfo.uAttack1Type]);
+    sprintf(pTmpBuf, "%s", pGlobalTXT_LocalizationStrings[18], 0, (&v95)[4 * v121->pMonsterInfo.uAttack1Type]);
     a1->DrawText(v56, 150, (int)a4, a5, pTmpBuf, 0, 0, 0);
     a4 = &a4[LOBYTE(v56->uFontHeight) - 3];
     v57 = v121->pMonsterInfo.uAttack1DamageBonus;
     if ( v57 )
-      sprintfex(
+      sprintf(
         pTmpBuf,
         "%s",
         pGlobalTXT_LocalizationStrings[53],
@@ -3588,7 +3588,7 @@
         v121->pMonsterInfo.uAttack1DamageDiceSides,
         v57);
     else
-      sprintfex(
+      sprintf(
         pTmpBuf,
         "%s",
         pGlobalTXT_LocalizationStrings[53],
@@ -3598,10 +3598,10 @@
   }
   else
   {
-    sprintfex(pTmpBuf, "%s", pGlobalTXT_LocalizationStrings[18], 0, pGlobalTXT_LocalizationStrings[630]);
+    sprintf(pTmpBuf, "%s", pGlobalTXT_LocalizationStrings[18], 0, pGlobalTXT_LocalizationStrings[630]);
     a1->DrawText(v56, 150, (int)a4, a5, pTmpBuf, 0, 0, 0);
     a4 = &a4[LOBYTE(v56->uFontHeight) - 3];
-    sprintfex(pTmpBuf, "%s", pGlobalTXT_LocalizationStrings[53], 0, pGlobalTXT_LocalizationStrings[630]);
+    sprintf(pTmpBuf, "%s", pGlobalTXT_LocalizationStrings[53], 0, pGlobalTXT_LocalizationStrings[630]);
   }
   a1->DrawText(v56, 150, (int)a4, a5, pTmpBuf, 0, 0, 0);
   v58 = LOBYTE(v56->uFontHeight);
@@ -3621,7 +3621,7 @@
     v120 = (SpellBuff *)pGlobalTXT_LocalizationStrings[629];
   if ( v114 )
   {
-    sprintfex(pTmpBuf, "%s", v120, 0, pSpellStats->pInfos[v114].pShortName);
+    sprintf(pTmpBuf, "%s", v120, 0, pSpellStats->pInfos[v114].pShortName);
     a1->DrawText(v56, 150, (int)a4, a5, pTmpBuf, 0, 0, 0);
     v58 = LOBYTE(v56->uFontHeight);
     a4 = &a4[v58 - 3];
@@ -3632,7 +3632,7 @@
   {
     __debugbreak();
     const char *fmt = "\xC\x25\x30\x35\x75\x9\x30\x36\x30\x25\x73\n";
-    sprintfex(pTmpBuf, fmt, 0, pSpellStats->pInfos[v60].pShortName);
+    sprintf(pTmpBuf, fmt, 0, pSpellStats->pInfos[v60].pShortName);
     a1->DrawText(v56, 150, (int)a4, a5, pTmpBuf, 0, 0, 0);
     v58 = LOBYTE(v56->uFontHeight);
     a4 = &a4[v58 - 3];
@@ -3645,7 +3645,7 @@
     v71 = pGlobalTXT_LocalizationStrings[628];
     v68 = "%s";
 LABEL_144:
-    sprintfex(pTmpBuf, v68, v71, v76, v80);
+    sprintf(pTmpBuf, v68, v71, v76, v80);
     a1->DrawText(v56, 150, (int)a4, a5, pTmpBuf, 0, 0, 0);
     v58 = LOBYTE(v56->uFontHeight);
     a4 = &a4[v58 - 3];
@@ -3691,7 +3691,7 @@
         else
           v81 = pGlobalTXT_LocalizationStrings[153];
       }
-      sprintfex(pTmpBuf, "%s", (&v85)[v124], 0, v81);
+      sprintf(pTmpBuf, "%s", (&v85)[v124], 0, v81);
       a1->DrawText(v56, 170, (int)a4, a5, pTmpBuf, 0, 0, 0);
       v63 = LOBYTE(v56->uFontHeight);
       v124 += 4;
@@ -3705,7 +3705,7 @@
     i = 0;
     do
     {
-      sprintfex(pTmpBuf, "%s", (&v85)[4 * i], 0, pGlobalTXT_LocalizationStrings[630]);
+      sprintf(pTmpBuf, "%s", (&v85)[4 * i], 0, pGlobalTXT_LocalizationStrings[630]);
       a1->DrawText(v56, 170, (int)a4, a5, pTmpBuf, 0, 0, 0);
       v65 = LOBYTE(v56->uFontHeight);
       ++i;
@@ -3716,7 +3716,7 @@
   }
   if ( (signed __int64)pParty->pPartyBuffs[3].uExpireTime > 0 )
   {
-    sprintfex(pTmpBuf, "%s: %d", pGlobalTXT_LocalizationStrings[650], v121->sCurrentHP);
+    sprintf(pTmpBuf, "%s: %d", pGlobalTXT_LocalizationStrings[650], v121->sCurrentHP);
     pFontSmallnum->GetLineWidth(pTmpBuf);
     result = a1->DrawText2(
                pFontSmallnum,
@@ -3739,7 +3739,7 @@
   if ( pTexture_RestUI_CurrentHourglassFrame )
     pTexture_RestUI_CurrentHourglassFrame->Release();
   pIcons_LOD->_40F9C5();
-  sprintfex(pTmpBuf, "TERRA%03d", pParty->uCurrentMinute / 6 + 10 * pParty->uCurrentHour);
+  sprintf(pTmpBuf, "TERRA%03d", pParty->uCurrentMinute / 6 + 10 * pParty->uCurrentHour);
   pTexture_RestUI_CurrentSkyFrame = &pIcons_LOD->pTextures[pIcons_LOD->LoadTexture(pTmpBuf, TEXTURE_16BIT_PALETTE)];
 }
 
@@ -3985,7 +3985,7 @@
       v4 = 1;
       byte_4E2BC8 = 1;
     }
-    sprintfex(pTmpBuf, "hglas%03d", (unsigned __int8)v4);
+    sprintf(pTmpBuf, "hglas%03d", (unsigned __int8)v4);
     pTexture_RestUI_CurrentHourglassFrame = &pIcons_LOD->pTextures[pIcons_LOD->LoadTexture(pTmpBuf, TEXTURE_16BIT_PALETTE)];
     pRenderer->DrawTextureIndexed(0x10Bu, 0x9Fu, pTexture_RestUI_CurrentHourglassFrame);
     memset(&Dst, 0, 0xBCu);
@@ -3998,7 +3998,7 @@
     Dst.pParent = pButton_RestUI_WaitUntilDawn->pParent;
     Dst.DrawLabel(pGlobalTXT_LocalizationStrings[183], pFontCreate, a5, *(int **)a9);
     Dst.pParent = 0;
-    sprintfex(pTmpBuf, "\r408%d", uRestUI_FoodRequiredToRest);
+    sprintf(pTmpBuf, "\r408%d", uRestUI_FoodRequiredToRest);
     pGUIWindow_CurrentMenu->DrawText(pFontCreate, 0, 164, a5, pTmpBuf, 0, 0, *(unsigned int *)a9);
     pButton_RestUI_WaitUntilDawn->DrawLabel(
       pGlobalTXT_LocalizationStrings[237],
@@ -4019,13 +4019,13 @@
     Dst.DrawLabel(pGlobalTXT_LocalizationStrings[236], pFontCreate, a5, *(int **)a9);
     Dst.pParent = 0;
     v5 = pParty->uCurrentHour >= 0xC && pParty->uCurrentHour < 0x18;
-    sprintfex(pTmpBuf, "%d:%02d %s", v10, pParty->uCurrentMinute, aAMPMNames[v5]);
+    sprintf(pTmpBuf, "%d:%02d %s", v10, pParty->uCurrentMinute, aAMPMNames[v5]);
     pGUIWindow_CurrentMenu->DrawText(pFontCreate, 368, 168, a5, pTmpBuf, 0, 0, *(unsigned int *)a9);
-    sprintfex(pTmpBuf, "%s\r190%d", pGlobalTXT_LocalizationStrings[56], pParty->uDaysPlayed + 1);
+    sprintf(pTmpBuf, "%s\r190%d", pGlobalTXT_LocalizationStrings[56], pParty->uDaysPlayed + 1);
     pGUIWindow_CurrentMenu->DrawText(pFontCreate, 350, 190, a5, pTmpBuf, 0, 0, *(unsigned int *)a9);
-    sprintfex(pTmpBuf, "%s\r190%d", pGlobalTXT_LocalizationStrings[146], pParty->uCurrentMonth + 1);
+    sprintf(pTmpBuf, "%s\r190%d", pGlobalTXT_LocalizationStrings[146], pParty->uCurrentMonth + 1);
     pGUIWindow_CurrentMenu->DrawText(pFontCreate, 350, 222, a5, pTmpBuf, 0, 0, *(unsigned int *)a9);
-    sprintfex(pTmpBuf, "%s\r190%d", pGlobalTXT_LocalizationStrings[245], pParty->uCurrentYear);
+    sprintf(pTmpBuf, "%s\r190%d", pGlobalTXT_LocalizationStrings[245], pParty->uCurrentYear);
     pGUIWindow_CurrentMenu->DrawText(pFontCreate, 350, 254, a5, pTmpBuf, 0, 0, *(unsigned int *)a9);
     if ( dword_506F14 )
       Sleep6Hours();
@@ -4692,7 +4692,7 @@
   v18 = pChestSmthn2ByType[v4];
   v21 = pChestWidthsByType[v4];
   v19 = pChestHeightsByType[v4];
-  sprintfex(pTmpBuf, "chest%02d", pChestList->pChests[pChests[v3].uChestBitmapID].uTextureID);
+  sprintf(pTmpBuf, "chest%02d", pChestList->pChests[pChests[v3].uChestBitmapID].uTextureID);
   v5 = pIcons_LOD->LoadTexture(pTmpBuf, TEXTURE_16BIT_PALETTE);
   pRenderer->DrawTextureIndexed(8u, 8u, (Texture *)(v5 != -1 ? (int)&pIcons_LOD->pTextures[v5] : 0));
   v23 = 0;
@@ -4843,7 +4843,7 @@
   {
     if ( _1_dont_share_with_followers___2_the_same_but_without_a_message__else_normal == 1 )
     {
-      sprintfex(pTmpBuf2, pGlobalTXT_LocalizationStrings[467], uNumGold);// You found %lu gold!
+      sprintf(pTmpBuf2, pGlobalTXT_LocalizationStrings[467], uNumGold);// You found %lu gold!
     }
     else
     {
@@ -4912,11 +4912,11 @@
       v3 = (signed int)(v4 * v3 / 100) / 100;
       if ( v3 < 1 )
         v3 = 1;
-      sprintfex(pTmpBuf2, pGlobalTXT_LocalizationStrings[466], v4, v3);// You found %lu gold (followers take %lu)!
+      sprintf(pTmpBuf2, pGlobalTXT_LocalizationStrings[466], v4, v3);// You found %lu gold (followers take %lu)!
     }
     else
     {
-      sprintfex(pTmpBuf2, pGlobalTXT_LocalizationStrings[467], v4);// You found %lu gold!
+      sprintf(pTmpBuf2, pGlobalTXT_LocalizationStrings[467], v4);// You found %lu gold!
     }
     v2 = 0;
   }
@@ -5066,7 +5066,7 @@
       }
       v31 = pLayingItems[v30].stru_24.GetDisplayName();
       v28 = pTmpBuf;
-      sprintfex(pTmpBuf, pGlobalTXT_LocalizationStrings[470], v31);// "Get %s"
+      sprintf(pTmpBuf, pGlobalTXT_LocalizationStrings[470], v31);// "Get %s"
     }
     else
     {
@@ -5332,7 +5332,7 @@
                 v41 = v7;
                 v39 = pGlobalTXT_LocalizationStrings[468];// "Clicking here will spend %d Skill Points"
               }
-              sprintfex(Str1, v39, v41);
+              sprintf(Str1, v39, v41);
               v13 = Str1;
               goto _set_status_and_ret;
             }
@@ -5850,7 +5850,7 @@
       }
       else
       {
-        sprintfex(pTmpBuf2, pGlobalTXT_LocalizationStrings[471], pItemsTable->pItems[v23].pUnidentifiedName);
+        sprintf(pTmpBuf2, pGlobalTXT_LocalizationStrings[471], pItemsTable->pItems[v23].pUnidentifiedName);
         ShowStatusBarString(pTmpBuf2, 2u);
         if ( v22->uItemID == 506 )
           _449B7E_toggle_bit(pParty->_award_bits, 184, 1u);
diff -r f9a33f75bae3 -r 2d5d13376e91 mm7_4.cpp