Mercurial > mm7
diff mm7_2.cpp @ 350:77601b0fb14b
Merge
author | Nomad |
---|---|
date | Thu, 21 Feb 2013 02:13:46 +0200 |
parents | 672b83584b0f c067c5739e1f |
children | 5f36449527c6 |
line wrap: on
line diff
--- a/mm7_2.cpp Thu Feb 21 02:12:29 2013 +0200 +++ b/mm7_2.cpp Thu Feb 21 02:13:46 2013 +0200 @@ -491,10 +491,10 @@ unsigned int v71; // [sp-4h] [bp-278h]@75 const char *v72; // [sp-4h] [bp-278h]@93 unsigned int v73; // [sp-4h] [bp-278h]@99 - char Dest; // [sp+Ch] [bp-268h]@55 - char v75; // [sp+70h] [bp-204h]@59 - char a1; // [sp+D4h] [bp-1A0h]@57 - char v77; // [sp+138h] [bp-13Ch]@59 + char Dest[100]; // [sp+Ch] [bp-268h]@55 + char v75[100]; // [sp+70h] [bp-204h]@59 + char a1[100]; // [sp+D4h] [bp-1A0h]@57 + char v77[100]; // [sp+138h] [bp-13Ch]@59 GUIWindow v78; // [sp+19Ch] [bp-D8h]@99 GUIWindow v79; // [sp+1F0h] [bp-84h]@1 char *Str[2]; // [sp+244h] [bp-30h]@30 @@ -771,31 +771,31 @@ v28 = *(int *)v84; if ( pDialogueWindow->pCurrentPosActiveItem != 2 ) v28 = v81; - sprintf(&Dest, format_4E2DC8, v28); + sprintf(Dest, format_4E2DC8, v28); sprintf(pTmpBuf2, pGlobalTXT_LocalizationStrings[178], pOutString); - strcat(&Dest, pTmpBuf2); - v90 = pFontArrus->CalcTextHeight(&Dest, &v79, 0, 0); - strcat(&Dest, "\n \n"); + strcat(Dest, pTmpBuf2); + v90 = pFontArrus->CalcTextHeight(Dest, &v79, 0, 0); + strcat(Dest, "\n \n"); v29 = *(int *)v84; if ( pDialogueWindow->pCurrentPosActiveItem != 3 ) v29 = v81; - sprintf(&a1, format_4E2DC8, v29); + sprintf(a1, format_4E2DC8, v29); sprintf(pTmpBuf2, pGlobalTXT_LocalizationStrings[86], //(signed __int64)p2DEvents_minus1__20[13 * (unsigned int)ptr_507BC0->ptr_1C], (signed __int64)p2DEvents[(unsigned int)window_SpeakInHouse->ptr_1C - 1].fPriceMultiplier, v83); - strcat(&a1, pTmpBuf2); - v88 = pFontArrus->CalcTextHeight(&a1, &v79, 0, 0); - strcat(&a1, "\n \n"); + strcat(a1, pTmpBuf2); + v88 = pFontArrus->CalcTextHeight(a1, &v79, 0, 0); + strcat(a1, "\n \n"); v30 = *(int *)v84; if ( pDialogueWindow->pCurrentPosActiveItem != 4 ) v30 = v81; - sprintf(&v77, format_4E2DC8, v30); - strcat(&v77, pGlobalTXT_LocalizationStrings[160]); - v82 = pFontArrus->CalcTextHeight(&v77, &v79, 0, 0); - strcat(&v77, "\n \n"); - v75 = 0; + sprintf(v77, format_4E2DC8, v30); + strcat(v77, pGlobalTXT_LocalizationStrings[160]); + v82 = pFontArrus->CalcTextHeight(v77, &v79, 0, 0); + strcat(v77, "\n \n"); + v75[0] = 0; v87 = 0; v31 = (signed int)window_SpeakInHouse->ptr_1C; if ( v31 >= 108 && v31 <= 120 ) @@ -803,9 +803,9 @@ v32 = *(int *)v84; if ( pDialogueWindow->pCurrentPosActiveItem != 5 ) v32 = v81; - sprintf(&v75, format_4E2DC8, v32); - strcat(&v75, pGlobalTXT_LocalizationStrings[611]); - v87 = pFontArrus->CalcTextHeight(&v75, &v79, 0, 0); + sprintf(v75, format_4E2DC8, v32); + strcat(v75, pGlobalTXT_LocalizationStrings[611]); + v87 = pFontArrus->CalcTextHeight(v75, &v79, 0, 0); } v33 = pDialogueWindow; Str[1] = (char *)pDialogueWindow;