Mercurial > mm7

comparison Actor.cpp @ 1493:9e9a12506d51

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
player detection partly working
author zipi
date Fri, 30 Aug 2013 22:23:54 +0100
parents 7ef4b64f6329
children 4ce525fe9ea9
comparison
equal deleted inserted replaced
1492:480b09200f88 1493:9e9a12506d51
3466 v12 = abs(_this->vPosition.z - actor->vPosition.z); 3466 v12 = abs(_this->vPosition.z - actor->vPosition.z);
3467 v19 = v12; 3467 v19 = v12;
3468 if ( v23 <= v11 3468 if ( v23 <= v11
3469 && v27 <= v11 3469 && v27 <= v11
3470 && v12 <= v11 3470 && v12 <= v11
3471 && sub_4070EF_prolly_collide_objects(PID(OBJECT_Actor, i), PID(OBJECT_Actor, uActorID)) 3471 && sub_4070EF_prolly_detect_player(PID(OBJECT_Actor, i), PID(OBJECT_Actor, uActorID))
3472 && v23 * v23 + v27 * v27 + v19 * v19 < (unsigned int)v25 ) 3472 && v23 * v23 + v27 * v27 + v19 * v19 < (unsigned int)v25 )
3473 { 3473 {
3474 v25 = v23 * v23 + v27 * v27 + v19 * v19; 3474 v25 = v23 * v23 + v27 * v27 + v19 * v19;
3475 v21 = i; 3475 v21 = i;
3476 } 3476 }