Mercurial > mm7

diff mm7_3.cpp @ 1897:436553b0603c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
_46DF1A_collide_against_actor cleaned up, moved to Actor.h
author Grumpy7
date Sun, 20 Oct 2013 22:58:27 -0700
parents a86c60679949
children 4cae2d58cfb4
line wrap: on
line diff
--- a/mm7_3.cpp	Sun Oct 20 02:52:48 2013 -0700
+++ b/mm7_3.cpp	Sun Oct 20 22:58:27 2013 -0700
@@ -1093,7 +1093,7 @@
       for ( i = 0; v31 < ai_arrays_size; ++v31 )
       {
         v33 = ai_near_actors_ids[v31];
-        if ( v33 != v75 && _46DF1A_collide_against_actor(v33, 40) )
+        if ( v33 != v75 && Actor::_46DF1A_collide_against_actor(v33, 40) )
           ++i;
       }
       v71 = i > 1;
@@ -1833,7 +1833,7 @@
       _46E44E_collide_against_faces_and_portals(1u);
       _46E0B2_collide_against_decorations();
       for ( v80 = 0; v80 < (signed int)uNumActors; ++v80 )
-        _46DF1A_collide_against_actor(v80, 0);
+        Actor::_46DF1A_collide_against_actor(v80, 0);
       if ( _46F04E_collide_against_portals() )
         break;
       ++v73;
@@ -2685,7 +2685,7 @@
     _46E26D_collide_against_sprites(v38, v37);
     _46ED8A_collide_against_sprite_objects(4u);
     for ( i = 0; i < (signed int)uNumActors; ++i )
-      _46DF1A_collide_against_actor(i, 0);
+      Actor::_46DF1A_collide_against_actor(i, 0);
     if ( stru_721530.field_7C >= stru_721530.field_6C )
     {
       _angle_x = stru_721530.normal2.x;