Mercurial > mm7

comparison mm7_1.cpp @ 263:8cf4fe6b4941

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Слияние
author Ritor1
date Mon, 18 Feb 2013 12:38:38 +0600
parents 2d6dda2e0405 0a37a56e9f02
children fb890fb66cad
comparison
equal deleted inserted replaced
262:2d6dda2e0405 263:8cf4fe6b4941
609 } 609 }
610 610
611 //----- (0041A000) -------------------------------------------------------- 611 //----- (0041A000) --------------------------------------------------------
612 unsigned int __fastcall CharacterUI_AwardsTab_Draw(unsigned int uPlayerID) 612 unsigned int __fastcall CharacterUI_AwardsTab_Draw(unsigned int uPlayerID)
613 { 613 {
614 unsigned int v1; // esi@1 614 //unsigned int v1; // esi@1
615 unsigned int v2; // ebx@1 615 unsigned int v2; // ebx@1
616 unsigned int v3; // eax@1 616 unsigned int v3; // eax@1
617 unsigned int result; // eax@1 617 unsigned int result; // eax@1
618 int v5; // eax@15 618 int v5; // eax@15
619 char *v6; // ebx@15 619 char *v6; // ebx@15
632 GUIWindow a1; // [sp+70h] [bp-60h]@1 632 GUIWindow a1; // [sp+70h] [bp-60h]@1
633 unsigned int v20; // [sp+C4h] [bp-Ch]@15 633 unsigned int v20; // [sp+C4h] [bp-Ch]@15
634 int v21; // [sp+C8h] [bp-8h]@14 634 int v21; // [sp+C8h] [bp-8h]@14
635 int v22; // [sp+CCh] [bp-4h]@40 635 int v22; // [sp+CCh] [bp-4h]@40
636 636
637 v1 = uPlayerID; 637 auto player = pParty->pPlayers + uPlayerID - 1;
638 //v1 = uPlayerID;
638 v2 = GenerateColorAsCloseAsPossibleToR8G8B8InTargetFormat(0xFFu, 0xFFu, 0x9Bu); 639 v2 = GenerateColorAsCloseAsPossibleToR8G8B8InTargetFormat(0xFFu, 0xFFu, 0x9Bu);
639 v3 = pIcons_LOD->LoadTexture("fr_award", TEXTURE_16BIT_PALETTE); 640 v3 = pIcons_LOD->LoadTexture("fr_award", TEXTURE_16BIT_PALETTE);
640 pRenderer->DrawTextureIndexed(8u, 8u, (Texture *)(v3 != -1 ? (int)&pIcons_LOD->pTextures[v3] : 0)); 641 pRenderer->DrawTextureIndexed(8u, 8u, (Texture *)(v3 != -1 ? &pIcons_LOD->pTextures[v3] : 0));
641 sprintf(pTmpBuf, "%s \f%05d", pGlobalTXT_LocalizationStrings[23], v2);// TODO check args 642 sprintfex(pTmpBuf, "%s\xC" "%05d", pGlobalTXT_LocalizationStrings[23], v2);
642 sprintf(Source, pGlobalTXT_LocalizationStrings[429], &pParty->pPlayers[v1-1].pName, pClassNames[pParty->pPlayers[v1-1].classType]); 643 sprintfex(Source, pGlobalTXT_LocalizationStrings[429], player->pName, pClassNames[player->classType]);
643 strcat(pTmpBuf, Source); 644 strcat(pTmpBuf, Source);
644 strcat(pTmpBuf, "\xC" "00000"); 645 strcat(pTmpBuf, "\xC" "00000");
645 pGUIWindow_CurrentMenu->DrawText(pFontArrus, 24, 18, 0, pTmpBuf, 0, 0, 0); 646 pGUIWindow_CurrentMenu->DrawText(pFontArrus, 24, 18, 0, pTmpBuf, 0, 0, 0);
646 result = dword_506528; 647 result = dword_506528;
647 a1.uFrameX = 12; 648 a1.uFrameX = 12;
1052 v0 = 0; 1053 v0 = 0;
1053 v47 = GenerateColorAsCloseAsPossibleToR8G8B8InTargetFormat(0xFFu, 0xFFu, 0x9Bu); 1054 v47 = GenerateColorAsCloseAsPossibleToR8G8B8InTargetFormat(0xFFu, 0xFFu, 0x9Bu);
1054 v49 = GenerateColorAsCloseAsPossibleToR8G8B8InTargetFormat(0xFFu, 0, 0); 1055 v49 = GenerateColorAsCloseAsPossibleToR8G8B8InTargetFormat(0xFFu, 0, 0);
1055 v46 = GenerateColorAsCloseAsPossibleToR8G8B8InTargetFormat(0, 0xFFu, 0); 1056 v46 = GenerateColorAsCloseAsPossibleToR8G8B8InTargetFormat(0, 0xFFu, 0);
1056 v1 = pIcons_LOD->LoadTexture("quikref", TEXTURE_16BIT_PALETTE); 1057 v1 = pIcons_LOD->LoadTexture("quikref", TEXTURE_16BIT_PALETTE);
1057 pRenderer->DrawTextureIndexed(8u, 8u, (Texture *)(v1 != -1 ? (int)&pIcons_LOD->pTextures[v1] : 0)); 1058 pRenderer->DrawTextureIndexed(8u, 8u, (Texture *)(v1 != -1 ? &pIcons_LOD->pTextures[v1] : 0));
1058 v43 = 0; 1059 v43 = 0;
1059 v45 = LOBYTE(pFontArrus->uFontHeight) + 1; 1060 v45 = LOBYTE(pFontArrus->uFontHeight) + 1;
1060 do 1061 do
1061 { 1062 {
1062 pPlayer = &pParty->pPlayers[v43]; 1063 pPlayer = &pParty->pPlayers[v43];
3151 if ( v121->uNPC_ID ) 3152 if ( v121->uNPC_ID )
3152 { 3153 {
3153 v37 = v112[6]; 3154 v37 = v112[6];
3154 if ( v37 ) 3155 if ( v37 )
3155 { 3156 {
3156 sprintfex(pTmpBuf, pGlobalTXT_LocalizationStrings[429], *v112, aNPCProfessionNames[(signed int)v37]); 3157 sprintf(pTmpBuf, pGlobalTXT_LocalizationStrings[429], *v112, aNPCProfessionNames[(signed int)v37]);
3157 } 3158 }
3158 else 3159 else
3159 { 3160 {
3160 v77 = 2000; 3161 v77 = 2000;
3161 v72 = *v112; 3162 v72 = *v112;
3465 sprintf(pTmpBuf, "%s\f%05u\t080%s\n", pGlobalTXT_LocalizationStrings[18], 0, v95[v121->pMonsterInfo.uAttack1Type]); 3466 sprintf(pTmpBuf, "%s\f%05u\t080%s\n", pGlobalTXT_LocalizationStrings[18], 0, v95[v121->pMonsterInfo.uAttack1Type]);
3466 a1->DrawText(v56, 150, (int)a4, a5, pTmpBuf, 0, 0, 0); 3467 a1->DrawText(v56, 150, (int)a4, a5, pTmpBuf, 0, 0, 0);
3467 a4 = &a4[LOBYTE(v56->uFontHeight) - 3]; 3468 a4 = &a4[LOBYTE(v56->uFontHeight) - 3];
3468 v57 = v121->pMonsterInfo.uAttack1DamageBonus; 3469 v57 = v121->pMonsterInfo.uAttack1DamageBonus;
3469 if ( v57 ) 3470 if ( v57 )
3470 sprintf(pTmpBuf, "%s\f%05u\t080%dd%d+%d\n", pGlobalTXT_LocalizationStrings[53], 0, v121->pMonsterInfo.uAttack1DamageDiceRolls, 3471 sprintf(
3471 v121->pMonsterInfo.uAttack1DamageDiceSides, v57); 3472 pTmpBuf,
3473 "%s\f%05u\t080%dd%d+%d\n",
3474 pGlobalTXT_LocalizationStrings[53],
3475 0,
3476 v121->pMonsterInfo.uAttack1DamageDiceRolls,
3477 v121->pMonsterInfo.uAttack1DamageDiceSides,
3478 v57);
3472 else 3479 else
3473 sprintf(pTmpBuf, "%s\f%05u\t080%dd%d\n", pGlobalTXT_LocalizationStrings[53], 0, v121->pMonsterInfo.uAttack1DamageDiceRolls, 3480 sprintf(
3481 pTmpBuf,
3482 "%s\f%05u\t080%dd%d\n",
3483 pGlobalTXT_LocalizationStrings[53],
3484 0,
3485 v121->pMonsterInfo.uAttack1DamageDiceRolls,
3474 v121->pMonsterInfo.uAttack1DamageDiceSides); 3486 v121->pMonsterInfo.uAttack1DamageDiceSides);
3475 } 3487 }
3476 else 3488 else
3477 { 3489 {
3478 sprintf(pTmpBuf, "%s\f%05u\t080%s\n", pGlobalTXT_LocalizationStrings[18], 0, pGlobalTXT_LocalizationStrings[630]); 3490 sprintf(pTmpBuf, "%s\f%05u\t080%s\n", pGlobalTXT_LocalizationStrings[18], 0, pGlobalTXT_LocalizationStrings[630]);
3694 { 3706 {
3695 ++v0; 3707 ++v0;
3696 if ( v0 > &pParty->pPlayers[3] ) 3708 if ( v0 > &pParty->pPlayers[3] )
3697 break; 3709 break;
3698 } 3710 }
3699 if(v0->classType == PLAYER_CLASS_31) 3711 if(v0->classType == PLAYER_CLASS_WARLOCK)
3700 ++uRestUI_FoodRequiredToRest; 3712 ++uRestUI_FoodRequiredToRest;
3701 } 3713 }
3702 if ( CheckHiredNPCSpeciality(0x1Du) ) 3714 if ( CheckHiredNPCSpeciality(0x1Du) )
3703 --uRestUI_FoodRequiredToRest; 3715 --uRestUI_FoodRequiredToRest;
3704 if ( CheckHiredNPCSpeciality(0x1Eu) ) 3716 if ( CheckHiredNPCSpeciality(0x1Eu) )