Mercurial > mm7

changeset 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
files mm7_1.cpp
diffstat 1 files changed, 9 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/mm7_1.cpp	Wed Mar 06 10:59:51 2013 +0000
+++ b/mm7_1.cpp	Wed Mar 06 11:05:44 2013 +0000
@@ -1200,7 +1200,8 @@
         v7 = pIcons_LOD->LoadTexture("ib-cd1-d", TEXTURE_16BIT_PALETTE);
         pTexture = (Texture *)(v7 != -1 ? (int)&pIcons_LOD->pTextures[v7] : 0);
         pButton = pCharacterScreen_StatsBtn;
-        break;
+        pRenderer->DrawTextureIndexed(pButton->uX, pButton->uY, pTexture);
+		break;
       case WINDOW_CharacterWindow_Skills:                                // skills
         if ( dword_507CC0 != uActiveCharacter )
         {
@@ -1212,7 +1213,8 @@
         v6 = pIcons_LOD->LoadTexture("ib-cd2-d", TEXTURE_16BIT_PALETTE);
         pTexture = (Texture *)(v6 != -1 ? (int)&pIcons_LOD->pTextures[v6] : 0);
         pButton = pCharacterScreen_SkillsBtn;
-        break;
+        pRenderer->DrawTextureIndexed(pButton->uX, pButton->uY, pTexture);
+		break;
       case WINDOW_CharacterWindow_Awards:                                // awards
         sub_4196A0();
         sub_419379();
@@ -1221,20 +1223,20 @@
         v5 = pIcons_LOD->LoadTexture("ib-cd4-d", TEXTURE_16BIT_PALETTE);
         pTexture = (Texture *)(v5 != -1 ? (int)&pIcons_LOD->pTextures[v5] : 0);
         pButton = pCharacterScreen_AwardsBtn;
+		pRenderer->DrawTextureIndexed(pButton->uX, pButton->uY, pTexture);
         break;
-      default:                                                            // inventory and other
-        if ( pWindowList_at_506F50_minus1_indexing_buttons____and_an_int_[0] != 103 )
-          goto LABEL_13;
+	  case WINDOW_CharacterWindow_Inventory:                                                        // inventory and other
         sub_4196A0();
         sub_419379();
         CharacterUI_InventoryTab_Draw(v1, 0);
         v2 = pIcons_LOD->LoadTexture("ib-cd3-d", TEXTURE_16BIT_PALETTE);
         pTexture = (Texture *)(v2 != -1 ? (int)&pIcons_LOD->pTextures[v2] : 0);
         pButton = pCharacterScreen_InventoryBtn;
+		pRenderer->DrawTextureIndexed(pButton->uX, pButton->uY, pTexture);
         break;
+	  default:
+		break;
     }
-    pRenderer->DrawTextureIndexed(pButton->uX, pButton->uY, pTexture);
-LABEL_13:
     if ( bRingsShownInCharScreen )
       CharacterUI_DrawPaperdollWithRingOverlay(v1);
     else