diff mm7_4.cpp @ 1393:28f87f5234a1

More hardcoded UI colors moved to varibables.
author Nomad
date Thu, 18 Jul 2013 16:11:57 +0200
parents cc9a3a24d61d
children c9e3b93ec570
line wrap: on
line diff
--- a/mm7_4.cpp	Thu Jul 18 14:43:06 2013 +0200
+++ b/mm7_4.cpp	Thu Jul 18 16:11:57 2013 +0200
@@ -2197,7 +2197,7 @@
           case 24:
           {
             v46 = a3->GetDisplayName();
-            sprintf(a1, format_4E2D80, v59, v46);
+            sprintfex(a1, format_4E2D80, v59, v46);
             v11 = a1;
             goto _continue_strcat;
           }
@@ -2271,7 +2271,7 @@
             }
           }
 _continue_sprintf:
-          sprintf(a1, "%lu", v29);
+          sprintfex(a1, "%lu", v29);
           v11 = a1;
           goto _continue_strcat;
         }
@@ -2306,7 +2306,7 @@
     v54 = v57.field_18_expire_year;
     v53 = v57.field_C_expire_day + 1;
     v50 = v57.field_14_exprie_month;
-    sprintf(a1, pGlobalTXT_LocalizationStrings[378], aMonthNames[v50], v53, v54);
+    sprintfex(a1, pGlobalTXT_LocalizationStrings[378], aMonthNames[v50], v53, v54);
     v11 = a1;
     goto _continue_strcat;
           }
@@ -2330,7 +2330,7 @@
             v54 = v56.field_18_expire_year;
             v53 = v56.field_C_expire_day + 1;
             v50 = v56.field_14_exprie_month;
-            sprintf(a1, pGlobalTXT_LocalizationStrings[378], aMonthNames[v50], v53, v54);
+            sprintfex(a1, pGlobalTXT_LocalizationStrings[378], aMonthNames[v50], v53, v54);
             v11 = a1;
             goto _continue_strcat;
         }
@@ -3059,50 +3059,10 @@
   a1.uFrameZ = a1.uFrameX + 107;
   a1.uFrameWidth = 108;
   a1.DrawTitleText(pFontComic, 0xCu, 0x4Bu, 0, pSkillNames[v11 / 4 + 12], 3u);
-  sprintf(pTmpBuf.data(), "%s\n%d", pGlobalTXT_LocalizationStrings[522], *(&pSpellDatas[0].uNormalLevelMana + 10 * v1));
+  sprintfex(pTmpBuf.data(), "%s\n%d", pGlobalTXT_LocalizationStrings[522], *(&pSpellDatas[0].uNormalLevelMana + 10 * v1));
   a1.DrawTitleText(pFontComic, 0xCu, a1.uFrameHeight - LOBYTE(pFontComic->uFontHeight) - 16, 0, pTmpBuf.data(), 3);
 }
 
-//----- (004B1784) --------------------------------------------------------
-bool __cdecl sub_4B1784_check_if_player_concious__draw_warning_else_mess_with_dlg_win()
-{
-  Player *pPlayer; // ebx@1
-  bool result; // eax@2
-  unsigned __int16 v2; // ST0C_2@3
-  int v3; // eax@3
-  GUIWindow v4; // [sp+4h] [bp-54h]@3
-
-  pPlayer = pPlayers[uActiveCharacter];
-  if ( pPlayer->CanAct() )
-  {
-    pDialogueWindow->pNumPresenceButton = dword_F8B1E0;
-    result = 1;
-  }
-  else
-  {
-    pDialogueWindow->pNumPresenceButton = 0;
-    memcpy(&v4, pPrimaryWindow, sizeof(v4));
-    v4.uFrameX = 483;
-    v4.uFrameWidth = 148;
-    v4.uFrameZ = 334;
-    sprintf(pTmpBuf.data(), pGlobalTXT_LocalizationStrings[427], pPlayer->pName, pGlobalTXT_LocalizationStrings[562]);// 
-                                                // "%s is in no condition to %s"
-                                                // "do anything"
-    v2 = TargetColor(255, 255, 0x9Bu);
-    v3 = pFontArrus->CalcTextHeight(pTmpBuf.data(), &v4, 0, 0);
-    v4.DrawTitleText(pFontArrus, 0, (212 - v3) / 2 + 101, v2, pTmpBuf.data(), 3u);
-    result = 0;
-  }
-  return result;
-}
-// F8B1E0: using guessed type int dword_F8B1E0;
-
-// F8B198: using guessed type int dword_F8B198;
-// F8B19C: using guessed type int dword_F8B19C;
-
-
-// 507B94: using guessed type int dword_507B94;
-
 //----- (004B1ECE) --------------------------------------------------------
 void __cdecl sub_4B1ECE()
 {