Mercurial > mm7
changeset 802:319b35320760
Слияние
author | Ritor1 |
---|---|
date | Mon, 25 Mar 2013 14:29:08 +0600 |
parents | 5f0029b4bf09 (diff) 290afbd48b6b (current diff) |
children | d2deab4991fa |
files | |
diffstat | 1 files changed, 13 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/Events.cpp Mon Mar 25 09:17:42 2013 +0200 +++ b/Events.cpp Mon Mar 25 14:29:08 2013 +0600 @@ -338,12 +338,10 @@ memcpy(pSomeEVT_Events, pLevelEVT_Index, sizeof(EventIndex)*4400); } - v4 = 0; v124 = 0; //for (uint i = 0; i < uSomeEVT_NumEvents; ++i) // { - //v6 = v123; //v7 = ""; while ( 1 ) @@ -1040,8 +1038,7 @@ sub_4451A8_press_any_key(uEventID, v105, v121); LABEL_301: if ( v133 == 1 ) -LABEL_302: - OnMapLeave(); + OnMapLeave(); return; } v84 = _evt->v13 + ((_evt->v14 + ((_evt->v15 + ((uint)_evt->v16 << 8)) << 8)) << 8); @@ -1071,12 +1068,16 @@ case EVENT_ReceiveDamage: v85 = EVT_DWORD(_evt->v7 ); v86 = _evt->v5; - if ( (unsigned __int8)v86 <= 3u ) + if ( (unsigned __int8)v86 <= 3 ) { v119 = _evt->v6; v115 = EVT_DWORD(_evt->v7 ); v89 = (unsigned __int8)v86; - goto LABEL_233; + v88 = &pParty->pPlayers[v89]; + v88->ReceiveDamage(v115, v119); + ++curr_seq_num; + v4 = v124; + break; } if ( v86 == 4 ) { @@ -1092,16 +1093,17 @@ v119 = _evt->v6; v88 = pPlayers[uActiveCharacter]; v115 = EVT_DWORD(_evt->v7 ); - goto LABEL_234; + v88->ReceiveDamage(v115, v119); + ++curr_seq_num; + v4 = v124; + break; } if ( v86 != 5 ) { v119 = _evt->v6; v115 = EVT_DWORD(_evt->v7 ); v89 = rand() % 4; -LABEL_233: v88 = &pParty->pPlayers[v89]; -LABEL_234: v88->ReceiveDamage(v115, v119); ++curr_seq_num; v4 = v124; @@ -1372,7 +1374,8 @@ pDialogueWindow = 0; pIcons_LOD->_40F9C5(); } - goto LABEL_302; + OnMapLeave(); + return; } } ++curr_seq_num;