Mercurial > mm7

diff mm7_data.h @ 1905:4cae2d58cfb4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Слияние
author Ritor1
date Mon, 21 Oct 2013 17:24:10 +0600
parents 79ac2dbedfb9 436553b0603c
children 28fdf4e567ad
line wrap: on
line diff
--- a/mm7_data.h	Mon Oct 21 17:23:59 2013 +0600
+++ b/mm7_data.h	Mon Oct 21 17:24:10 2013 +0600
@@ -307,7 +307,6 @@
 extern int (__stdcall *off_4DAFDC)(char); // weak
 extern char asc_4DB724[]; // idb
 extern int dword_4DBD94; // weak
-extern std::array<int, 5> dword_4DF380; // weak
 extern int dword_4DF390; // weak
 extern char Str2[]; // idb
 
@@ -1283,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