Mercurial > might-and-magic-trilogy
diff mm7_data.h @ 81:517e33e08d93
Слияние
author | Ritor1 |
---|---|
date | Sun, 28 Oct 2012 22:13:41 +0600 |
parents | 8b0c4d626477 |
children | f9a33f75bae3 |
line wrap: on
line diff
--- a/mm7_data.h Sun Oct 28 22:13:23 2012 +0600 +++ b/mm7_data.h Sun Oct 28 22:13:41 2012 +0600 @@ -2939,7 +2939,7 @@ void __cdecl ODM_UpdateUserInputAndOther(); bool __fastcall _46BFFA_check_object_intercept(unsigned int uLayingItemID, signed int a2); void __cdecl _46CC4B_check_event_triggers(); -int __fastcall _46CEC3_get_floor_level(signed int a1, signed int a2, int a3, unsigned int uSectorID, unsigned int *pFaceID); +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 __fastcall sub_46D8E3(int a1, signed int a2, int a3, int a4); signed __int64 __fastcall _46DCC8_get_gravity_direction_outdoor(int a1, int a2, Vec3_int_ *a3);