Mercurial > mm7

comparison Events.cpp @ 1039:682ba1c83fd3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Nomad
date Thu, 23 May 2013 03:32:36 +0200
parents 39f42990698f 7f8be9f9769e
children d48c762de563
comparison
equal deleted inserted replaced
1038:39f42990698f 1039:682ba1c83fd3
1029 { 1029 {
1030 v119 = _evt->v6; 1030 v119 = _evt->v6;
1031 v115 = EVT_DWORD(_evt->v7 ); 1031 v115 = EVT_DWORD(_evt->v7 );
1032 v89 = (unsigned __int8)v86; 1032 v89 = (unsigned __int8)v86;
1033 v88 = &pParty->pPlayers[v89]; 1033 v88 = &pParty->pPlayers[v89];
1034 v88->ReceiveDamage(v115, v119); 1034 v88->ReceiveDamage(v115, (DAMAGE_TYPE)v119);
1035 ++curr_seq_num; 1035 ++curr_seq_num;
1036 v4 = v124; 1036 v4 = v124;
1037 break; 1037 break;
1038 } 1038 }
1039 if ( v86 == 4 ) 1039 if ( v86 == 4 )
1048 break; 1048 break;
1049 } 1049 }
1050 v119 = _evt->v6; 1050 v119 = _evt->v6;
1051 v88 = pPlayers[uActiveCharacter]; 1051 v88 = pPlayers[uActiveCharacter];
1052 v115 = EVT_DWORD(_evt->v7 ); 1052 v115 = EVT_DWORD(_evt->v7 );
1053 v88->ReceiveDamage(v115, v119); 1053 v88->ReceiveDamage(v115, (DAMAGE_TYPE)v119);
1054 ++curr_seq_num; 1054 ++curr_seq_num;
1055 v4 = v124; 1055 v4 = v124;
1056 break; 1056 break;
1057 } 1057 }
1058 if ( v86 != 5 ) 1058 if ( v86 != 5 )
1059 { 1059 {
1060 v119 = _evt->v6; 1060 v119 = _evt->v6;
1061 v115 = EVT_DWORD(_evt->v7 ); 1061 v115 = EVT_DWORD(_evt->v7 );
1062 v89 = rand() % 4; 1062 v89 = rand() % 4;
1063 v88 = &pParty->pPlayers[v89]; 1063 v88 = &pParty->pPlayers[v89];
1064 v88->ReceiveDamage(v115, v119); 1064 v88->ReceiveDamage(v115, (DAMAGE_TYPE)v119);
1065 ++curr_seq_num; 1065 ++curr_seq_num;
1066 v4 = v124; 1066 v4 = v124;
1067 1067
1068 //v6 = v123; 1068 //v6 = v123;
1069 //v7 = ""; 1069 //v7 = "";
1070 break; 1070 break;
1071 } 1071 }
1072 v87 = pParty->pPlayers; 1072 v87 = pParty->pPlayers;
1073 do 1073 do
1074 { 1074 {
1075 v87->ReceiveDamage(v85, _evt->v6); 1075 v87->ReceiveDamage(v85, (DAMAGE_TYPE)_evt->v6);
1076 ++v87; 1076 ++v87;
1077 } 1077 }
1078 while ( (signed int)v87 < (signed int)pParty->pHirelings ); 1078 while ( (signed int)v87 < (signed int)pParty->pHirelings );
1079 ++curr_seq_num; 1079 ++curr_seq_num;
1080 v4 = v124; 1080 v4 = v124;