comparison mm7_2.cpp @ 350:77601b0fb14b

Merge
author Nomad
date Thu, 21 Feb 2013 02:13:46 +0200
parents 672b83584b0f c067c5739e1f
children 5f36449527c6
comparison
equal deleted inserted replaced
349:672b83584b0f 350:77601b0fb14b
489 char *v69; // [sp-8h] [bp-27Ch]@75 489 char *v69; // [sp-8h] [bp-27Ch]@75
490 int v70; // [sp-8h] [bp-27Ch]@99 490 int v70; // [sp-8h] [bp-27Ch]@99
491 unsigned int v71; // [sp-4h] [bp-278h]@75 491 unsigned int v71; // [sp-4h] [bp-278h]@75
492 const char *v72; // [sp-4h] [bp-278h]@93 492 const char *v72; // [sp-4h] [bp-278h]@93
493 unsigned int v73; // [sp-4h] [bp-278h]@99 493 unsigned int v73; // [sp-4h] [bp-278h]@99
494 char Dest; // [sp+Ch] [bp-268h]@55 494 char Dest[100]; // [sp+Ch] [bp-268h]@55
495 char v75; // [sp+70h] [bp-204h]@59 495 char v75[100]; // [sp+70h] [bp-204h]@59
496 char a1; // [sp+D4h] [bp-1A0h]@57 496 char a1[100]; // [sp+D4h] [bp-1A0h]@57
497 char v77; // [sp+138h] [bp-13Ch]@59 497 char v77[100]; // [sp+138h] [bp-13Ch]@59
498 GUIWindow v78; // [sp+19Ch] [bp-D8h]@99 498 GUIWindow v78; // [sp+19Ch] [bp-D8h]@99
499 GUIWindow v79; // [sp+1F0h] [bp-84h]@1 499 GUIWindow v79; // [sp+1F0h] [bp-84h]@1
500 char *Str[2]; // [sp+244h] [bp-30h]@30 500 char *Str[2]; // [sp+244h] [bp-30h]@30
501 unsigned int v81; // [sp+24Ch] [bp-28h]@1 501 unsigned int v81; // [sp+24Ch] [bp-28h]@1
502 unsigned __int8 v82; // [sp+253h] [bp-21h]@59 502 unsigned __int8 v82; // [sp+253h] [bp-21h]@59
769 if ( !sub_4B1784_check_if_player_concious__draw_warning_else_mess_with_dlg_win() ) 769 if ( !sub_4B1784_check_if_player_concious__draw_warning_else_mess_with_dlg_win() )
770 return; 770 return;
771 v28 = *(int *)v84; 771 v28 = *(int *)v84;
772 if ( pDialogueWindow->pCurrentPosActiveItem != 2 ) 772 if ( pDialogueWindow->pCurrentPosActiveItem != 2 )
773 v28 = v81; 773 v28 = v81;
774 sprintf(&Dest, format_4E2DC8, v28); 774 sprintf(Dest, format_4E2DC8, v28);
775 sprintf(pTmpBuf2, pGlobalTXT_LocalizationStrings[178], pOutString); 775 sprintf(pTmpBuf2, pGlobalTXT_LocalizationStrings[178], pOutString);
776 strcat(&Dest, pTmpBuf2); 776 strcat(Dest, pTmpBuf2);
777 v90 = pFontArrus->CalcTextHeight(&Dest, &v79, 0, 0); 777 v90 = pFontArrus->CalcTextHeight(Dest, &v79, 0, 0);
778 strcat(&Dest, "\n \n"); 778 strcat(Dest, "\n \n");
779 v29 = *(int *)v84; 779 v29 = *(int *)v84;
780 if ( pDialogueWindow->pCurrentPosActiveItem != 3 ) 780 if ( pDialogueWindow->pCurrentPosActiveItem != 3 )
781 v29 = v81; 781 v29 = v81;
782 sprintf(&a1, format_4E2DC8, v29); 782 sprintf(a1, format_4E2DC8, v29);
783 sprintf(pTmpBuf2, 783 sprintf(pTmpBuf2,
784 pGlobalTXT_LocalizationStrings[86], 784 pGlobalTXT_LocalizationStrings[86],
785 //(signed __int64)p2DEvents_minus1__20[13 * (unsigned int)ptr_507BC0->ptr_1C], 785 //(signed __int64)p2DEvents_minus1__20[13 * (unsigned int)ptr_507BC0->ptr_1C],
786 (signed __int64)p2DEvents[(unsigned int)window_SpeakInHouse->ptr_1C - 1].fPriceMultiplier, 786 (signed __int64)p2DEvents[(unsigned int)window_SpeakInHouse->ptr_1C - 1].fPriceMultiplier,
787 v83); 787 v83);
788 strcat(&a1, pTmpBuf2); 788 strcat(a1, pTmpBuf2);
789 v88 = pFontArrus->CalcTextHeight(&a1, &v79, 0, 0); 789 v88 = pFontArrus->CalcTextHeight(a1, &v79, 0, 0);
790 strcat(&a1, "\n \n"); 790 strcat(a1, "\n \n");
791 v30 = *(int *)v84; 791 v30 = *(int *)v84;
792 if ( pDialogueWindow->pCurrentPosActiveItem != 4 ) 792 if ( pDialogueWindow->pCurrentPosActiveItem != 4 )
793 v30 = v81; 793 v30 = v81;
794 sprintf(&v77, format_4E2DC8, v30); 794 sprintf(v77, format_4E2DC8, v30);
795 strcat(&v77, pGlobalTXT_LocalizationStrings[160]); 795 strcat(v77, pGlobalTXT_LocalizationStrings[160]);
796 v82 = pFontArrus->CalcTextHeight(&v77, &v79, 0, 0); 796 v82 = pFontArrus->CalcTextHeight(v77, &v79, 0, 0);
797 strcat(&v77, "\n \n"); 797 strcat(v77, "\n \n");
798 v75 = 0; 798 v75[0] = 0;
799 v87 = 0; 799 v87 = 0;
800 v31 = (signed int)window_SpeakInHouse->ptr_1C; 800 v31 = (signed int)window_SpeakInHouse->ptr_1C;
801 if ( v31 >= 108 && v31 <= 120 ) 801 if ( v31 >= 108 && v31 <= 120 )
802 { 802 {
803 v32 = *(int *)v84; 803 v32 = *(int *)v84;
804 if ( pDialogueWindow->pCurrentPosActiveItem != 5 ) 804 if ( pDialogueWindow->pCurrentPosActiveItem != 5 )
805 v32 = v81; 805 v32 = v81;
806 sprintf(&v75, format_4E2DC8, v32); 806 sprintf(v75, format_4E2DC8, v32);
807 strcat(&v75, pGlobalTXT_LocalizationStrings[611]); 807 strcat(v75, pGlobalTXT_LocalizationStrings[611]);
808 v87 = pFontArrus->CalcTextHeight(&v75, &v79, 0, 0); 808 v87 = pFontArrus->CalcTextHeight(v75, &v79, 0, 0);
809 } 809 }
810 v33 = pDialogueWindow; 810 v33 = pDialogueWindow;
811 Str[1] = (char *)pDialogueWindow; 811 Str[1] = (char *)pDialogueWindow;
812 v34 = pDialogueWindow->pStartingPosActiveItem; 812 v34 = pDialogueWindow->pStartingPosActiveItem;
813 v35 = v34 + pDialogueWindow->pNumPresenceButton; 813 v35 = v34 + pDialogueWindow->pNumPresenceButton;