Mercurial > mm7

diff mm7_data.h @ 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 b6a7410ff0ef
children 4cae2d58cfb4
line wrap: on
line diff
--- a/mm7_data.h	Sun Oct 20 02:52:48 2013 -0700
+++ b/mm7_data.h	Sun Oct 20 22:58:27 2013 -0700
@@ -1282,7 +1282,6 @@
 int __fastcall sub_46D8E3(int a1, signed int a2, int a3, int a4);
 void ODM_GetTerrainNormalAt(int pos_x, int pos_z, Vec3_int_ *out);
 unsigned int __fastcall sub_46DEF2(signed int a2, unsigned int uLayingItemID);
-int __fastcall _46DF1A_collide_against_actor(int, int); // weak
 void _46E0B2_collide_against_decorations();
 void __fastcall _46E26D_collide_against_sprites(signed int a1, signed int a2);
 int _46E44E_collide_against_faces_and_portals(unsigned int b1); // idb