Mercurial > mm7

comparison mm7_1.cpp @ 148:77ad59c17864

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Слияние
author Ritor1
date Tue, 12 Feb 2013 09:11:19 +0600
parents c70fea5013aa 9b0d651821f1
children d92c78ab54fe
comparison
equal deleted inserted replaced
147:c70fea5013aa 148:77ad59c17864
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();
3712 { 3711 {
3713 ++v0; 3712 ++v0;
3714 if ( v0 > &pParty->pPlayers[3] ) 3713 if ( v0 > &pParty->pPlayers[3] )
3715 break; 3714 break;
3716 } 3715 }
3717 if(v0->uClass == 31) 3716 if(v0->classType == PLAYER_CLASS_31)
3718 ++uRestUI_FoodRequiredToRest; 3717 ++uRestUI_FoodRequiredToRest;
3719 } 3718 }
3720 if ( CheckHiredNPCSpeciality(0x1Du) ) 3719 if ( CheckHiredNPCSpeciality(0x1Du) )
3721 --uRestUI_FoodRequiredToRest; 3720 --uRestUI_FoodRequiredToRest;
3722 if ( CheckHiredNPCSpeciality(0x1Eu) ) 3721 if ( CheckHiredNPCSpeciality(0x1Eu) )