Mercurial > mm7

comparison mm7_1.cpp @ 584:6a36b1cd767e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
CharacterUI_CharacterScreen_Draw switch clean
author zipi
date Wed, 06 Mar 2013 11:05:44 +0000
parents a436924b31c3
children 3ac7059a3f4f
comparison
equal deleted inserted replaced
583:a436924b31c3 584:6a36b1cd767e
1198 sub_419379(); 1198 sub_419379();
1199 CharacterUI_StatsTab_Draw(v1); 1199 CharacterUI_StatsTab_Draw(v1);
1200 v7 = pIcons_LOD->LoadTexture("ib-cd1-d", TEXTURE_16BIT_PALETTE); 1200 v7 = pIcons_LOD->LoadTexture("ib-cd1-d", TEXTURE_16BIT_PALETTE);
1201 pTexture = (Texture *)(v7 != -1 ? (int)&pIcons_LOD->pTextures[v7] : 0); 1201 pTexture = (Texture *)(v7 != -1 ? (int)&pIcons_LOD->pTextures[v7] : 0);
1202 pButton = pCharacterScreen_StatsBtn; 1202 pButton = pCharacterScreen_StatsBtn;
1203 break; 1203 pRenderer->DrawTextureIndexed(pButton->uX, pButton->uY, pTexture);
1204 break;
1204 case WINDOW_CharacterWindow_Skills: // skills 1205 case WINDOW_CharacterWindow_Skills: // skills
1205 if ( dword_507CC0 != uActiveCharacter ) 1206 if ( dword_507CC0 != uActiveCharacter )
1206 { 1207 {
1207 sub_4196A0(); 1208 sub_4196A0();
1208 CharacterUI_SkillScreen_Draw(); 1209 CharacterUI_SkillScreen_Draw();
1210 sub_419379(); 1211 sub_419379();
1211 CharacterUI_SkillsTab_Draw(v1); 1212 CharacterUI_SkillsTab_Draw(v1);
1212 v6 = pIcons_LOD->LoadTexture("ib-cd2-d", TEXTURE_16BIT_PALETTE); 1213 v6 = pIcons_LOD->LoadTexture("ib-cd2-d", TEXTURE_16BIT_PALETTE);
1213 pTexture = (Texture *)(v6 != -1 ? (int)&pIcons_LOD->pTextures[v6] : 0); 1214 pTexture = (Texture *)(v6 != -1 ? (int)&pIcons_LOD->pTextures[v6] : 0);
1214 pButton = pCharacterScreen_SkillsBtn; 1215 pButton = pCharacterScreen_SkillsBtn;
1215 break; 1216 pRenderer->DrawTextureIndexed(pButton->uX, pButton->uY, pTexture);
1217 break;
1216 case WINDOW_CharacterWindow_Awards: // awards 1218 case WINDOW_CharacterWindow_Awards: // awards
1217 sub_4196A0(); 1219 sub_4196A0();
1218 sub_419379(); 1220 sub_419379();
1219 sub_419220(); 1221 sub_419220();
1220 CharacterUI_AwardsTab_Draw(v1); 1222 CharacterUI_AwardsTab_Draw(v1);
1221 v5 = pIcons_LOD->LoadTexture("ib-cd4-d", TEXTURE_16BIT_PALETTE); 1223 v5 = pIcons_LOD->LoadTexture("ib-cd4-d", TEXTURE_16BIT_PALETTE);
1222 pTexture = (Texture *)(v5 != -1 ? (int)&pIcons_LOD->pTextures[v5] : 0); 1224 pTexture = (Texture *)(v5 != -1 ? (int)&pIcons_LOD->pTextures[v5] : 0);
1223 pButton = pCharacterScreen_AwardsBtn; 1225 pButton = pCharacterScreen_AwardsBtn;
1226 pRenderer->DrawTextureIndexed(pButton->uX, pButton->uY, pTexture);
1224 break; 1227 break;
1225 default: // inventory and other 1228 case WINDOW_CharacterWindow_Inventory: // inventory and other
1226 if ( pWindowList_at_506F50_minus1_indexing_buttons____and_an_int_[0] != 103 )
1227 goto LABEL_13;
1228 sub_4196A0(); 1229 sub_4196A0();
1229 sub_419379(); 1230 sub_419379();
1230 CharacterUI_InventoryTab_Draw(v1, 0); 1231 CharacterUI_InventoryTab_Draw(v1, 0);
1231 v2 = pIcons_LOD->LoadTexture("ib-cd3-d", TEXTURE_16BIT_PALETTE); 1232 v2 = pIcons_LOD->LoadTexture("ib-cd3-d", TEXTURE_16BIT_PALETTE);
1232 pTexture = (Texture *)(v2 != -1 ? (int)&pIcons_LOD->pTextures[v2] : 0); 1233 pTexture = (Texture *)(v2 != -1 ? (int)&pIcons_LOD->pTextures[v2] : 0);
1233 pButton = pCharacterScreen_InventoryBtn; 1234 pButton = pCharacterScreen_InventoryBtn;
1235 pRenderer->DrawTextureIndexed(pButton->uX, pButton->uY, pTexture);
1234 break; 1236 break;
1235 } 1237 default:
1236 pRenderer->DrawTextureIndexed(pButton->uX, pButton->uY, pTexture); 1238 break;
1237 LABEL_13: 1239 }
1238 if ( bRingsShownInCharScreen ) 1240 if ( bRingsShownInCharScreen )
1239 CharacterUI_DrawPaperdollWithRingOverlay(v1); 1241 CharacterUI_DrawPaperdollWithRingOverlay(v1);
1240 else 1242 else
1241 CharacterUI_DrawPaperdoll(v1); 1243 CharacterUI_DrawPaperdoll(v1);
1242 } 1244 }