Mercurial > mm7
diff mm7_data.h @ 728:9f596a163257
Merge
author | Nomad |
---|---|
date | Fri, 22 Mar 2013 00:06:50 +0200 |
parents | da130dd3092a 9d13d2ec35a6 |
children | 79ad0526166c |
line wrap: on
line diff
--- a/mm7_data.h Fri Mar 22 00:02:31 2013 +0200 +++ b/mm7_data.h Fri Mar 22 00:06:50 2013 +0200 @@ -1559,9 +1559,9 @@ extern __int16 word_721040[]; // idb extern int dword_721110[]; // idb extern int dword_721160[]; // idb -extern int dword_7211B0[]; // idb +extern int odm_floor_level[20]; // idb dword_7211B0 extern int dword_721200[]; // idb -extern int dword_7212C8[]; // idb +extern int blv_floor_level[50]; // idb extern __int16 word_721390[]; // idb extern __int16 word_721460[]; // idb extern int blv_prev_party_x; // weak @@ -2151,8 +2151,8 @@ void __cdecl ODM_UpdateUserInputAndOther(); bool __fastcall _46BFFA_check_object_intercept(unsigned int uLayingItemID, signed int a2); void __cdecl _46CC4B_check_event_triggers(); -int _46CEC3_get_floor_level(int x, int y, int z, unsigned int uSectorID, unsigned int *pFaceID); -int __fastcall sub_46D49E_prolly_get_world_y_under_party(int a1, signed int a2, int a3, int a4, int *a5, int *a6, int a7); +int BLV_GetFloorLevel(int x, int y, int z, unsigned int uSectorID, unsigned int *pFaceID); +int __fastcall ODM_GetFloorLevel(int X, signed int Y, int Z, int a4, int *a5, int *a6, int a7); 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); @@ -2278,7 +2278,7 @@ struct Vec4_int_ *__thiscall sub_4AC277(unsigned int _this, Vec4_int_ *a2); struct Vec4_int_ *__thiscall sub_4AC33A_get_cpu_clocks_QPC(int _this, Vec4_int_ *a1); struct Vec4_int_ *__thiscall sub_4AC4FD_get_cpu_clocks_rdtsc(int _this, Vec4_int_ *a1); -int __fastcall sub_4AD504(unsigned int uFaceID); +int __fastcall sub_4AD504(signed int uFaceID); void __fastcall sub_4ADD1D(int uFaceID); int __fastcall sub_4AE1E7(int a1, int a2, int a3); int __fastcall sub_4AE313(int viewport_space_x, int viewport_space_y, struct stru337_stru0 *p);