Mercurial > mm7

comparison mm7_4.cpp @ 373:edd2d8b7e3c4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Interface reloading fix & party alignment enum
author Nomad
date Fri, 22 Feb 2013 18:40:38 +0200
parents 7f817679b60e
children 243418228760 2f67762d04f6 4a60371fd70c
comparison
equal deleted inserted replaced
372:6a2b4d1be013 373:edd2d8b7e3c4
14761 //----- (00444839) -------------------------------------------------------- 14761 //----- (00444839) --------------------------------------------------------
14762 unsigned int __fastcall sub_444839_move_map(unsigned int a1, int a2, int x, int y, int z, int directiony, int directionx, int a8, const char *pLocationName) 14762 unsigned int __fastcall sub_444839_move_map(unsigned int a1, int a2, int x, int y, int z, int directiony, int directionx, int a8, const char *pLocationName)
14763 { 14763 {
14764 unsigned int v9; // ebx@1 14764 unsigned int v9; // ebx@1
14765 int v10; // edi@1 14765 int v10; // edi@1
14766 signed int v11; // eax@1 14766 //signed int v11; // eax@1
14767 unsigned int v12; // eax@6 14767 unsigned int v12; // eax@6
14768 const char *v13; // ST0C_4@6 14768 const char *v13; // ST0C_4@6
14769 unsigned int v14; // eax@8 14769 unsigned int v14; // eax@8
14770 const char *v15; // eax@14 14770 const char *v15; // eax@14
14771 unsigned int v16; // eax@16 14771 unsigned int v16; // eax@16
14772 unsigned int result; // eax@26 14772 unsigned int result; // eax@26
14773 const char *v18; // [sp-8h] [bp-40h]@9 14773 const char *v18; // [sp-8h] [bp-40h]@9
14774 const char *v19; // [sp-4h] [bp-3Ch]@2 14774 //const char *v19; // [sp-4h] [bp-3Ch]@2
14775 char *v20; // [sp-4h] [bp-3Ch]@9 14775 char *v20; // [sp-4h] [bp-3Ch]@9
14776 const char *v21; // [sp-4h] [bp-3Ch]@11 14776 const char *v21; // [sp-4h] [bp-3Ch]@11
14777 char pContainer[40]; // [sp+Ch] [bp-2Ch]@1 14777 char pContainer[40]; // [sp+Ch] [bp-2Ch]@1
14778 unsigned int v23; // [sp+34h] [bp-4h]@1 14778 unsigned int v23; // [sp+34h] [bp-4h]@1
14779 14779
14788 dword_591168_teleport_speedz = a8; 14788 dword_591168_teleport_speedz = a8;
14789 dword_591164_teleport_map_name = (char *)pLocationName; 14789 dword_591164_teleport_map_name = (char *)pLocationName;
14790 uCurrentHouse_Animation = v9; 14790 uCurrentHouse_Animation = v9;
14791 pEventTimer->Pause(); 14791 pEventTimer->Pause();
14792 pAudioPlayer->StopChannels(-1, -1); 14792 pAudioPlayer->StopChannels(-1, -1);
14793 v11 = const_2(); 14793
14794 switch (pParty->alignment)
14795 {
14796 case PartyAlignment_Good: sprintf(pContainer, "evt%02d-b", const_2()); break;
14797 case PartyAlignment_Neutral: sprintf(pContainer, "evt%02d", const_2()); break;
14798 case PartyAlignment_Evil: sprintf(pContainer, "evt%02d-c", const_2()); break;
14799 default: assert(false);
14800 }
14801 /*v11 = const_2();
14794 sprintf(pContainer, "evt%02d", v11); 14802 sprintf(pContainer, "evt%02d", v11);
14795 if ( pParty->uAlignment ) 14803 if ( pParty->uAlignment )
14796 { 14804 {
14797 if ( pParty->uAlignment != 2 ) 14805 if ( pParty->uAlignment != 2 )
14798 goto LABEL_6; 14806 goto LABEL_6;
14800 } 14808 }
14801 else 14809 else
14802 { 14810 {
14803 v19 = "-b"; 14811 v19 = "-b";
14804 } 14812 }
14805 strcat(pContainer, v19); 14813 strcat(pContainer, v19);*/
14806 LABEL_6: 14814
14815 //LABEL_6:
14807 v12 = pIcons_LOD->LoadTexture(pContainer, TEXTURE_16BIT_PALETTE); 14816 v12 = pIcons_LOD->LoadTexture(pContainer, TEXTURE_16BIT_PALETTE);
14808 v13 = pHouse_ExitPictures[v10]; 14817 v13 = pHouse_ExitPictures[v10];
14809 pTexture_Dialogue_Background = &pIcons_LOD->pTextures[v12]; 14818 pTexture_Dialogue_Background = &pIcons_LOD->pTextures[v12];
14810 pTexture_outside = &pIcons_LOD->pTextures[pIcons_LOD->LoadTexture(v13, TEXTURE_16BIT_PALETTE)]; 14819 pTexture_outside = &pIcons_LOD->pTextures[pIcons_LOD->LoadTexture(v13, TEXTURE_16BIT_PALETTE)];
14811 if ( v9 ) 14820 if ( v9 )
14997 int v11; // ecx@17 15006 int v11; // ecx@17
14998 unsigned int v12; // kr00_4@25 15007 unsigned int v12; // kr00_4@25
14999 //Player *v13; // esi@25 15008 //Player *v13; // esi@25
15000 int v14; // eax@25 15009 int v14; // eax@25
15001 //Player *v15; // esi@27 15010 //Player *v15; // esi@27
15002 signed int v16; // eax@32 15011 //signed int v16; // eax@32
15003 unsigned int v17; // eax@37 15012 unsigned int v17; // eax@37
15004 signed int v18; // edi@37 15013 signed int v18; // edi@37
15005 signed int v19; // edi@41 15014 signed int v19; // edi@41
15006 //unsigned int v20; // ecx@41 15015 //unsigned int v20; // ecx@41
15007 const char *v22; // [sp-4h] [bp-40h]@33 15016 //const char *v22; // [sp-4h] [bp-40h]@33
15008 char pContainer[40]; // [sp+Ch] [bp-30h]@32 15017 char pContainer[40]; // [sp+Ch] [bp-30h]@32
15009 unsigned int v24; // [sp+34h] [bp-8h]@5 15018 unsigned int v24; // [sp+34h] [bp-8h]@5
15010 //enum HOUSE_TYPE v25; // [sp+38h] [bp-4h]@1 15019 //enum HOUSE_TYPE v25; // [sp+38h] [bp-4h]@1
15011 15020
15012 //v1 = uHouseID; 15021 //v1 = uHouseID;
15120 //v10 = v25; 15129 //v10 = v25;
15121 } 15130 }
15122 ++pIcons_LOD->uTexturePacksCount; 15131 ++pIcons_LOD->uTexturePacksCount;
15123 if ( !pIcons_LOD->uNumPrevLoadedFiles ) 15132 if ( !pIcons_LOD->uNumPrevLoadedFiles )
15124 pIcons_LOD->uNumPrevLoadedFiles = pIcons_LOD->uNumLoadedFiles; 15133 pIcons_LOD->uNumPrevLoadedFiles = pIcons_LOD->uNumLoadedFiles;
15125 v16 = const_2(); 15134
15135 /*v16 = const_2();
15126 sprintf(pContainer, "evt%02d", v16); 15136 sprintf(pContainer, "evt%02d", v16);
15127 if ( pParty->uAlignment ) 15137 if ( pParty->uAlignment )
15128 { 15138 {
15129 if ( pParty->uAlignment != 2 ) 15139 if ( pParty->uAlignment != 2 )
15130 goto LABEL_37; 15140 goto LABEL_37;
15132 } 15142 }
15133 else 15143 else
15134 { 15144 {
15135 v22 = "-b"; 15145 v22 = "-b";
15136 } 15146 }
15137 strcat(pContainer, v22); 15147 strcat(pContainer, v22);*/
15138 LABEL_37: 15148 //LABEL_37:
15149 switch (pParty->alignment)
15150 {
15151 case PartyAlignment_Good: sprintf(pContainer, "evt%02d-b", const_2()); break;
15152 case PartyAlignment_Neutral: sprintf(pContainer, "evt%02d", const_2()); break;
15153 case PartyAlignment_Evil: sprintf(pContainer, "evt%02d-c", const_2()); break;
15154 default: assert(false);
15155 }
15156
15139 v17 = pIcons_LOD->LoadTexture(pContainer, TEXTURE_16BIT_PALETTE); 15157 v17 = pIcons_LOD->LoadTexture(pContainer, TEXTURE_16BIT_PALETTE);
15140 array_5913D8[6] = 0; 15158 array_5913D8[6] = 0;
15141 pTexture_Dialogue_Background = &pIcons_LOD->pTextures[v17]; 15159 pTexture_Dialogue_Background = &pIcons_LOD->pTextures[v17];
15142 uTextureID_507B04 = uTextureID_right_panel; 15160 uTextureID_507B04 = uTextureID_right_panel;
15143 PrepareHouse(uHouseID); 15161 PrepareHouse(uHouseID);