Mercurial > mm7

comparison UI/UiGame.cpp @ 1458:934074e7fcc1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
ModalWindow __thiscall and __cdecl removed Some random renames & refactors
author Nomad
date Wed, 21 Aug 2013 14:26:36 +0200
parents 110eac219e5a
children 2ca62c9e7b3c
comparison
equal deleted inserted replaced
1457:9dc33590f93e 1458:934074e7fcc1
1456 } 1456 }
1457 // 5C35BC: using guessed type int bForceDrawFooter; 1457 // 5C35BC: using guessed type int bForceDrawFooter;
1458 1458
1459 1459
1460 //----- (00420EFF) -------------------------------------------------------- 1460 //----- (00420EFF) --------------------------------------------------------
1461 void __cdecl GameUI_WritePointedObjectStatusString() 1461 void GameUI_WritePointedObjectStatusString()
1462 { 1462 {
1463 int v1; // ebx@6 1463 int v1; // ebx@6
1464 GUIWindow *pWindow; // edi@7 1464 GUIWindow *pWindow; // edi@7
1465 GUIButton *pButton; // ecx@11 1465 GUIButton *pButton; // ecx@11
1466 Player *pPlayer; // eax@19 1466 Player *pPlayer; // eax@19
2765 pRenderer->DrawTextureIndexed(floorf(uZooma + 0.5f) + 285, 136, pIcons_LOD->GetTexture(dword_5079B4)); 2765 pRenderer->DrawTextureIndexed(floorf(uZooma + 0.5f) + 285, 136, pIcons_LOD->GetTexture(dword_5079B4));
2766 pRenderer->ResetTextureClipRect(); 2766 pRenderer->ResetTextureClipRect();
2767 } 2767 }
2768 2768
2769 //----- (00441498) -------------------------------------------------------- 2769 //----- (00441498) --------------------------------------------------------
2770 void __cdecl GameUI_DrawTorchlightAndWizardEye() 2770 void GameUI_DrawTorchlightAndWizardEye()
2771 { 2771 {
2772 if (pCurrentScreen == SCREEN_GAME 2772 if (pCurrentScreen == SCREEN_GAME
2773 || pCurrentScreen == SCREEN_MENU 2773 || pCurrentScreen == SCREEN_MENU
2774 || pCurrentScreen == SCREEN_OPTIONS 2774 || pCurrentScreen == SCREEN_OPTIONS
2775 || pCurrentScreen == SCREEN_REST 2775 || pCurrentScreen == SCREEN_REST
2928 } 2928 }
2929 return TargetColor(v3, v2, v6); 2929 return TargetColor(v3, v2, v6);
2930 } 2930 }
2931 2931
2932 //----- (00417939) -------------------------------------------------------- 2932 //----- (00417939) --------------------------------------------------------
2933 signed int __thiscall GetConditionDrawColor(unsigned int uConditionIdx) 2933 int GetConditionDrawColor(unsigned int uConditionIdx)
2934 { 2934 {
2935 unsigned int v1; // ebx@1 2935 switch (uConditionIdx)
2936 signed int v2; // edi@1 2936 {
2937 unsigned int v3; // esi@1 2937 case Condition_Zombie:
2938 unsigned int v4; // eax@1 2938 case Condition_Good:
2939 unsigned int v6; // [sp+Ch] [bp-4h]@1 2939 return ui_character_condition_normal_color;
2940 2940
2941 v1 = uConditionIdx; 2941 case Condition_Cursed:
2942 v2 = 65535; 2942 case Condition_Weak:
2943 v3 = TargetColor(0xE1u, 0xCDu, 0x23u); 2943 case Condition_Fear:
2944 v6 = TargetColor(0xFFu, 0x23u, 0); 2944 case Condition_Drunk:
2945 v4 = TargetColor(0, 0xFFu, 0); 2945 case Condition_Insane:
2946 switch ( v1 ) 2946 case Condition_Poison1:
2947 { 2947 case Condition_Disease1:
2948 case 0u: 2948 return ui_character_condition_light_color;
2949 case 1u: 2949
2950 case 3u: 2950 case Condition_Sleep:
2951 case 4u: 2951 case Condition_Poison2:
2952 case 5u: 2952 case Condition_Disease2:
2953 case 6u: 2953 case Condition_Paralyzed:
2954 case 7u: 2954 case Condition_Unconcious:
2955 v2 = v4; 2955 return ui_character_condition_moderate_color;
2956 break; 2956
2957 case 2u: 2957 case Condition_Poison3:
2958 case 8u: 2958 case Condition_Disease3:
2959 case 9u: 2959 case Condition_Dead:
2960 case 0xCu: 2960 case Condition_Pertified:
2961 case 0xDu: 2961 case Condition_Eradicated:
2962 v2 = v3; 2962 return ui_character_condition_severe_color;
2963 break; 2963 }
2964 case 0xAu: 2964 assert(false && "Invalid condition");
2965 case 0xBu:
2966 case 0xEu:
2967 case 0xFu:
2968 case 0x10u:
2969 v2 = v6;
2970 break;
2971 default:
2972 return v2;
2973 }
2974 return v2;
2975 } 2965 }