Mercurial > mm7
comparison Indoor.cpp @ 322:ce39b96acf5c
Killing friendly peasants subs
author | Nomad |
---|---|
date | Wed, 20 Feb 2013 04:36:14 +0200 |
parents | 922a96fdcc86 |
children | d720a13e2273 |
comparison
equal
deleted
inserted
replaced
321:15decc249a94 | 322:ce39b96acf5c |
---|---|
4155 { | 4155 { |
4156 v26 = v54; | 4156 v26 = v54; |
4157 v27 = abs(pActors[v54].vPosition.z - v0->vPosition.z); | 4157 v27 = abs(pActors[v54].vPosition.z - v0->vPosition.z); |
4158 v28 = abs(pActors[v26].vPosition.y - v0->vPosition.y); | 4158 v28 = abs(pActors[v26].vPosition.y - v0->vPosition.y); |
4159 v29 = abs(pActors[v26].vPosition.x - v0->vPosition.x); | 4159 v29 = abs(pActors[v26].vPosition.x - v0->vPosition.x); |
4160 if ( sub_4621DA(v29, v28, v27) >= v0->uActorRadius + (signed int)pActors[v26].uActorRadius | 4160 if ( int_get_vector_length(v29, v28, v27) >= v0->uActorRadius + (signed int)pActors[v26].uActorRadius |
4161 && _46DF1A_collide_against_actor(v54, 40) ) | 4161 && _46DF1A_collide_against_actor(v54, 40) ) |
4162 ++v58; | 4162 ++v58; |
4163 v22 = 0; | 4163 v22 = 0; |
4164 } | 4164 } |
4165 v25 = v56++ + 1; | 4165 v25 = v56++ + 1; |