Mercurial > mm7
comparison mm7_3.cpp @ 373:edd2d8b7e3c4
Interface reloading fix & party alignment enum
author | Nomad |
---|---|
date | Fri, 22 Feb 2013 18:40:38 +0200 |
parents | 2bc1c8d68f41 |
children | 243418228760 |
comparison
equal
deleted
inserted
replaced
372:6a2b4d1be013 | 373:edd2d8b7e3c4 |
---|---|
14668 | 14668 |
14669 | 14669 |
14670 //----- (00444C8F) -------------------------------------------------------- | 14670 //----- (00444C8F) -------------------------------------------------------- |
14671 GUIWindow *__cdecl UI_CreateTravelDialogue() | 14671 GUIWindow *__cdecl UI_CreateTravelDialogue() |
14672 { | 14672 { |
14673 signed int v0; // eax@1 | 14673 //signed int v0; // eax@1 |
14674 unsigned int v1; // eax@6 | 14674 unsigned int v1; // eax@6 |
14675 GUIWindow *result; // eax@9 | 14675 GUIWindow *result; // eax@9 |
14676 const char *v3; // [sp-4h] [bp-2Ch]@2 | 14676 //const char *v3; // [sp-4h] [bp-2Ch]@2 |
14677 char pContainer[32]; // [sp+0h] [bp-28h]@1 | 14677 char pContainer[32]; // [sp+0h] [bp-28h]@1 |
14678 | 14678 |
14679 pEventTimer->Pause(); | 14679 pEventTimer->Pause(); |
14680 v0 = const_2(); | 14680 /*v0 = const_2(); |
14681 sprintf(pContainer, "evt%02d", v0); | 14681 sprintf(pContainer, "evt%02d", v0); |
14682 if ( pParty->uAlignment ) | 14682 if ( pParty->uAlignment ) |
14683 { | 14683 { |
14684 if ( pParty->uAlignment != 2 ) | 14684 if ( pParty->uAlignment != 2 ) |
14685 goto LABEL_6; | 14685 goto LABEL_6; |
14688 else | 14688 else |
14689 { | 14689 { |
14690 v3 = "-b"; | 14690 v3 = "-b"; |
14691 } | 14691 } |
14692 strcat(pContainer, v3); | 14692 strcat(pContainer, v3); |
14693 LABEL_6: | 14693 LABEL_6:*/ |
14694 switch (pParty->alignment) | |
14695 { | |
14696 case PartyAlignment_Good: sprintf(pContainer, "evt%02d-b", const_2()); | |
14697 case PartyAlignment_Neutral: sprintf(pContainer, "evt%02d", const_2()); | |
14698 case PartyAlignment_Evil: sprintf(pContainer, "evt%02d-c", const_2()); | |
14699 default: assert(false); | |
14700 } | |
14701 | |
14694 pTexture_Dialogue_Background = &pIcons_LOD->pTextures[pIcons_LOD->LoadTexture(pContainer, TEXTURE_16BIT_PALETTE)]; | 14702 pTexture_Dialogue_Background = &pIcons_LOD->pTextures[pIcons_LOD->LoadTexture(pContainer, TEXTURE_16BIT_PALETTE)]; |
14695 pTexture_outside = &pIcons_LOD->pTextures[pIcons_LOD->LoadTexture("outside", TEXTURE_16BIT_PALETTE)]; | 14703 pTexture_outside = &pIcons_LOD->pTextures[pIcons_LOD->LoadTexture("outside", TEXTURE_16BIT_PALETTE)]; |
14696 v1 = pMapStats->GetMapInfo(pCurrentMapName); | 14704 v1 = pMapStats->GetMapInfo(pCurrentMapName); |
14697 if ( v1 ) | 14705 if ( v1 ) |
14698 sprintf(byte_591098, pGlobalTXT_LocalizationStrings[410], pMapStats->pInfos[v1].pName);// "Leave %s" | 14706 sprintf(byte_591098, pGlobalTXT_LocalizationStrings[410], pMapStats->pInfos[v1].pName);// "Leave %s" |