Mercurial > mm7

comparison mm7_5.cpp @ 274:a9f58ca01454

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Слияние
author Ritor1
date Mon, 18 Feb 2013 16:37:17 +0600
parents e5afd6848268 6e585f21a01e
children 250e49fef6f6
comparison
equal deleted inserted replaced
273:e5afd6848268 274:a9f58ca01454
2727 stru_50C198.LootActor(&pActors[uMessageParam]); 2727 stru_50C198.LootActor(&pActors[uMessageParam]);
2728 else 2728 else
2729 Actor::StealFrom(uMessageParam); 2729 Actor::StealFrom(uMessageParam);
2730 } 2730 }
2731 continue; 2731 continue;
2732 case 0x17: 2732
2733 case UIMSG_Attack:
2733 if ( !uActiveCharacter ) 2734 if ( !uActiveCharacter )
2734 //goto LABEL_90; 2735 //goto LABEL_90;
2735 { 2736 {
2736 v1 = ""; 2737 v1 = "";
2737 v0 = 1; 2738 v0 = 1;
16514 { 16515 {
16515 pMouse->GetClickPos(&pX, &pY); 16516 pMouse->GetClickPos(&pX, &pY);
16516 y = pY; 16517 y = pY;
16517 x = pX; 16518 x = pX;
16518 } 16519 }
16519 if ( pCurrentScreen 16520 if ( pCurrentScreen != SCREEN_GAME || !dword_507B98_ctrl_pressed )
16520 || !dword_507B98_ctrl_pressed )
16521 goto LABEL_30; 16521 goto LABEL_30;
16522 v4 = GetCurrentMenuID(); 16522 v4 = GetCurrentMenuID();
16523 x = pX; 16523 x = pX;
16524 if ( (v4 & 0x80000000u) == 0 16524 if ( (v4 & 0x80000000u) == 0
16525 || (signed int)pX < (signed int)pViewport->uViewportX 16525 || (signed int)pX < (signed int)pViewport->uViewportX
16562 goto LABEL_45; 16562 goto LABEL_45;
16563 LABEL_41: 16563 LABEL_41:
16564 if ( x >= (signed int)i->uX && x <= (signed int)i->uZ && y >= (signed int)i->uY && y <= (signed int)i->uW ) 16564 if ( x >= (signed int)i->uX && x <= (signed int)i->uZ && y >= (signed int)i->uY && y <= (signed int)i->uW )
16565 { 16565 {
16566 LABEL_50: 16566 LABEL_50:
16567 i->field_2C = 1; 16567 i->field_2C_is_pushed = 1;
16568 v10 = pMessageQueue_50CBD0->uNumMessages; 16568 v10 = pMessageQueue_50CBD0->uNumMessages;
16569 if ( pMessageQueue_50CBD0->uNumMessages ) 16569 if ( pMessageQueue_50CBD0->uNumMessages )
16570 { 16570 {
16571 v10 = pMessageQueue_50CBD0->pMessages[0].field_8 != 0; 16571 v10 = pMessageQueue_50CBD0->pMessages[0].field_8 != 0;
16572 pMessageQueue_50CBD0->uNumMessages = pMessageQueue_50CBD0->pMessages[0].field_8 != 0; 16572 pMessageQueue_50CBD0->uNumMessages = pMessageQueue_50CBD0->pMessages[0].field_8 != 0;