Mercurial > mm7

comparison mm7_4.cpp @ 396:4a60371fd70c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Слияние
author Ritor1
date Fri, 22 Feb 2013 21:47:55 +0600
parents c1a45052d634 edd2d8b7e3c4
children 7189d0bddf07
comparison
equal deleted inserted replaced
395:6c3f8694005f 396:4a60371fd70c
5913 { 5913 {
5914 if ( uMouseX >= (signed int)pControlsHead->uX && uMouseX <= (signed int)pControlsHead->uZ 5914 if ( uMouseX >= (signed int)pControlsHead->uX && uMouseX <= (signed int)pControlsHead->uZ
5915 && uMouseY >= (signed int)pControlsHead->uY && uMouseY <= (signed int)pControlsHead->uW )//mouse movement 5915 && uMouseY >= (signed int)pControlsHead->uY && uMouseY <= (signed int)pControlsHead->uW )//mouse movement
5916 { 5916 {
5917 pControlParam = pControlsHead->uControlParam; 5917 pControlParam = pControlsHead->uControlParam;
5918 if ( (signed int)pNumMessage < 40 ) 5918 pMessageQueue_50CBD0->SendMessage((UIMessageType)pControlsHead->field_1C, pControlParam, 0);
5919 {
5920 pMessageQueue_50CBD0->pMessages[pNumMessage].eType = (UIMessageType)pControlsHead->field_1C;
5921 //pTexture = &pTexture_PCX;
5922 pMessageQueue_50CBD0->pMessages[pMessageQueue_50CBD0->uNumMessages].param = pControlParam;
5923 *(&pMessageQueue_50CBD0->uNumMessages + 3 * pMessageQueue_50CBD0->uNumMessages + 3) = 0;
5924 pNumMessage = pMessageQueue_50CBD0->uNumMessages + 1;
5925 ++pMessageQueue_50CBD0->uNumMessages;
5926 }
5927 v1 = 0; 5919 v1 = 0;
5928 } 5920 }
5929 pControlsHead = pControlsHead->pNext; 5921 pControlsHead = pControlsHead->pNext;
5930 } 5922 }
5931 while ( pControlsHead != (GUIButton *)v1 ); 5923 while ( pControlsHead != (GUIButton *)v1 );
14769 //----- (00444839) -------------------------------------------------------- 14761 //----- (00444839) --------------------------------------------------------
14770 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)
14771 { 14763 {
14772 unsigned int v9; // ebx@1 14764 unsigned int v9; // ebx@1
14773 int v10; // edi@1 14765 int v10; // edi@1
14774 signed int v11; // eax@1 14766 //signed int v11; // eax@1
14775 unsigned int v12; // eax@6 14767 unsigned int v12; // eax@6
14776 const char *v13; // ST0C_4@6 14768 const char *v13; // ST0C_4@6
14777 unsigned int v14; // eax@8 14769 unsigned int v14; // eax@8
14778 const char *v15; // eax@14 14770 const char *v15; // eax@14
14779 unsigned int v16; // eax@16 14771 unsigned int v16; // eax@16
14780 unsigned int result; // eax@26 14772 unsigned int result; // eax@26
14781 const char *v18; // [sp-8h] [bp-40h]@9 14773 const char *v18; // [sp-8h] [bp-40h]@9
14782 const char *v19; // [sp-4h] [bp-3Ch]@2 14774 //const char *v19; // [sp-4h] [bp-3Ch]@2
14783 char *v20; // [sp-4h] [bp-3Ch]@9 14775 char *v20; // [sp-4h] [bp-3Ch]@9
14784 const char *v21; // [sp-4h] [bp-3Ch]@11 14776 const char *v21; // [sp-4h] [bp-3Ch]@11
14785 char pContainer[40]; // [sp+Ch] [bp-2Ch]@1 14777 char pContainer[40]; // [sp+Ch] [bp-2Ch]@1
14786 unsigned int v23; // [sp+34h] [bp-4h]@1 14778 unsigned int v23; // [sp+34h] [bp-4h]@1
14787 14779
14796 dword_591168_teleport_speedz = a8; 14788 dword_591168_teleport_speedz = a8;
14797 dword_591164_teleport_map_name = (char *)pLocationName; 14789 dword_591164_teleport_map_name = (char *)pLocationName;
14798 uCurrentHouse_Animation = v9; 14790 uCurrentHouse_Animation = v9;
14799 pEventTimer->Pause(); 14791 pEventTimer->Pause();
14800 pAudioPlayer->StopChannels(-1, -1); 14792 pAudioPlayer->StopChannels(-1, -1);
14801 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();
14802 sprintf(pContainer, "evt%02d", v11); 14802 sprintf(pContainer, "evt%02d", v11);
14803 if ( pParty->uAlignment ) 14803 if ( pParty->uAlignment )
14804 { 14804 {
14805 if ( pParty->uAlignment != 2 ) 14805 if ( pParty->uAlignment != 2 )
14806 goto LABEL_6; 14806 goto LABEL_6;
14808 } 14808 }
14809 else 14809 else
14810 { 14810 {
14811 v19 = "-b"; 14811 v19 = "-b";
14812 } 14812 }
14813 strcat(pContainer, v19); 14813 strcat(pContainer, v19);*/
14814 LABEL_6: 14814
14815 //LABEL_6:
14815 v12 = pIcons_LOD->LoadTexture(pContainer, TEXTURE_16BIT_PALETTE); 14816 v12 = pIcons_LOD->LoadTexture(pContainer, TEXTURE_16BIT_PALETTE);
14816 v13 = pHouse_ExitPictures[v10]; 14817 v13 = pHouse_ExitPictures[v10];
14817 pTexture_Dialogue_Background = &pIcons_LOD->pTextures[v12]; 14818 pTexture_Dialogue_Background = &pIcons_LOD->pTextures[v12];
14818 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)];
14819 if ( v9 ) 14820 if ( v9 )
15004 int v11; // ecx@17 15005 int v11; // ecx@17
15005 unsigned int v12; // kr00_4@25 15006 unsigned int v12; // kr00_4@25
15006 //Player *v13; // esi@25 15007 //Player *v13; // esi@25
15007 int v14; // eax@25 15008 int v14; // eax@25
15008 //Player *v15; // esi@27 15009 //Player *v15; // esi@27
15009 signed int v16; // eax@32 15010 //signed int v16; // eax@32
15010 unsigned int v17; // eax@37 15011 unsigned int v17; // eax@37
15011 signed int v18; // edi@37 15012 signed int v18; // edi@37
15012 signed int v19; // edi@41 15013 signed int v19; // edi@41
15013 //unsigned int v20; // ecx@41 15014 //unsigned int v20; // ecx@41
15014 const char *v22; // [sp-4h] [bp-40h]@33 15015 //const char *v22; // [sp-4h] [bp-40h]@33
15015 char pContainer[40]; // [sp+Ch] [bp-30h]@32 15016 char pContainer[40]; // [sp+Ch] [bp-30h]@32
15016 unsigned int v24; // [sp+34h] [bp-8h]@5 15017 unsigned int v24; // [sp+34h] [bp-8h]@5
15017 //enum HOUSE_TYPE v25; // [sp+38h] [bp-4h]@1 15018 //enum HOUSE_TYPE v25; // [sp+38h] [bp-4h]@1
15018 15019
15019 //v1 = uHouseID; 15020 //v1 = uHouseID;
15127 //v10 = v25; 15128 //v10 = v25;
15128 } 15129 }
15129 ++pIcons_LOD->uTexturePacksCount; 15130 ++pIcons_LOD->uTexturePacksCount;
15130 if ( !pIcons_LOD->uNumPrevLoadedFiles ) 15131 if ( !pIcons_LOD->uNumPrevLoadedFiles )
15131 pIcons_LOD->uNumPrevLoadedFiles = pIcons_LOD->uNumLoadedFiles; 15132 pIcons_LOD->uNumPrevLoadedFiles = pIcons_LOD->uNumLoadedFiles;
15132 v16 = const_2(); 15133
15134 /*v16 = const_2();
15133 sprintf(pContainer, "evt%02d", v16); 15135 sprintf(pContainer, "evt%02d", v16);
15134 if ( pParty->uAlignment ) 15136 if ( pParty->uAlignment )
15135 { 15137 {
15136 if ( pParty->uAlignment != 2 ) 15138 if ( pParty->uAlignment != 2 )
15137 goto LABEL_37; 15139 goto LABEL_37;
15139 } 15141 }
15140 else 15142 else
15141 { 15143 {
15142 v22 = "-b"; 15144 v22 = "-b";
15143 } 15145 }
15144 strcat(pContainer, v22); 15146 strcat(pContainer, v22);*/
15145 LABEL_37: 15147 //LABEL_37:
15148 switch (pParty->alignment)
15149 {
15150 case PartyAlignment_Good: sprintf(pContainer, "evt%02d-b", const_2()); break;
15151 case PartyAlignment_Neutral: sprintf(pContainer, "evt%02d", const_2()); break;
15152 case PartyAlignment_Evil: sprintf(pContainer, "evt%02d-c", const_2()); break;
15153 default: assert(false);
15154 }
15155
15146 v17 = pIcons_LOD->LoadTexture(pContainer, TEXTURE_16BIT_PALETTE); 15156 v17 = pIcons_LOD->LoadTexture(pContainer, TEXTURE_16BIT_PALETTE);
15147 array_5913D8[6] = 0; 15157 array_5913D8[6] = 0;
15148 pTexture_Dialogue_Background = &pIcons_LOD->pTextures[v17]; 15158 pTexture_Dialogue_Background = &pIcons_LOD->pTextures[v17];
15149 uTextureID_507B04 = uTextureID_right_panel; 15159 uTextureID_507B04 = uTextureID_right_panel;
15150 PrepareHouse(uHouseID); 15160 PrepareHouse(uHouseID);