Mercurial > mm7

comparison mm7_1.cpp @ 135:9b0d651821f1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Party creation screen: sorcerer class icon fixed
author Nomad
date Mon, 11 Feb 2013 20:23:55 +0200
parents 2baff1256844
children cca78efb377e 77ad59c17864
comparison
equal deleted inserted replaced
131:3ee983b8082b 135:9b0d651821f1
636 v1 = uPlayerID; 636 v1 = uPlayerID;
637 v2 = GenerateColorAsCloseAsPossibleToR8G8B8InTargetFormat(0xFFu, 0xFFu, 0x9Bu); 637 v2 = GenerateColorAsCloseAsPossibleToR8G8B8InTargetFormat(0xFFu, 0xFFu, 0x9Bu);
638 v3 = pIcons_LOD->LoadTexture("fr_award", TEXTURE_16BIT_PALETTE); 638 v3 = pIcons_LOD->LoadTexture("fr_award", TEXTURE_16BIT_PALETTE);
639 pRenderer->DrawTextureIndexed(8u, 8u, (Texture *)(v3 != -1 ? (int)&pIcons_LOD->pTextures[v3] : 0)); 639 pRenderer->DrawTextureIndexed(8u, 8u, (Texture *)(v3 != -1 ? (int)&pIcons_LOD->pTextures[v3] : 0));
640 sprintf(pTmpBuf, "%s \f%05d", pGlobalTXT_LocalizationStrings[23], v2);// TODO check args 640 sprintf(pTmpBuf, "%s \f%05d", pGlobalTXT_LocalizationStrings[23], v2);// TODO check args
641 sprintf( 641 sprintf(Source,
642 Source,
643 pGlobalTXT_LocalizationStrings[429], 642 pGlobalTXT_LocalizationStrings[429],
644 &pParty->pPlayers[v1-1].pName,//&stru_AA1058[3].pSounds[6972 * v1 + 40720], 643 &pParty->pPlayers[v1-1].pName,//&stru_AA1058[3].pSounds[6972 * v1 + 40720],
645 pClassNames[pParty->pPlayers[v1-1].uClass]);//&pClassNames[stru_AA1058[3].pSounds[6972 * v1 + 40737]]); 644 pClassNames[pParty->pPlayers[v1-1].classType]);//&pClassNames[stru_AA1058[3].pSounds[6972 * v1 + 40737]]);
646 strcat(pTmpBuf, Source); 645 strcat(pTmpBuf, Source);
647 strcat(pTmpBuf, "\xC" "00000"); 646 strcat(pTmpBuf, "\xC" "00000");
648 pGUIWindow_CurrentMenu->DrawText(pFontArrus, 24, 18, 0, pTmpBuf, 0, 0, 0); 647 pGUIWindow_CurrentMenu->DrawText(pFontArrus, 24, 18, 0, pTmpBuf, 0, 0, 0);
649 result = dword_506528; 648 result = dword_506528;
650 a1.uFrameX = 12; 649 a1.uFrameX = 12;
1078 v5 = GenerateColorAsCloseAsPossibleToR8G8B8InTargetFormat(0, 0xFFu, v0); 1077 v5 = GenerateColorAsCloseAsPossibleToR8G8B8InTargetFormat(0, 0xFFu, v0);
1079 pGUIWindow_CurrentMenu->DrawTextInRect(pFontArrus, v44, 0x2Fu, v5, pTmpBuf, 84, v0); 1078 pGUIWindow_CurrentMenu->DrawTextInRect(pFontArrus, v44, 0x2Fu, v5, pTmpBuf, 84, v0);
1080 v6 = v45 + 47; 1079 v6 = v45 + 47;
1081 if ( v43 == v0 ) 1080 if ( v43 == v0 )
1082 pGUIWindow_CurrentMenu->DrawTextInRect(pFontArrus, 0x16u, v45 + 47, v0, pGlobalTXT_LocalizationStrings[41], 60, v0);//Êëàññ 1081 pGUIWindow_CurrentMenu->DrawTextInRect(pFontArrus, 0x16u, v45 + 47, v0, pGlobalTXT_LocalizationStrings[41], 60, v0);//Êëàññ
1083 pGUIWindow_CurrentMenu->DrawTextInRect(pFontArrus, v44, v6, v0, pClassNames[pPlayer->uClass], 84, v0); 1082 pGUIWindow_CurrentMenu->DrawTextInRect(pFontArrus, v44, v6, v0, pClassNames[pPlayer->classType], 84, v0);
1084 v7 = v45 + v6; 1083 v7 = v45 + v6;
1085 if ( v43 == v0 ) 1084 if ( v43 == v0 )
1086 pGUIWindow_CurrentMenu->DrawTextInRect(pFontArrus, 0x16u, v7, v0, pGlobalTXT_LocalizationStrings[107], 60, v0);//Çäîð. 1085 pGUIWindow_CurrentMenu->DrawTextInRect(pFontArrus, 0x16u, v7, v0, pGlobalTXT_LocalizationStrings[107], 60, v0);//Çäîð.
1087 sprintf(pTmpBuf, "%d", pPlayer->sHealth); 1086 sprintf(pTmpBuf, "%d", pPlayer->sHealth);
1088 v8 = pPlayer->GetMaxHealth(); 1087 v8 = pPlayer->GetMaxHealth();
3723 { 3722 {
3724 ++v0; 3723 ++v0;
3725 if ( v0 > &pParty->pPlayers[3] ) 3724 if ( v0 > &pParty->pPlayers[3] )
3726 break; 3725 break;
3727 } 3726 }
3728 if(v0->uClass == 31) 3727 if(v0->classType == PLAYER_CLASS_31)
3729 ++uRestUI_FoodRequiredToRest; 3728 ++uRestUI_FoodRequiredToRest;
3730 } 3729 }
3731 if ( CheckHiredNPCSpeciality(0x1Du) ) 3730 if ( CheckHiredNPCSpeciality(0x1Du) )
3732 --uRestUI_FoodRequiredToRest; 3731 --uRestUI_FoodRequiredToRest;
3733 if ( CheckHiredNPCSpeciality(0x1Eu) ) 3732 if ( CheckHiredNPCSpeciality(0x1Eu) )