Mercurial > mm7
comparison Events.cpp @ 1867:eb580660bbbb
Merge
author | Nomad |
---|---|
date | Wed, 16 Oct 2013 13:34:49 +0200 |
parents | a86c60679949 |
children | 140ca8123384 |
comparison
equal
deleted
inserted
replaced
1866:41cc4dd3c122 | 1867:eb580660bbbb |
---|---|
1186 | 1186 |
1187 //v6 = v123; | 1187 //v6 = v123; |
1188 //v7 = ""; | 1188 //v7 = ""; |
1189 break; | 1189 break; |
1190 } | 1190 } |
1191 v87 = pParty->pPlayers; | 1191 v87 = pParty->pPlayers.data(); |
1192 do | 1192 do |
1193 { | 1193 { |
1194 v87->ReceiveDamage(v85, (DAMAGE_TYPE)_evt->v6); | 1194 v87->ReceiveDamage(v85, (DAMAGE_TYPE)_evt->v6); |
1195 ++v87; | 1195 ++v87; |
1196 } | 1196 } |
1197 while ( (signed int)v87 < (signed int)pParty->pHirelings ); | 1197 while ( (signed int)v87 < (signed int)pParty->pHirelings.data() ); |
1198 ++curr_seq_num; | 1198 ++curr_seq_num; |
1199 v4 = v124; | 1199 v4 = v124; |
1200 | 1200 |
1201 //v6 = v123; | 1201 //v6 = v123; |
1202 //v7 = ""; | 1202 //v7 = ""; |