mm7: Mouse.cpp comparison

comparison Mouse.cpp @ 2098:7810cb3a5fb7

Popup window in MainMenu not shown

author	Ritor1
date	Fri, 13 Dec 2013 16:10:36 +0600
parents	52415f8bf7c2
children	7edf389d49fc

comparison

equal deleted inserted replaced

-:2b39f6b451f9
+:7810cb3a5fb7
 }
 //----- (00469BA3) --------------------------------------------------------
 void Mouse::ClearCursor()
 {
-Mouse *v1; // esi@1
+//Mouse *v1; // esi@1
-void *v2; // eax@1
+//void *v2; // eax@1
-void **v3; // esi@5
+//void **v3; // esi@5
-v1 = this;
+//v1 = this;
-v2 = this->pCursorBitmap_sysmem;
+//v2 = this->pCursorBitmap_sysmem;
 this->bActive = 0;
-if ( v2 )
+if ( this->pCursorBitmap_sysmem )
 {
-free(v2);
+free(this->pCursorBitmap_sysmem);
-v1->pCursorBitmap_sysmem = 0;
+this->pCursorBitmap_sysmem = 0;
 }
-if ( v1->pCursorBitmap2_sysmem )
+if ( this->pCursorBitmap2_sysmem )
 {
-free(v1->pCursorBitmap2_sysmem);
+free(this->pCursorBitmap2_sysmem);
-v1->pCursorBitmap2_sysmem = 0;
+this->pCursorBitmap2_sysmem = 0;
 }
-v3 = &v1->ptr_90;
+//v3 = &this->ptr_90;
-if ( *v3 )
+if ( this->ptr_90 )
-free(*v3);
+free(this->ptr_90);
-*v3 = 0;
+this->ptr_90 = 0;
 }
 //----- (00469BE6) --------------------------------------------------------
 void Mouse::AllocCursorSystemMem()
 {
 uMouseClickY = y;
 }
 //----- (004175C0) --------------------------------------------------------
 void UI_OnMouseLeftClick(int *pXY)
 {
-int *pXY_; // esi@1
 signed int y; // eax@7
 signed int x; // ecx@7
-signed int v4; // eax@11
 signed int v5; // eax@17
-signed int v6; // esi@19
+GUIButton *control; // esi@37
-int v7; // esi@30
-GUIWindow *v8; // edx@31
-GUIButton *i; // esi@37
 signed int v10; // eax@50
 int v11; // ecx@52
 unsigned int pX; // [sp+14h] [bp-8h]@7
 unsigned int pY; // [sp+18h] [bp-4h]@7
-pXY_ = pXY;
+if ( pCurrentScreen == SCREEN_VIDEO || sub_4637E0_is_there_popup_onscreen() )
-if ( pCurrentScreen == SCREEN_VIDEO
-|| sub_4637E0_is_there_popup_onscreen() )
 return;
 if ( pGUIWindow2 && pGUIWindow2->ptr_1C == (void *)33 )
 {
 sub_4452BB();
 return;
 }
-if ( pXY_ )
+if ( pXY )
 {
-x = *pXY_;
+x = *pXY;
-y = pXY_[1];
+y = pXY[1];
-pX = *pXY_;
+pX = *pXY;
 pY = y;
 }
 else
 {
 pMouse->GetClickPos(&pX, &pY);
 y = pY;
 x = pX;
 }
 extern bool _507B98_ctrl_pressed;
-if ( pCurrentScreen != SCREEN_GAME || !_507B98_ctrl_pressed ) // stealing cursor
-goto LABEL_30;
-v4 = GetCurrentMenuID();
 x = pX;
-if ( v4 != -1
+if ( GetCurrentMenuID() != -1 || pCurrentScreen != SCREEN_GAME || !_507B98_ctrl_pressed // stealing cursor
-|| (signed int)pX < (signed int)pViewport->uViewportTL_X
+|| (signed int)pX < (signed int)pViewport->uViewportTL_X || (signed int)pX > (signed int)pViewport->uViewportBR_X
-|| (signed int)pX > (signed int)pViewport->uViewportBR_X )
+|| (signed int)pY < (signed int)pViewport->uViewportTL_Y || (signed int)pY > (signed int)pViewport->uViewportBR_Y)
 {
 y = pY;
-LABEL_30:
+for ( int i = uNumVisibleWindows; i >= 0; --i )
-v7 = uNumVisibleWindows;
+{
-if ( uNumVisibleWindows < 0 )
+if ( x >= (signed int)pWindowList[pVisibleWindowsIdxs[i] - 1].uFrameX && x <= (signed int)pWindowList[pVisibleWindowsIdxs[i] - 1].uFrameZ
-return;
+&& y >= (signed int)pWindowList[pVisibleWindowsIdxs[i] - 1].uFrameY && y <= (signed int)pWindowList[pVisibleWindowsIdxs[i] - 1].uFrameW )
-while ( 1 )
+{
-{
+for ( control = pWindowList[pVisibleWindowsIdxs[i] - 1].pControlsHead; control; control = control->pNext )
-//v8 = (GUIWindow *)&pWindowList_at_506F50_minus1_indexing[21 * pVisibleWindowsIdxs[v7]];
+{
-v8 = &pWindowList[pVisibleWindowsIdxs[v7] - 1];
+if ( control->uButtonType == 1 )
-if ( x >= (signed int)v8->uFrameX )
+{
-{
+if ( x >= (signed int)control->uX && x <= (signed int)control->uZ && y >= (signed int)control->uY && y <= (signed int)control->uW )
-if ( x <= (signed int)v8->uFrameZ && y >= (signed int)v8->uFrameY && y <= (signed int)v8->uFrameW )
+{
-break;
+control->field_2C_is_pushed = 1;
-}
+v10 = pMessageQueue_50CBD0->uNumMessages;
---v7;
+if ( pMessageQueue_50CBD0->uNumMessages )
-if ( v7 < 0 )
+{
-return;
+v10 = pMessageQueue_50CBD0->pMessages[0].field_8 != 0;
-}
+pMessageQueue_50CBD0->uNumMessages = pMessageQueue_50CBD0->pMessages[0].field_8 != 0;
-for ( i = v8->pControlsHead; ; i = i->pNext )
+}
-{
+pMessageQueue_50CBD0->AddMessage(control->msg, control->msg_param, 0);
-if ( !i )
+return;
-return;
+}
-if ( i->uButtonType == 1 )
+continue;
-goto LABEL_41;
+}
-if ( i->uButtonType != 2 )
+if ( control->uButtonType == 2 )//����� ��������� �� �������� ������
-break;
+{
-if ( (signed int)(signed __int64)sqrt((double)((x - i->uX) * (x - i->uX) + (y - i->uY) * (y - i->uY))) < (signed int)i->uWidth )
+if ( (signed int)(signed __int64)sqrt((double)((x - control->uX) * (x - control->uX) + (y - control->uY) * (y - control->uY))) < (signed int)control->uWidth )
-goto LABEL_50;
+{
-y = pY;
+control->field_2C_is_pushed = 1;
-x = pX;
+v10 = pMessageQueue_50CBD0->uNumMessages;
-LABEL_45:
+if ( pMessageQueue_50CBD0->uNumMessages )
-;
+{
-}
+v10 = pMessageQueue_50CBD0->pMessages[0].field_8 != 0;
-if ( i->uButtonType != 3 )
+pMessageQueue_50CBD0->uNumMessages = pMessageQueue_50CBD0->pMessages[0].field_8 != 0;
-goto LABEL_45;
+}
-LABEL_41:
+pMessageQueue_50CBD0->AddMessage(control->msg, control->msg_param, 0);
-if ( x >= (signed int)i->uX && x <= (signed int)i->uZ && y >= (signed int)i->uY && y <= (signed int)i->uW )
+return;
-{
+}
-LABEL_50:
+continue;
-i->field_2C_is_pushed = 1;
+}
-v10 = pMessageQueue_50CBD0->uNumMessages;
+if ( control->uButtonType == 3 )//����� ��������� �� ������
-if ( pMessageQueue_50CBD0->uNumMessages )
+{
-{
+if ( x >= (signed int)control->uX && x <= (signed int)control->uZ && y >= (signed int)control->uY && y <= (signed int)control->uW )
-v10 = pMessageQueue_50CBD0->pMessages[0].field_8 != 0;
+{
-pMessageQueue_50CBD0->uNumMessages = pMessageQueue_50CBD0->pMessages[0].field_8 != 0;
+control->field_2C_is_pushed = 1;
-}
+v10 = pMessageQueue_50CBD0->uNumMessages;
-//v11 = i->uControlParam;
+if ( pMessageQueue_50CBD0->uNumMessages )
-pMessageQueue_50CBD0->AddMessage(i->msg, i->msg_param, 0);
+{
-return;
+v10 = pMessageQueue_50CBD0->pMessages[0].field_8 != 0;
-}
+pMessageQueue_50CBD0->uNumMessages = pMessageQueue_50CBD0->pMessages[0].field_8 != 0;
-goto LABEL_45;
+}
+pMessageQueue_50CBD0->AddMessage(control->msg, control->msg_param, 0);
+return;
+}
+continue;
+}
+y = pY;
+x = pX;
+}
+}
+}
+return;
 }
 y = pY;
-if ( (signed int)pY < (signed int)pViewport->uViewportTL_Y || (signed int)pY > (signed int)pViewport->uViewportBR_Y )
-goto LABEL_30;
 if ( pRenderer->pRenderD3D )
 v5 = pGame->pVisInstance->get_picked_object_zbuf_val();
 else
 v5 = pRenderer->pActiveZBuffer[pX + pSRZBufferLineOffsets[pY]];
-v6 = (unsigned __int16)v5;
+uint type = PID_TYPE((unsigned __int16)v5);
-uint type = PID_TYPE(v6);
+if (type == OBJECT_Actor && uActiveCharacter && v5 < 0x2000000
-if (type == OBJECT_Actor
+&& pPlayers[uActiveCharacter]->CanAct() && pPlayers[uActiveCharacter]->CanSteal() )
-&& uActiveCharacter
-&& v5 < 0x2000000
-&& pPlayers[uActiveCharacter]->CanAct()
-&& pPlayers[uActiveCharacter]->CanSteal() )
 {
 /*if ( (signed int)pMessageQueue_50CBD0->uNumMessages < 40 )
 {
 pMessageQueue_50CBD0->pMessages[pMessageQueue_50CBD0->uNumMessages].eType = UIMSG_1B;
 pMessageQueue_50CBD0->pMessages[pMessageQueue_50CBD0->uNumMessages].param = v6 >> 3;
 *(&pMessageQueue_50CBD0->uNumMessages + 3 * pMessageQueue_50CBD0->uNumMessages + 3) = 0;
 ++pMessageQueue_50CBD0->uNumMessages;
 }*/
-pMessageQueue_50CBD0->AddMessage(UIMSG_STEALFROMACTOR, PID_ID(v6), 0);
+pMessageQueue_50CBD0->AddMessage(UIMSG_STEALFROMACTOR, PID_ID((unsigned __int16)v5), 0);
 if ( pParty->bTurnBasedModeOn == 1 )
 {
 if ( pTurnEngine->turn_stage == 3 )
 pTurnEngine->field_18 |= TE_FLAG_8;

Mercurial > mm7

comparison Mouse.cpp @ 2098:7810cb3a5fb7