Mercurial > mm7
comparison mm7_data.h @ 728:9f596a163257
Merge
author | Nomad |
---|---|
date | Fri, 22 Mar 2013 00:06:50 +0200 |
parents | da130dd3092a 9d13d2ec35a6 |
children | 79ad0526166c |
comparison
equal
deleted
inserted
replaced
727:da130dd3092a | 728:9f596a163257 |
---|---|
1557 extern int dword_720F20[20]; | 1557 extern int dword_720F20[20]; |
1558 extern __int16 word_720F70[]; // idb | 1558 extern __int16 word_720F70[]; // idb |
1559 extern __int16 word_721040[]; // idb | 1559 extern __int16 word_721040[]; // idb |
1560 extern int dword_721110[]; // idb | 1560 extern int dword_721110[]; // idb |
1561 extern int dword_721160[]; // idb | 1561 extern int dword_721160[]; // idb |
1562 extern int dword_7211B0[]; // idb | 1562 extern int odm_floor_level[20]; // idb dword_7211B0 |
1563 extern int dword_721200[]; // idb | 1563 extern int dword_721200[]; // idb |
1564 extern int dword_7212C8[]; // idb | 1564 extern int blv_floor_level[50]; // idb |
1565 extern __int16 word_721390[]; // idb | 1565 extern __int16 word_721390[]; // idb |
1566 extern __int16 word_721460[]; // idb | 1566 extern __int16 word_721460[]; // idb |
1567 extern int blv_prev_party_x; // weak | 1567 extern int blv_prev_party_x; // weak |
1568 extern int blv_prev_party_z; // weak | 1568 extern int blv_prev_party_z; // weak |
1569 extern int blv_prev_party_y; // weak | 1569 extern int blv_prev_party_y; // weak |
2149 void __cdecl sub_46BDC0_UpdateUserInput_and_MapSpecificStuff(); | 2149 void __cdecl sub_46BDC0_UpdateUserInput_and_MapSpecificStuff(); |
2150 void __cdecl BLV_UpdateUserInputAndOther(); | 2150 void __cdecl BLV_UpdateUserInputAndOther(); |
2151 void __cdecl ODM_UpdateUserInputAndOther(); | 2151 void __cdecl ODM_UpdateUserInputAndOther(); |
2152 bool __fastcall _46BFFA_check_object_intercept(unsigned int uLayingItemID, signed int a2); | 2152 bool __fastcall _46BFFA_check_object_intercept(unsigned int uLayingItemID, signed int a2); |
2153 void __cdecl _46CC4B_check_event_triggers(); | 2153 void __cdecl _46CC4B_check_event_triggers(); |
2154 int _46CEC3_get_floor_level(int x, int y, int z, unsigned int uSectorID, unsigned int *pFaceID); | 2154 int BLV_GetFloorLevel(int x, int y, int z, unsigned int uSectorID, unsigned int *pFaceID); |
2155 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); | 2155 int __fastcall ODM_GetFloorLevel(int X, signed int Y, int Z, int a4, int *a5, int *a6, int a7); |
2156 int __fastcall sub_46D8E3(int a1, signed int a2, int a3, int a4); | 2156 int __fastcall sub_46D8E3(int a1, signed int a2, int a3, int a4); |
2157 void ODM_GetTerrainNormalAt(int pos_x, int pos_z, Vec3_int_ *out); | 2157 void ODM_GetTerrainNormalAt(int pos_x, int pos_z, Vec3_int_ *out); |
2158 unsigned int __fastcall sub_46DEF2(signed int a2, unsigned int uLayingItemID); | 2158 unsigned int __fastcall sub_46DEF2(signed int a2, unsigned int uLayingItemID); |
2159 int __fastcall _46DF1A_collide_against_actor(int, int); // weak | 2159 int __fastcall _46DF1A_collide_against_actor(int, int); // weak |
2160 void __cdecl _46E0B2_collide_against_decorations(); | 2160 void __cdecl _46E0B2_collide_against_decorations(); |
2276 void __cdecl PlayLevelMusic(); | 2276 void __cdecl PlayLevelMusic(); |
2277 int __thiscall sub_4AC1C9(unsigned int _this, Vec4_int_ *a2); | 2277 int __thiscall sub_4AC1C9(unsigned int _this, Vec4_int_ *a2); |
2278 struct Vec4_int_ *__thiscall sub_4AC277(unsigned int _this, Vec4_int_ *a2); | 2278 struct Vec4_int_ *__thiscall sub_4AC277(unsigned int _this, Vec4_int_ *a2); |
2279 struct Vec4_int_ *__thiscall sub_4AC33A_get_cpu_clocks_QPC(int _this, Vec4_int_ *a1); | 2279 struct Vec4_int_ *__thiscall sub_4AC33A_get_cpu_clocks_QPC(int _this, Vec4_int_ *a1); |
2280 struct Vec4_int_ *__thiscall sub_4AC4FD_get_cpu_clocks_rdtsc(int _this, Vec4_int_ *a1); | 2280 struct Vec4_int_ *__thiscall sub_4AC4FD_get_cpu_clocks_rdtsc(int _this, Vec4_int_ *a1); |
2281 int __fastcall sub_4AD504(unsigned int uFaceID); | 2281 int __fastcall sub_4AD504(signed int uFaceID); |
2282 void __fastcall sub_4ADD1D(int uFaceID); | 2282 void __fastcall sub_4ADD1D(int uFaceID); |
2283 int __fastcall sub_4AE1E7(int a1, int a2, int a3); | 2283 int __fastcall sub_4AE1E7(int a1, int a2, int a3); |
2284 int __fastcall sub_4AE313(int viewport_space_x, int viewport_space_y, struct stru337_stru0 *p); | 2284 int __fastcall sub_4AE313(int viewport_space_x, int viewport_space_y, struct stru337_stru0 *p); |
2285 int __fastcall sub_4AE491(int, int); // weak | 2285 int __fastcall sub_4AE491(int, int); // weak |
2286 void __fastcall sub_4AE5F1(unsigned int uFaceID); // idb | 2286 void __fastcall sub_4AE5F1(unsigned int uFaceID); // idb |