comparison mm7_data.h @ 1905:4cae2d58cfb4

Слияние
author Ritor1
date Mon, 21 Oct 2013 17:24:10 +0600
parents 79ac2dbedfb9 436553b0603c
children 28fdf4e567ad
comparison
equal deleted inserted replaced
1904:1a1c4040bee4 1905:4cae2d58cfb4
305 extern int dword_4D86D8; // weak 305 extern int dword_4D86D8; // weak
306 extern int dword_4DAFCC; // weak 306 extern int dword_4DAFCC; // weak
307 extern int (__stdcall *off_4DAFDC)(char); // weak 307 extern int (__stdcall *off_4DAFDC)(char); // weak
308 extern char asc_4DB724[]; // idb 308 extern char asc_4DB724[]; // idb
309 extern int dword_4DBD94; // weak 309 extern int dword_4DBD94; // weak
310 extern std::array<int, 5> dword_4DF380; // weak
311 extern int dword_4DF390; // weak 310 extern int dword_4DF390; // weak
312 extern char Str2[]; // idb 311 extern char Str2[]; // idb
313 312
314 313
315 extern float flt_4D84E8; 314 extern float flt_4D84E8;
1281 int BLV_GetFloorLevel(int x, int y, int z, unsigned int uSectorID, unsigned int *pFaceID); 1280 int BLV_GetFloorLevel(int x, int y, int z, unsigned int uSectorID, unsigned int *pFaceID);
1282 int ODM_GetFloorLevel(int X, signed int Y, int Z, int, int *pOnWater, int *bmodel_pid, int bWaterWalk); 1281 int ODM_GetFloorLevel(int X, signed int Y, int Z, int, int *pOnWater, int *bmodel_pid, int bWaterWalk);
1283 int __fastcall sub_46D8E3(int a1, signed int a2, int a3, int a4); 1282 int __fastcall sub_46D8E3(int a1, signed int a2, int a3, int a4);
1284 void ODM_GetTerrainNormalAt(int pos_x, int pos_z, Vec3_int_ *out); 1283 void ODM_GetTerrainNormalAt(int pos_x, int pos_z, Vec3_int_ *out);
1285 unsigned int __fastcall sub_46DEF2(signed int a2, unsigned int uLayingItemID); 1284 unsigned int __fastcall sub_46DEF2(signed int a2, unsigned int uLayingItemID);
1286 int __fastcall _46DF1A_collide_against_actor(int, int); // weak
1287 void _46E0B2_collide_against_decorations(); 1285 void _46E0B2_collide_against_decorations();
1288 void __fastcall _46E26D_collide_against_sprites(signed int a1, signed int a2); 1286 void __fastcall _46E26D_collide_against_sprites(signed int a1, signed int a2);
1289 int _46E44E_collide_against_faces_and_portals(unsigned int b1); // idb 1287 int _46E44E_collide_against_faces_and_portals(unsigned int b1); // idb
1290 int __fastcall _46E889_collide_against_bmodels(unsigned int ecx0); 1288 int __fastcall _46E889_collide_against_bmodels(unsigned int ecx0);
1291 int collide_against_floor(int x, int y, int z, unsigned int *pSectorID, unsigned int *pFaceID); // idb 1289 int collide_against_floor(int x, int y, int z, unsigned int *pSectorID, unsigned int *pFaceID); // idb