comparison mm7_1.cpp @ 566:fcbb3c281217

QuickRef reputation string fix
author Nomad
date Tue, 05 Mar 2013 03:42:21 +0200
parents 8b77231088d8
children f451efdb7c8b
comparison
equal deleted inserted replaced
565:e429ad557cda 566:fcbb3c281217
983 ++uCellID; 983 ++uCellID;
984 v26 += 4; 984 v26 += 4;
985 } 985 }
986 while ( uCellID < 126 ); 986 while ( uCellID < 126 );
987 } 987 }
988 // 4E28F8: using guessed type int pCurrentScreen;
989 // 507958: using guessed type int uTextureID_507958;
990 // 50C9A8: using guessed type int dword_50C9A8;
991 988
992 //----- (0041A556) -------------------------------------------------------- 989 //----- (0041A556) --------------------------------------------------------
993 void __cdecl draw_leather() 990 void __cdecl draw_leather()
994 { 991 {
995 pRenderer->DrawTextureIndexed( 992 pRenderer->DrawTextureIndexed(8, 8, pIcons_LOD->GetTexture(uTextureID_Leather));
996 8u,
997 8u,
998 (Texture *)(uTextureID_Leather != -1 ? (int)&pIcons_LOD->pTextures[uTextureID_Leather] : 0));
999 } 993 }
1000 994
1001 //----- (0041A57E) -------------------------------------------------------- 995 //----- (0041A57E) --------------------------------------------------------
1002 char __cdecl QuickRefDraw() 996 void QuickRefDraw()
1003 { 997 {
1004 unsigned int v0; // ebx@1 998 unsigned int v0; // ebx@1
1005 unsigned int v1; // eax@1 999 //unsigned int v1; // eax@1
1006 Player *pPlayer; // ebp@2 1000 Player *pPlayer; // ebp@2
1007 int v3; // eax@6 1001 int v3; // eax@6
1008 int v4; // edi@6 1002 int v4; // edi@6
1009 unsigned int v5; // eax@7 1003 unsigned int v5; // eax@7
1010 unsigned int v6; // edi@9 1004 unsigned int v6; // edi@9
1047 unsigned int v44; // [sp+14h] [bp-18h]@2 1041 unsigned int v44; // [sp+14h] [bp-18h]@2
1048 int v45; // [sp+18h] [bp-14h]@1 1042 int v45; // [sp+18h] [bp-14h]@1
1049 unsigned int v46; // [sp+1Ch] [bp-10h]@1 1043 unsigned int v46; // [sp+1Ch] [bp-10h]@1
1050 unsigned int v47; // [sp+20h] [bp-Ch]@1 1044 unsigned int v47; // [sp+20h] [bp-Ch]@1
1051 unsigned int v48; // [sp+24h] [bp-8h]@33 1045 unsigned int v48; // [sp+24h] [bp-8h]@33
1052 unsigned int v49; // [sp+28h] [bp-4h]@1 1046 //unsigned int v49; // [sp+28h] [bp-4h]@1
1053 1047
1054 v0 = 0; 1048 v0 = 0;
1055 v47 = GenerateColorAsCloseAsPossibleToR8G8B8InTargetFormat(0xFFu, 0xFFu, 0x9Bu); 1049 v47 = GenerateColorAsCloseAsPossibleToR8G8B8InTargetFormat(0xFFu, 0xFFu, 0x9Bu);
1056 v49 = GenerateColorAsCloseAsPossibleToR8G8B8InTargetFormat(0xFFu, 0, 0); 1050 //v49 = GenerateColorAsCloseAsPossibleToR8G8B8InTargetFormat(0xFFu, 0, 0);
1057 v46 = GenerateColorAsCloseAsPossibleToR8G8B8InTargetFormat(0, 0xFFu, 0); 1051 v46 = GenerateColorAsCloseAsPossibleToR8G8B8InTargetFormat(0, 0xFFu, 0);
1058 v1 = pIcons_LOD->LoadTexture("quikref", TEXTURE_16BIT_PALETTE); 1052 //v1 = pIcons_LOD->LoadTexture("quikref", TEXTURE_16BIT_PALETTE);
1059 pRenderer->DrawTextureIndexed(8u, 8u, (Texture *)(v1 != -1 ? &pIcons_LOD->pTextures[v1] : 0)); 1053 pRenderer->DrawTextureIndexed(8, 8, pIcons_LOD->LoadTexturePtr("quikref", TEXTURE_16BIT_PALETTE));
1060 v43 = 0; 1054 v43 = 0;
1061 v45 = LOBYTE(pFontArrus->uFontHeight) + 1; 1055 v45 = LOBYTE(pFontArrus->uFontHeight) + 1;
1062 do 1056 do
1063 { 1057 {
1064 pPlayer = &pParty->pPlayers[v43]; 1058 pPlayer = &pParty->pPlayers[v43];
1165 v37 = pGlobalTXT_LocalizationStrings[153];//Нет 1159 v37 = pGlobalTXT_LocalizationStrings[153];//Нет
1166 pGUIWindow_CurrentMenu->DrawTextInRect(pFontArrus, v44, v35, 0, v37, 84, 0); 1160 pGUIWindow_CurrentMenu->DrawTextInRect(pFontArrus, v44, v35, 0, v37, 84, 0);
1167 ++v43; 1161 ++v43;
1168 } 1162 }
1169 while ( v43 < 4 ); 1163 while ( v43 < 4 );
1164
1170 v38 = GetPartyReputation(); 1165 v38 = GetPartyReputation();
1171 if ( v38 >= 0 ) 1166 if ( v38 >= 0 )
1172 { 1167 {
1173 v39 = v49;
1174 if ( v38 <= 5 ) 1168 if ( v38 <= 5 )
1175 v39 = 65535; 1169 v39 = GenerateColorAsCloseAsPossibleToR8G8B8InTargetFormat(0xFF, 0xFF, 0xFF);
1170 else
1171 v39 = GenerateColorAsCloseAsPossibleToR8G8B8InTargetFormat(0xFF, 0, 0);
1176 } 1172 }
1177 else 1173 else
1178 {
1179 v39 = v46; 1174 v39 = v46;
1180 } 1175
1181 v40 = GetReputationString(v38); 1176 v40 = GetReputationString(v38);
1182 sprintf(pTmpBuf, "%s: ", pGlobalTXT_LocalizationStrings[180], v39, v40);//Reputation 1177 sprintf(pTmpBuf, "%s: \xC" "%05d%s\xC" "00000", pGlobalTXT_LocalizationStrings[180], v39, v40);//Reputation
1183 pGUIWindow_CurrentMenu->DrawText(pFontArrus, 22, 323, 0, pTmpBuf, 0, 0, 0); 1178 pGUIWindow_CurrentMenu->DrawText(pFontArrus, 22, 323, 0, pTmpBuf, 0, 0, 0);
1184 v41 = pParty->GetPartyFame(); 1179 v41 = pParty->GetPartyFame();
1185 sprintf(pTmpBuf, "\r261%s: %d", pGlobalTXT_LocalizationStrings[84], v41);// Fame Слава 1180 sprintf(pTmpBuf, "\r261%s: %d", pGlobalTXT_LocalizationStrings[84], v41);// Fame Слава
1186 return pGUIWindow_CurrentMenu->DrawText(pFontArrus, 0, 323, 0, pTmpBuf, 0, 0, 0); 1181 pGUIWindow_CurrentMenu->DrawText(pFontArrus, 0, 323, 0, pTmpBuf, 0, 0, 0);
1187 } 1182 }
1188 1183
1189 //----- (0041ABFD) -------------------------------------------------------- 1184 //----- (0041ABFD) --------------------------------------------------------
1190 void __thiscall CharacterUI_CharacterScreen_Draw(unsigned int uPlayerIdx) 1185 void __thiscall CharacterUI_CharacterScreen_Draw(unsigned int uPlayerIdx)
1191 { 1186 {