Mercurial > mm7
diff mm7_data.h @ 783:b27dd658ea77
Taveling by foot fixed.
author | Nomad |
---|---|
date | Sun, 24 Mar 2013 21:14:28 +0200 |
parents | 64cef5a0782a |
children | 83a58d185d3c |
line wrap: on
line diff
--- a/mm7_data.h Sun Mar 24 00:33:27 2013 +0200 +++ b/mm7_data.h Sun Mar 24 21:14:28 2013 +0200 @@ -799,171 +799,10 @@ extern unsigned int saveload_dlg_ws[2]; extern int dword_4E98BC_bApplicationActive; // weak extern char *pTransitionStrings[]; // 4EB080 -extern char aAwards_txt[]; // idb -extern char aScroll_txt[]; // idb -extern char aMerchant_txt[]; // idb -extern char aTrans_txt[]; // idb -extern char aTeacher[]; // idb -extern char aObelisk[]; // idb -extern char aSeer[]; // idb -extern char aStat[]; // idb -extern char aPotion[]; // idb -extern char aAutonote_txt[]; // idb -extern char aQuests_txt[]; // idb -extern char aNpcdist_txt[]; // idb -extern char aNpctopic_txt[]; // idb -extern char aNpctext_txt[]; // idb -extern char aNpcnews_txt[]; // idb -extern char aNpcgroup_txt[]; // idb -extern char aNpcgreet_txt[]; // idb -extern char aNpcdata_txt[]; // idb -extern char aNpcprof_txt[]; // idb -extern char aNpcnames_txt[]; // idb -extern char aD3dVersionOfRe[]; // idb -extern char aEWorkMsdevM_16[]; // idb -extern char aLevels_0[]; // idb -extern char aDmap[]; // idb -extern char aAmap[]; // idb -extern char aTmap[]; // idb -extern char aHmap[]; // idb extern int dword_4EC268[]; // weak extern int dword_4EC28C[]; // weak extern int dword_4EC2A8; // weak extern int dword_4EC2AC; // weak -extern char aInvalidGroundT[]; // idb -extern char aInvalidSkyTexH[]; // idb -extern char aIdlist[]; // idb -extern char aOmap[]; // idb -extern char aCmap[]; // idb -extern char aMm6OutdoorV1_0[]; // idb -extern char aI6_odm[]; // idb -extern char aBlank[]; // idb -extern char aHm005[]; // idb -extern char aSky043[]; // idb -extern char aDefault_odm[]; // idb -extern char aPlansky3[]; // idb -extern char aPlanskyD[]; // idb -extern char a_ddm[5]; // weak -extern char aCanTLoadFile[]; // idb -extern char aEWorkMsdevM_17[]; // idb -extern char a_odm[]; // idb -extern char aUnableToFindSI[]; // idb -extern char aSpawn[]; // idb -extern char aBddata[]; // idb -extern char aTernorm[]; // idb -extern char aGrastyl[]; // idb -extern char aOut09_odm[]; // idb -extern char aNewedges[]; // idb -extern char aSurfs[]; // idb -extern char aEdges[]; // idb -extern char aSpans[]; // idb -extern char aTheTextureFram[]; // idb -extern char aEWorkMsdevM_18[]; // idb -extern char aWtrtyla[]; // idb -extern char aWtrtyl[]; // idb -extern char aUnableToSave_1[]; // idb -extern char aDataDtile_bin[]; // idb -extern char aTileDescrip[]; // idb -extern char aTtattr_transit[]; // idb -extern char aTtattr_nodraw[]; // idb -extern char aTtattr_wave[]; // idb -extern char aTtattr_flat[]; // idb -extern char aTtattr_repulse[]; // idb -extern char aTtattr_block[]; // idb -extern char aTtattr_water2[]; // idb -extern char aTtattr_water[]; // idb -extern char aTtattr_burn[]; // idb -extern char aTtsect_dnw[]; // idb -extern char aTtsect_dse[]; // idb -extern char aTtsect_dne[]; // idb -extern char aTtsect_dsw[]; // idb -extern char aTtsect_de[]; // idb -extern char aTtsect_dw[]; // idb -extern char aTtsect_ds[]; // idb -extern char aTtsect_dn[]; // idb -extern char aTtsect_wcap[]; // idb -extern char aTtsect_scap[]; // idb -extern char aTtsect_ecap[]; // idb -extern char aTtsect_ncap[]; // idb -extern char aTtsect_ew_s[]; // idb -extern char aTtsect_ew_n[]; // idb -extern char aTtsect_ns_w[]; // idb -extern char aTtsect_ns_e[]; // idb -extern char aTtsect_s_w[]; // idb -extern char aTtsect_s_e[]; // idb -extern char aTtsect_n_w[]; // idb -extern char aTtsect_n_e[]; // idb -extern char aTtsect_ew[]; // idb -extern char aTtsect_ns[]; // idb -extern char aTtsect_cros[]; // idb -extern char aTtsect_xsw1[]; // idb -extern char aTtsect_xse1[]; // idb -extern char aTtsect_xnw1[]; // idb -extern char aTtsect_xne1[]; // idb -extern char aTtsect_s1[]; // idb -extern char aTtsect_n1[]; // idb -extern char aTtsect_w1[]; // idb -extern char aTtsect_e1[]; // idb -extern char aTtsect_sw1[]; // idb -extern char aTtsect_se1[]; // idb -extern char aTtsect_nw1[]; // idb -extern char aTtsect_ne1[]; // idb -extern char aTtsect_speci_6[]; // idb -extern char aTtsect_speci_5[]; // idb -extern char aTtsect_speci_4[]; // idb -extern char aTtsect_speci_3[]; // idb -extern char aTtsect_speci_2[]; // idb -extern char aTtsect_speci_1[]; // idb -extern char aTtsect_speci_0[]; // idb -extern char aTtsect_special[]; // idb -extern char aTtsect_base4[]; // idb -extern char aTtsect_base3[]; // idb -extern char aTtsect_base2[]; // idb -extern char aTtsect_base1[]; // idb -extern char aTtsect_start[]; // idb -extern char aTtsect_null[]; // idb -extern char aTttype_roadcit[]; // idb -extern char aTttype_roads_2[]; // idb -extern char aTttype_roadsno[]; // idb -extern char aTttype_roadt_0[]; // idb -extern char aTttype_roadtro[]; // idb -extern char aTttype_roads_1[]; // idb -extern char aTttype_roadswa[]; // idb -extern char aTttype_roadv_0[]; // idb -extern char aTttype_roadvol[]; // idb -extern char aTttype_roads_0[]; // idb -extern char aTttype_roadsan[]; // idb -extern char aTttype_roadc_0[]; // idb -extern char aTttype_roadcra[]; // idb -extern char aTttype_roadg_0[]; // idb -extern char aTttype_roadgra[]; // idb -extern char aTttype_city[]; // idb -extern char aTttype_swamp[]; // idb -extern char aTttype_tropica[]; // idb -extern char aTttype_water[]; // idb -extern char aTttype_dirt[]; // idb -extern char aTttype_volcano[]; // idb -extern char aTttype_sand[]; // idb -extern char aTttype_snow[]; // idb -extern char aTttype_cracked[]; // idb -extern char aTttype_grass[]; // idb -extern char aTttype_start[]; // idb -extern char aTttype_null[]; // idb -extern char aTiletableLoadO[]; // idb -extern char aTiletableLoadU[]; // idb -extern char byte_4ECA93[]; // weak -extern char byte_4ECACF[]; // weak -extern char aError_0[]; // idb -extern char aCouldnTLoadMap[]; // idb -extern char aOut02d_odm[]; // idb -extern char aOut14_odm[]; // idb -extern char aOut[]; // idb -extern char aLunSun[]; // idb -extern char aLunfull[]; // idb -extern char aLun34[]; // idb -extern char aLun12[]; // idb -extern char aLun14[]; // idb -extern char aPal03i[]; // idb extern const char *pPlayerPortraitsNames[25]; extern const char *dlad_texnames_by_face[25]; extern const char *dlau_texnames_by_face[25]; @@ -1350,10 +1189,10 @@ extern int dword_5C341C; // weak extern int _5C3420_pDecoration; extern char byte_5C3427[]; // weak -extern char GameUI_StatusBar_TimedString[200]; -extern char pStatusBarString[200]; -extern unsigned int GameUI_StatusBar_TimedStringTimeLeft; -extern int bForceDrawStatusBar; // weak +extern char GameUI_Footer_TimedString[200]; +extern char pFooterString[200]; +extern unsigned int GameUI_Footer_TimeLeft; +extern int bForceDrawFooter; // weak extern int dword_5C35C0; // weak extern int bDialogueUI_InitializeActor_NPC_ID; // weak extern int dword_5C35C8; // weak @@ -1497,7 +1336,6 @@ extern int dword_6BE340; // weak extern char pCurrentMapName[20]; // idb extern unsigned int uLevelMapStatsID; -extern int uLevel_StartingPointType; // weak extern int dword_6BE364_game_settings_1; // weak extern int dword_6BE368_debug_settings_2; // weak extern unsigned __int8 bUseLoResSprites; @@ -1738,7 +1576,7 @@ void __stdcall mm7__vector_constructor(void *a1, int objSize, int numObjs, int (__thiscall *constructor)(int)); void MakeActorAIList_ODM(); int __cdecl MakeActorAIList_BLV(); -void __cdecl sub_401A91_AI(); +void __cdecl UpdateActorAI(); bool __fastcall sub_4070EF_prolly_collide_objects(unsigned int uObjID, unsigned int uObj2ID); bool __fastcall sub_4075DB(int a1, int a2, int a3, struct BLVFace *a4); bool __fastcall sub_4077F1(int a1, int a2, int a3, struct ODMFace *a4, struct BSPVertexBuffer *a5); @@ -1874,9 +1712,9 @@ int __fastcall GUI_ReplaceHotkey(unsigned __int8 uOldHotkey, unsigned __int8 uNewHotkey, char bFirstCall); void __cdecl MainMenuUI_LoadFontsAndSomeStuff(); void __cdecl MainMenuUI_Create(); -void __cdecl GameUI_DrawStatusBar_2(); +void __cdecl GameUI_Footer_2(); void __thiscall sub_41C0B8_set_status_string(const char *pStr); // idb -void __cdecl GameUI_DrawStatusBar(); +void __cdecl GameUI_Footer(); bool __thiscall sub_41CD4F(unsigned int _this); char __fastcall sub_41D20D_buff_remaining_time_string(int ecx0, struct GUIWindow *edx0, __int64 a3, struct GUIFont *a2); void GameUI_DrawItemInfo(struct ItemGen* inspect_item); // idb @@ -1940,7 +1778,7 @@ void __cdecl nullsub_4(); // idb void __cdecl nullsub_5(); // idb void __cdecl nullsub_6(); // idb -void __cdecl _438F8F_area_of_effect__damage_evaluate(); +void __cdecl area_of_effect__damage_evaluate(); void __fastcall DamagePlayerFromMonster(unsigned int uObjID, int a2, struct Vec3_int_ *pPos, unsigned int a4); void __fastcall sub_43A97E(unsigned int uLayingItemID, signed int a2); // idb double __fastcall sub_43AE12(signed int a1); @@ -1994,7 +1832,7 @@ char *__thiscall GetEventHintString(unsigned int uEventID); // idb unsigned int __fastcall sub_444839_move_map(unsigned int a1, int a2, int x, int y, int z, int directiony, int directionx, int a8, const char *pLocationName); // idb void TransitionUI_Draw(); -struct GUIWindow *__cdecl UI_CreateTravelDialogue(); +void UI_CreateTravelDialogue(); signed int __cdecl GetTravelTime(); void __cdecl TravelUI_Draw(); void __cdecl DrawBranchlessDialogueUI(); @@ -2022,8 +1860,6 @@ void __thiscall OnTimer(int a1); void __fastcall sub_448CF4_spawn_monsters(__int16 typeindex, __int16 level, int count, int x, int y, int z, int group, unsigned int uUniqueName); void __fastcall sub_448DF8_cast_spell(int spellnum, int rank, int level, int fromx, int fromy, int fromz, int tox, int toy, int toz); -char *__fastcall sub_44987B(const char *pMapName, unsigned int uStartingPointType); // idb -void __thiscall TeleportToStartingPoint(unsigned int uPointType); // idb __int16 __fastcall sub_449A49_door_switch_animation(unsigned int uDoorID, int a2); // idb bool _449B57_test_bit(unsigned __int8 *a1, __int16 a2); void _449B7E_toggle_bit(unsigned char *pArray, __int16 a2, unsigned __int16 bToggle); // idb @@ -2073,7 +1909,7 @@ void __cdecl TryLoadLevelFromLOD(); void __cdecl sub_46080D(); bool __cdecl Initialize_GamesLOD_NewLOD(); -bool Autosave(); +void Autosave(); void __thiscall PrepareToLoadBLV(unsigned int bLoading); void __fastcall PrepareToLoadODM(unsigned int bLoading, struct OutdoorCamera *a2); void __cdecl sub_461103(); @@ -2127,11 +1963,11 @@ int __cdecl sub_46A99B(); void *__thiscall unknown_libname_8(void *_this, char a2); unsigned int __cdecl GetGravityStrength(); -void __cdecl sub_46BDC0_UpdateUserInput_and_MapSpecificStuff(); +void __cdecl UpdateUserInput_and_MapSpecificStuff(); void __cdecl BLV_UpdateUserInputAndOther(); void __cdecl ODM_UpdateUserInputAndOther(); bool __fastcall _46BFFA_check_object_intercept(unsigned int uLayingItemID, signed int a2); -void __cdecl _46CC4B_check_event_triggers(); +void __cdecl check_event_triggers(); 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); @@ -2142,7 +1978,7 @@ void __fastcall _46E26D_collide_against_sprites(signed int a1, signed int a2); int __thiscall _46E44E_collide_against_faces_and_portals(unsigned int b1); // idb int __fastcall _46E889_collide_against_bmodels(unsigned int ecx0); -int _46ED1B_collide_against_floor(int x, int y, int z, unsigned int *pSectorID, unsigned int *pFaceID); // idb +int collide_against_floor(int x, int y, int z, unsigned int *pSectorID, unsigned int *pFaceID); // idb void __fastcall _46ED8A_collide_against_sprite_objects(unsigned int _this); int __thiscall _46EF01_collision_chech_player(int a1); // idb signed int __cdecl _46F04E_collide_against_portals();