diff --git a/profile/3.3.5a-windows-386/ida/batch/import_data_types.idc b/profile/3.3.5a-windows-386/ida/batch/import_data_types.idc index a5602d5..44a7637 100644 --- a/profile/3.3.5a-windows-386/ida/batch/import_data_types.idc +++ b/profile/3.3.5a-windows-386/ida/batch/import_data_types.idc @@ -1172,6 +1172,7 @@ static import_data_types() { apply_type(0x00C613C4, "int32_t"); apply_type(0x00C9ECC4, "CVar*"); apply_type(0x00CA1194, "CVar*"); + apply_type(0x00CA11A0, "CVar*"); apply_type(0x00CA12C8, "CVar*"); apply_type(0x00CA12D0, "CVar*"); apply_type(0x00CA1690, "float"); diff --git a/profile/3.3.5a-windows-386/ida/batch/import_symbols.idc b/profile/3.3.5a-windows-386/ida/batch/import_symbols.idc index 6789109..e682629 100644 --- a/profile/3.3.5a-windows-386/ida/batch/import_symbols.idc +++ b/profile/3.3.5a-windows-386/ida/batch/import_symbols.idc @@ -579,6 +579,7 @@ static import_symbols() { set_name(0x004C5990, "SE2SoundKitProperties__ResetToDefaults"); set_name(0x004C6390, "SE2__StopSound"); set_name(0x004C6A40, "SE2__PlaySoundKit"); + set_name(0x004C74A0, "SE2__PlaySoundKit@2"); set_name(0x004C82E0, "SI2__Init"); set_name(0x004C85F0, "SI2__StopZoneAmbience"); set_name(0x004C8610, "SI2__SetWeatherKitID"); @@ -587,9 +588,12 @@ static import_symbols() { set_name(0x004CDA20, "SI2__DK_GetPlayerFilterName"); set_name(0x004CDC80, "SI2__DSP_MakeDSPsExpire"); set_name(0x004CFC10, "SI2__PlayFoleySound"); - set_name(0x004D0090, "SI2__PlayItemSound"); + set_name(0x004D0020, "SI2__PlayItemSound"); + set_name(0x004D0090, "SI2__PlayItemSound@2"); set_name(0x004D0110, "SI2__UpdateTaxiSounds"); - set_name(0x004D1600, "SI2__RegisterCVars"); + set_name(0x004D0850, "SI2__PlayMissedSound"); + set_name(0x004D1050, "SI2__RegisterCVars"); + set_name(0x004D1600, "SI2__RegisterCVars@2"); set_name(0x004D2780, "ChangeHeapAllocTracking"); set_name(0x004D27D0, "HeapUsageDestroy"); set_name(0x004D2A30, "HeapUsageInitialize"); @@ -1178,6 +1182,7 @@ static import_symbols() { set_name(0x005136D0, "CGGameUI__GetCursorVirtualItem"); set_name(0x005136E0, "CGGameUI__GetCursorVirtualItem@2"); set_name(0x00513700, "CGGameUI__IsAutoLooting"); + set_name(0x00513740, "CGGameUI__LockItem"); set_name(0x00513770, "CGGameUI__UnlockItem"); set_name(0x00513880, "CGGameUI__InitClientControlState"); set_name(0x005138A0, "CGGameUI__ClearInstanceResetMap"); @@ -1385,6 +1390,7 @@ static import_symbols() { set_name(0x00520F70, "CGGameUI__UpdateActivePlayer"); set_name(0x00520FE0, "CGGameUI__OnClientControlChanged"); set_name(0x00521040, "CGGameUI__RegisterFrameFactories"); + set_name(0x005210D0, "CGGameUI__CastItemSpell"); set_name(0x005216F0, "CGGameUI__DisplayError"); set_name(0x00521BF0, "CGGameUI__GetSelectionHighlightColor"); set_name(0x005220B0, "CGGameUI__AutoMouseOver"); @@ -1634,6 +1640,8 @@ static import_symbols() { set_name(0x00543600, "Script_CanQueueForWintergrasp"); set_name(0x00544140, "CGWorldFrame__TranslateToMapCoords"); set_name(0x005444F0, "CGWorldMap__GetPlayerPosition"); + set_name(0x00544750, "CGWorldMap__CreateArrowFrame"); + set_name(0x005448A0, "CGWorldMap__CreateMiniArrowFrame"); set_name(0x00544B20, "Script_GetMapContinents"); set_name(0x00544B90, "Script_GetMapZones"); set_name(0x00544C40, "Script_DungeonUsesTerrainMap"); @@ -1654,11 +1662,14 @@ static import_symbols() { set_name(0x00545FE0, "Script_UpdateWorldMapArrowFrames"); set_name(0x00545FF0, "Script_InitWorldMapPing"); set_name(0x00546290, "Script_GetNumDungeonMapLevels"); + set_name(0x00546310, "CGWorldMap__SetMap"); + set_name(0x005468F0, "CGWorldMap__ProcessClick"); set_name(0x005469E0, "Script_SetMapZoom"); set_name(0x00546A90, "Script_ZoomOut"); set_name(0x00546C50, "Script_SetMapByID"); set_name(0x00546E80, "Script_ProcessMapClick"); set_name(0x00546EF0, "Script_ClickLandmark"); + set_name(0x00547170, "CGWorldMap__SetMapToCurrentZone"); set_name(0x00547B80, "Script_SetDungeonMapLevel"); set_name(0x00547C10, "Script_SetMapToCurrentZone"); set_name(0x00547EB0, "CGWorldMap__InitializeGame"); @@ -1847,6 +1858,8 @@ static import_symbols() { set_name(0x0055D280, "Script_RefreshLFGList"); set_name(0x0055D2B0, "Script_SearchLFGSort"); set_name(0x0055D440, "CGLookingForGroup__InitializeGame"); + set_name(0x0055D740, "CGUIBindings__StripModifiers"); + set_name(0x0055D860, "CGUIBindings__AddModifiers"); set_name(0x0055D990, "CGUIBindings__AddMetaPrefix"); set_name(0x0055DC00, "Script_GetNumBindings"); set_name(0x0055DC30, "Script_GetCurrentBindingSet"); @@ -1864,10 +1877,14 @@ static import_symbols() { set_name(0x0055FCC0, "Script_IsModifiedClick"); set_name(0x00560560, "Script_ClearOverrideBindings"); set_name(0x005620F0, "CGUIBindings__Initialize"); + set_name(0x00562140, "CGUIBindings__GetKeyBinding"); + set_name(0x005622E0, "CGUIBindings__GetReducedKeyBinding"); + set_name(0x00562490, "CGUIBindings__GetCommandAction"); set_name(0x00562550, "Script_GetBindingAction"); set_name(0x005625F0, "Script_GetBindingByKey"); set_name(0x00562B80, "CGUIBindings__CopyBindings"); set_name(0x00562D60, "CGUIBindings__FinishLoadBindings"); + set_name(0x00562DD0, "CGUIBindings__LoadModifiedClick"); set_name(0x00562ED0, "CGUIBindings__Bind"); set_name(0x00563150, "CGUIBindings__ExecKey"); set_name(0x00563520, "Script_SetBinding"); @@ -1887,6 +1904,7 @@ static import_symbols() { set_name(0x00564310, "CGUIBindings__LoadBindingsCallback"); set_name(0x005643B0, "CGUIBindings__LoadBindings@2"); set_name(0x00564470, "CGUIBindings__LoadBinding"); + set_name(0x00564760, "CGUIBindings__Load"); set_name(0x005648A0, "CGActionBar__IsMacro"); set_name(0x005648D0, "CGActionBar__GetMacroID"); set_name(0x00564AB0, "CGUIMacros__GetMacroIndexByID"); @@ -2034,6 +2052,7 @@ static import_symbols() { set_name(0x0057BAB0, "Script_GetNumBankSlots"); set_name(0x0057BB30, "Script_GetBankSlotCost"); set_name(0x0057BBC0, "Script_PurchaseSlot"); + set_name(0x0057BEA0, "CGMinimapFrame__PostLoadXML"); set_name(0x0057BFD0, "Script_SetZoom"); set_name(0x0057C340, "CGxMatrixStack__Identity"); set_name(0x0057C420, "GxXformPop"); @@ -2380,6 +2399,7 @@ static import_symbols() { set_name(0x005A91C0, "Script_GetActionCooldown"); set_name(0x005A9290, "Script_GetActionAutocast"); set_name(0x005A9360, "CGActionBar__IsConsumableAction"); + set_name(0x005A94C0, "CGActionBar__HasValidTarget"); set_name(0x005A95E0, "CGActionBar__ActionHasRange"); set_name(0x005A97F0, "CGActionBar__GetTexture"); set_name(0x005A9B30, "Script_GetActionTexture"); @@ -2439,8 +2459,11 @@ static import_symbols() { set_name(0x005AD830, "Script_EquipmentManagerUnignoreSlotForSave"); set_name(0x005AD880, "Script_CanUseEquipmentSets"); set_name(0x005AD940, "CGEquipmentManager__SetContainsLockedItems"); + set_name(0x005ADA20, "CGEquipmentManager__UseEquipmentSet"); set_name(0x005AE040, "CGEquipmentManager__SetUsesLockedSlots"); + set_name(0x005AE1B0, "CGEquipmentManager__ShutdownGame"); set_name(0x005AE260, "CGEquipmentManager__DeleteEquipmentSet"); + set_name(0x005AE380, "CGEquipmentManager__GetSetList"); set_name(0x005AE5C0, "CGEquipmentManager__GetSetByID"); set_name(0x005AE600, "CGEquipmentManager__GetSetByName"); set_name(0x005AE6B0, "CGEquipmentManager__GetFullIconPath"); @@ -2454,6 +2477,7 @@ static import_symbols() { set_name(0x005AF2C0, "Script_PickupEquipmentSet"); set_name(0x005AF320, "Script_EquipmentSetContainsLockedItems"); set_name(0x005AF380, "Script_UseEquipmentSet"); + set_name(0x005AF710, "CGEquipmentManager__OnEquipmentSetResult"); set_name(0x005AF910, "Script_RenameEquipmentSet"); set_name(0x005AF9C0, "Script_SaveEquipmentSet"); set_name(0x005AFBB0, "CGEquipmentManager__InitializeGame"); @@ -2618,6 +2642,7 @@ static import_symbols() { set_name(0x005C4DC0, "Script_ClickSocketButton"); set_name(0x005C4EA0, "Script_GetSocketItemBoundTradeable"); set_name(0x005C4F40, "CGItemSocketInfo__RemoveItem"); + set_name(0x005C4FF0, "CGItemSocketInfo__Accept"); set_name(0x005C5160, "Script_GetExistingSocketInfo"); set_name(0x005C5340, "Script_GetExistingSocketLink"); set_name(0x005C5460, "Script_AcceptSockets"); @@ -2908,6 +2933,10 @@ static import_symbols() { set_name(0x005E8030, "Script_GetInspectArenaTeamData"); set_name(0x005E8440, "CGCharacterInfo__InitializeGame"); set_name(0x005E84C0, "CGCharacterInfo__UpdateItem"); + set_name(0x005E85D0, "CGCharacterInfo__PickupItem"); + set_name(0x005E8A60, "CGCharacterInfo__UseItem"); + set_name(0x005E8C30, "CGCharacterInfo__PickupBag"); + set_name(0x005E8D30, "CGCharacterInfo__PutItemInBag"); set_name(0x005E95C0, "Script_GetInventoryItemsForSlot"); set_name(0x005E9BC0, "Script_GetInventoryItemTexture"); set_name(0x005E9D80, "Script_GetInventoryItemBroken"); @@ -3780,6 +3809,8 @@ static import_symbols() { set_name(0x006D7B30, "CGPlayer_C__CastRandomCritter"); set_name(0x006D7BB0, "Player_C_ZoneUpdateHandler"); set_name(0x006DAD90, "CGPlayer_C__LootUnit"); + set_name(0x006DB9D0, "CGPlayer_C__SplitItem"); + set_name(0x006DBAE0, "CGPlayer_C__AutoStoreItemInBag"); set_name(0x006DC070, "CGPlayer_C__UpdateRepopTimer"); set_name(0x006DC0F0, "CGPlayer_C__OnDeath"); set_name(0x006DC230, "CGPlayer_C__GetExpandedSkillRank"); @@ -3867,6 +3898,7 @@ static import_symbols() { set_name(0x00706C50, "CGItem_C__GetCooldowns"); set_name(0x00706D30, "CGItem_C__SetStorage"); set_name(0x00706F40, "CGItem_C__NumBaseCharges@2"); + set_name(0x00706FE0, "CGItem_C__Lock"); set_name(0x00707020, "CGItem_C__Unlock"); set_name(0x00707180, "CGItem_C__GetPageTextId"); set_name(0x007071D0, "CGItem_C__GetItemName"); @@ -4000,6 +4032,7 @@ static import_symbols() { set_name(0x0072F040, "CGUnit_C__SetTrackingDirection"); set_name(0x00730100, "CGUnit_C__InitializeComponent"); set_name(0x00730F30, "CGUnit_C__ShouldRender"); + set_name(0x00732650, "CGUnit_C__HandleAnimEvent"); set_name(0x00734F70, "CGUnit_C__GetDefenseSkillRank"); set_name(0x00734FA0, "CGUnit_C__GetAttackSkillRank"); set_name(0x00736D30, "CGUnit_C__SetSheatheState"); @@ -4009,6 +4042,7 @@ static import_symbols() { set_name(0x00739650, "CGUnit_C__CheckAndReportSpellInhibitFlags"); set_name(0x0073A6C0, "CGUnit_C__PlaySpellVisualKit_HandleWeapon"); set_name(0x0073AC30, "CGUnit_C__UpdateLootAnimKit"); + set_name(0x0073AF80, "CGUnit_C__PlayDeathAnim"); set_name(0x0073B140, "CGUnit_C__PlaySpellVisualKit_PlayAnims"); set_name(0x0073D2B0, "CGUnit_C__PlayFallLandAnimation"); set_name(0x0073D3D0, "CGUnit_C__OnCollideFallLand"); @@ -4371,6 +4405,7 @@ static import_symbols() { set_name(0x00780710, "World__SetDetailDoodadDensity"); set_name(0x00780730, "World__SetDetailDoodadDist"); set_name(0x00780770, "World__ValidateFarClip"); + set_name(0x00780800, "World__SetFarClip"); set_name(0x00780860, "World__PrepareAreaOfInterest"); set_name(0x00780CD0, "CMapStaticEntity__ModelLightingCallback"); set_name(0x00780E20, "CComand_SetShadow"); @@ -4423,6 +4458,7 @@ static import_symbols() { set_name(0x0078F020, "AreaListRegisterLocation"); set_name(0x0078F1F0, "AreaListZoneHasBreathParticles"); set_name(0x0078F510, "CBarrier__Destroy"); + set_name(0x0078F570, "CWorldScene__ScaleFadeDist"); set_name(0x0078FB00, "CWorldScene__FrustumXform"); set_name(0x0078FB20, "CWorldScene__FrustumCull"); set_name(0x0078FB50, "CWorldScene__FrustumPop"); @@ -4432,7 +4468,10 @@ static import_symbols() { set_name(0x00791100, "CWorldScene__FrustumSet@3"); set_name(0x007912C0, "CFacet__Set"); set_name(0x00791950, "CWorldScene__FrustumPush"); + set_name(0x00791CB0, "CWorldScene__AddDoodadDefModelToModelScene"); + set_name(0x00792FC0, "CWorldScene__AddViewerGroup"); set_name(0x00793060, "CWorldScene__CullEntitys"); + set_name(0x00793270, "CWorldScene__CullEntitysInterior"); set_name(0x007935A0, "CWorldScene__CullLiquid"); set_name(0x00793B10, "CWorldScene__RenderChunksSolid"); set_name(0x00793C30, "CWorldScene__RenderChunksZoneDebug"); @@ -4441,10 +4480,14 @@ static import_symbols() { set_name(0x007964A0, "CWorldScene__RenderMapObjDefGroups"); set_name(0x00798310, "CWorldScene__Destroy"); set_name(0x007984A0, "CWorldScene__RenderDetailDoodads"); + set_name(0x007987A0, "CWorldScene__CullDoodads"); set_name(0x007989C0, "CWorldScene__RenderChunksSinglePass"); set_name(0x00798DA0, "CWorldScene__RenderChunks"); set_name(0x00799730, "CBarrier__Initialize"); set_name(0x007997D0, "CWorldScene__Initialize"); + set_name(0x007998A0, "CWorldScene__AddDoodadDefs"); + set_name(0x00799980, "CWorldScene__CullDoodadsExterior"); + set_name(0x00799B70, "CWorldScene__CullDoodadsInterior"); set_name(0x00799D40, "CWorldScene__CullChunks"); set_name(0x0079A160, "CWorldScene__CullMapObjDefGroups"); set_name(0x0079A790, "CWorldScene__CullSortTable"); @@ -4579,6 +4622,7 @@ static import_symbols() { set_name(0x007B3960, "CDetailDoodad__FreeInst"); set_name(0x007B3990, "CMapObjDef__TestAABox"); set_name(0x007B39B0, "CMapObjDef__GetGroundType"); + set_name(0x007B3A10, "CWorldScene__CullMapObjDefGroupFromExterior"); set_name(0x007B3BE0, "CMapObjDefGroup__destructor"); set_name(0x007B3DE0, "CMapObjDefGroup__constructor"); set_name(0x007B4090, "CMapObjDefGroup__UpdateLights"); @@ -4654,7 +4698,8 @@ static import_symbols() { set_name(0x007BD9F0, "CMap__Preload"); set_name(0x007BDE50, "CMap__CreateMapObjDefGroups"); set_name(0x007BEB40, "CMap__CreateDoodadDef"); - set_name(0x007BEF40, "CMap__CreateDoodadDef@2"); + set_name(0x007BECD0, "CMap__CreateDoodadDef@2"); + set_name(0x007BEF40, "CMap__CreateDoodadDef@3"); set_name(0x007BF460, "CMap__CreateMapObjDef"); set_name(0x007BF740, "CMap__CreateMapObjDefGroupDoodads"); set_name(0x007BF8B0, "CMap__LoadWdt"); @@ -5225,6 +5270,7 @@ static import_symbols() { set_name(0x0086D0C0, "OsIMEDestroy"); set_name(0x0086D430, "OsTimeStartup"); set_name(0x0086D440, "OsTimeShutdown"); + set_name(0x0086D490, "OsGetTimeStamp"); set_name(0x0086D6D0, "OsTlsGetValue"); set_name(0x0086E200, "TSList__LinkToTail"); set_name(0x0086F5A0, "OsCallSetContext"); @@ -5487,6 +5533,7 @@ static import_symbols() { set_name(0x009838D0, "CFacet__Set@2"); set_name(0x00983940, "CFacet__constructor"); set_name(0x009839E0, "CFrustum__Cull"); + set_name(0x00983A60, "CFrustum__InvCull"); set_name(0x00983AE0, "CFrustum__Translate"); set_name(0x00983D70, "CFrustum__Cull@2"); set_name(0x00983E70, "CFrustum__CalcPlanesFromCorners"); @@ -5523,6 +5570,9 @@ static import_symbols() { set_name(0x00985EF0, "Script_VoiceChat_StartCapture"); set_name(0x00985F70, "SI2__StopGlueAmbience"); set_name(0x009860E0, "SI2__StopGlueMusic"); + set_name(0x009861C0, "SI2__StartGlueMusic"); + set_name(0x009862C0, "SI2__StartCreditMusic"); + set_name(0x00986520, "SI2__VoiceChat_AmplifyMicrophoneInput"); set_name(0x00986D00, "SI2__PlayVocalErrorSound"); set_name(0x0098B540, "CMovementShared__Root"); set_name(0x0098E5B0, "CGNamePlateFrame__TriggerDamageFeedback"); @@ -6016,6 +6066,10 @@ static import_symbols() { set_name(0x00ADEEC4, "World__loadMax"); set_name(0x00ADEEC8, "World__loadMin"); set_name(0x00ADEED4, "World__s_nearClip"); + set_name(0x00ADF38C, "CWorldScene__s_fadeRangeDefault"); + set_name(0x00ADF3B4, "CWorldScene__s_fadeDistMaxSqr"); + set_name(0x00ADF3C8, "CWorldScene__s_fadeDistMin"); + set_name(0x00ADF3DC, "CWorldScene__s_fadeDistMinSqr"); set_name(0x00ADFBC8, "CMap__bPreload"); set_name(0x00ADFC30, "CMap__s_mapRenderChunkUpdateList"); set_name(0x00ADFC3C, "CMap__s_mapChunkLiquidUpdateList"); @@ -6296,6 +6350,10 @@ static import_symbols() { set_name(0x00C1E5A0, "CGActionBar__m_tempPageActiveFlags"); set_name(0x00C1E8D0, "CGGMTicketInfo__m_ticketID"); set_name(0x00C1E8D4, "CGGMTicketInfo__m_responseID"); + set_name(0x00C1E954, "CGEquipmentManager__m_lastCanUseEquipmentSetsValue"); + set_name(0x00C1E956, "CGEquipmentManager__m_swapPending"); + set_name(0x00C1E958, "CGEquipmentManager__m_pendingSetID"); + set_name(0x00C1E95C, "CGEquipmentManager__s_EquipmentSetHeap"); set_name(0x00C207F0, "CGCalendar__m_initialize"); set_name(0x00C21008, "CGTalentInfo_Inspect__m_inspectTarget"); set_name(0x00C23AD0, "CGQuestLog__m_numQuest"); @@ -6471,6 +6529,7 @@ static import_symbols() { set_name(0x00CA0B58, "CMissile__s_inFlightMissileList"); set_name(0x00CA0B5C, "CMissile__s_missileDestroyList"); set_name(0x00CA1194, "s_cvPathDistTol"); + set_name(0x00CA11A0, "s_cvShowFootPrintParticles"); set_name(0x00CA1244, "CGUnit_C__s_unitThreatPool"); set_name(0x00CA1248, "CGUnit_C__s_deferredClientControlUpdateGUID"); set_name(0x00CA1250, "CGUnit_C__s_deferredClientControlUpdateState"); @@ -6563,6 +6622,7 @@ static import_symbols() { set_name(0x00CB7220, "s_logsysteminit"); set_name(0x00CB732C, "s_defaultdir_critsect"); set_name(0x00CB7358, "s_critsect@2"); + set_name(0x00CD7548, "World__particulate"); set_name(0x00CD754C, "CWorldScene__s_m2Scene"); set_name(0x00CD7554, "World__shadowModTexture"); set_name(0x00CD766C, "World__detailDoodadAlphaRef"); diff --git a/profile/3.3.5a-windows-386/include/map/CMapDoodadDef.h b/profile/3.3.5a-windows-386/include/map/CMapDoodadDef.h index 05c7d48..40739c6 100644 --- a/profile/3.3.5a-windows-386/include/map/CMapDoodadDef.h +++ b/profile/3.3.5a-windows-386/include/map/CMapDoodadDef.h @@ -6,6 +6,8 @@ DECLARE_STRUCT(CMapDoodadDef); #include "tempest/box.h" #include "tempest/matrix.h" #include "tempest/vector.h" +#include "tempest/sphere.h" +#include "m2/model.h" #include "storm/list.h" #include "map/CMapArea.h" @@ -37,9 +39,8 @@ struct CMapDoodadDef uint32_t unkFlags_28; //0x28 int32_t unkCounter; //0x2C float unk_030; //0x30 - void* unk_m2Model_034; //0x34 - C3Vector vec1; - float unk_044; //0x44 + CM2Model* model; + CAaSphere sphere; CAaBox bboxStaticEntity; C3Vector vec2; C3Vector position; diff --git a/profile/3.3.5a-windows-386/include/map/CMapEntity.h b/profile/3.3.5a-windows-386/include/map/CMapEntity.h index 9da8f42..5238d4e 100644 --- a/profile/3.3.5a-windows-386/include/map/CMapEntity.h +++ b/profile/3.3.5a-windows-386/include/map/CMapEntity.h @@ -6,6 +6,8 @@ DECLARE_STRUCT(CMapEntity); #include "system/types.h" #include "tempest/vector.h" #include "tempest/box.h" +#include "tempest/sphere.h" +#include "m2/model.h" #include "storm/list.h" #include "map/CMapBaseObj.h" @@ -39,9 +41,8 @@ struct CMapEntity uint32_t unkFlags_28; //0x28 int32_t unkCounter; //0x2C float unk_030; //0x30 - void* unk_m2Model_034; //0x34 - C3Vector vec1; - float unk_044; //0x44 + CM2Model* model; + CAaSphere sphere; CAaBox bboxStaticEntity; C3Vector vec2; C3Vector position; diff --git a/profile/3.3.5a-windows-386/include/map/CMapObjDef.h b/profile/3.3.5a-windows-386/include/map/CMapObjDef.h index fde0aa0..dca3937 100644 --- a/profile/3.3.5a-windows-386/include/map/CMapObjDef.h +++ b/profile/3.3.5a-windows-386/include/map/CMapObjDef.h @@ -12,6 +12,8 @@ DECLARE_STRUCT(CMapObjDefGroup); #include "storm/list.h" #include "map/CMapDoodadDef.h" #include "map/CMapArea.h" +#include "map/CMapObj.h" +#include "map/CMapEntity.h" STORM_TS_GROWABLE_ARRAY(CMapObjDefGroup); @@ -64,7 +66,7 @@ struct CMapObjDef C44Matrix invMat; int32_t unk_F0; //0xF0 - void* CMapObjPtr_owner; //0xF4 + CMapObj* owner; //0xF4 int32_t unk_F8; //0xF8 uint32_t unkFlags; //0xFC int32_t unk_100; //0x100 @@ -113,6 +115,17 @@ struct CMapObjDefGroupDoodadDefLink TSLink_CMapObjDefGroupDoodadDefLink ownerLink; //0x14 - 0x1C }; +typedef struct CMapObjDefGroupMapEntityLink CMapObjDefGroupMapEntityLink; +STORM_TS_LIST(CMapObjDefGroupMapEntityLink); +struct CMapObjDefGroupMapEntityLink +{ + uint32_t objectIndex; //0x00 + CMapEntity* owner; //0x04 + CMapObjDef* ref; //0x08 + TSLink_CMapObjDefGroupMapEntityLink refLink; //0x0C - 0x14 + TSLink_CMapObjDefGroupMapEntityLink ownerLink; //0x14 - 0x1C +}; + struct CMapObjDefGroup { void* vtable; //0x00 @@ -143,12 +156,8 @@ struct CMapObjDefGroup void* TSExplicitList__m_ptr1_unk_70; //0x70 void* TSExplicitList__m_ptr2_unk_74; //0x74 - // CMapDoodadDef TSExplicitList_CMapObjDefGroupDoodadDefLink doodadDefLinkList; - - int32_t TSExplicitList__m_linkoffset_unk_84; //0x84 - void* TSExplicitList__m_ptr1_unk_88; //0x88 - void* TSExplicitList__m_ptr2_unk_8C; //0x8C + TSExplicitList_CMapObjDefGroupMapEntityLink mapEntityLinkList; int32_t TSExplicitList__m_linkoffset_unk_90; //0x90 void* TSExplicitList__m_ptr1_unk_94; //0x94 diff --git a/profile/3.3.5a-windows-386/include/map/CMapStaticEntity.h b/profile/3.3.5a-windows-386/include/map/CMapStaticEntity.h index 0c612f3..087a82b 100644 --- a/profile/3.3.5a-windows-386/include/map/CMapStaticEntity.h +++ b/profile/3.3.5a-windows-386/include/map/CMapStaticEntity.h @@ -6,6 +6,8 @@ DECLARE_STRUCT(CMapStaticEntity); #include "system/types.h" #include "tempest/vector.h" #include "tempest/box.h" +#include "tempest/sphere.h" +#include "m2/model.h" #include "storm/list.h" #include "map/CMapBaseObj.h" @@ -37,9 +39,8 @@ struct CMapStaticEntity uint32_t unkFlags_28; //0x28 int32_t unkCounter; //0x2C float unk_030; //0x30 - void* unk_m2Model_034; //0x34 - C3Vector vec1; - float unk_044; //0x44 + CM2Model* model; + CAaSphere sphere; CAaBox bbox; C3Vector vec2; C3Vector position; diff --git a/profile/3.3.5a-windows-386/symbol/actionbar/func.sym b/profile/3.3.5a-windows-386/symbol/actionbar/func.sym index f1cec33..c36f89e 100644 --- a/profile/3.3.5a-windows-386/symbol/actionbar/func.sym +++ b/profile/3.3.5a-windows-386/symbol/actionbar/func.sym @@ -44,3 +44,4 @@ CGActionBar__UpdateOverrideSpellBar 005ABB40 f end=005ABBB8 CGActionBar__UseAction 005ABBC0 f end=005ABE63 CGActionBar__PickupAction 005ABE70 f end=005ABFF6 CGActionBar__EnterWorld 005AC0E0 f end=005AC0F4 +CGActionBar__HasValidTarget 005A94C0 f end=005A95D6 diff --git a/profile/3.3.5a-windows-386/symbol/characterinfo/func.sym b/profile/3.3.5a-windows-386/symbol/characterinfo/func.sym index af19599..6b6bb20 100644 --- a/profile/3.3.5a-windows-386/symbol/characterinfo/func.sym +++ b/profile/3.3.5a-windows-386/symbol/characterinfo/func.sym @@ -1,2 +1,6 @@ CGCharacterInfo__InitializeGame 005E8440 f end=005E8466 CGCharacterInfo__UpdateItem 005E84C0 f end=005E85C8 +CGCharacterInfo__PickupItem 005E85D0 f end=005E8A55 +CGCharacterInfo__PickupBag 005E8C30 f end=005E8D2D +CGCharacterInfo__UseItem 005E8A60 f end=005E8BBC +CGCharacterInfo__PutItemInBag 005E8D30 f end=005E8FD2 diff --git a/profile/3.3.5a-windows-386/symbol/cvar/label.sym b/profile/3.3.5a-windows-386/symbol/cvar/label.sym index 4417b3d..2d869fc 100644 --- a/profile/3.3.5a-windows-386/symbol/cvar/label.sym +++ b/profile/3.3.5a-windows-386/symbol/cvar/label.sym @@ -235,4 +235,4 @@ s_cvUseUiScale 00BD09B0 l type="CVar*" s_cvUseWeatherShaders 00CD852C l type="CVar*" s_cvWaterLOD 00CD8598 l type="CVar*" s_cvWorldPoolUsage 00CD85B8 l type="CVar*" - +s_cvShowFootPrintParticles 00CA11A0 l type="CVar*" diff --git a/profile/3.3.5a-windows-386/symbol/equipmentmanager/func.sym b/profile/3.3.5a-windows-386/symbol/equipmentmanager/func.sym index e23b34d..0272b1b 100644 --- a/profile/3.3.5a-windows-386/symbol/equipmentmanager/func.sym +++ b/profile/3.3.5a-windows-386/symbol/equipmentmanager/func.sym @@ -7,3 +7,7 @@ CGEquipmentManager__GetSetByID 005AE5C0 f end=005AE5F2 CGEquipmentManager__GetSetByName 005AE600 f end=005AE655 CGEquipmentManager__GetFullIconPath 005AE6B0 f end=005AE751 CGEquipmentManager__InitializeGame 005AFBB0 f end=005AFC35 +CGEquipmentManager__ShutdownGame 005AE1B0 f end=005AE253 +CGEquipmentManager__UseEquipmentSet 005ADA20 f end=005ADE4A +CGEquipmentManager__GetSetList 005AE380 f end=005AE489 +CGEquipmentManager__OnEquipmentSetResult 005AF710 f end=005AF7D7 diff --git a/profile/3.3.5a-windows-386/symbol/equipmentmanager/label.sym b/profile/3.3.5a-windows-386/symbol/equipmentmanager/label.sym new file mode 100644 index 0000000..d9ca78b --- /dev/null +++ b/profile/3.3.5a-windows-386/symbol/equipmentmanager/label.sym @@ -0,0 +1,4 @@ +CGEquipmentManager__s_EquipmentSetHeap 00C1E95C l +CGEquipmentManager__m_lastCanUseEquipmentSetsValue 00C1E954 l +CGEquipmentManager__m_swapPending 00C1E956 l +CGEquipmentManager__m_pendingSetID 00C1E958 l diff --git a/profile/3.3.5a-windows-386/symbol/frustum/func.sym b/profile/3.3.5a-windows-386/symbol/frustum/func.sym index 9e16e3a..5864003 100644 --- a/profile/3.3.5a-windows-386/symbol/frustum/func.sym +++ b/profile/3.3.5a-windows-386/symbol/frustum/func.sym @@ -4,3 +4,4 @@ CFrustum__Cull 009839E0 f end=00983A5C CFrustum__Transform 00983F40 f end=00983FA5 CFrustum__CalcPlanesFromCorners 00983E70 f end=00983F39 CFrustum__CalcPlanesFromCorners 00984240 f end=00984310 +CFrustum__InvCull 00983A60 f end=00983ADC diff --git a/profile/3.3.5a-windows-386/symbol/gameui/func.sym b/profile/3.3.5a-windows-386/symbol/gameui/func.sym index 7fff020..8208893 100644 --- a/profile/3.3.5a-windows-386/symbol/gameui/func.sym +++ b/profile/3.3.5a-windows-386/symbol/gameui/func.sym @@ -96,6 +96,8 @@ CGGameUI__SetCursorMacro 00520BE0 f end=00520C57 CGGameUI__SetCorpseLocation 00523DB0 f end=00523E7D CGGameUI__NextCinematic 005249C0 f end=00524A23 CGGameUI__SaveSavedVariables 00527130 f end=0052735C +CGGameUI__LockItem 00513740 f end=00513770 +CGGameUI__CastItemSpell 005210D0 f end=005216EB DisableFadingScreen 005ED080 f end=005ED116 EnableFadingScreen 005ED480 f end=005ED587 UpdateModelForUI 00618110 f end=00618176 diff --git a/profile/3.3.5a-windows-386/symbol/item/func.sym b/profile/3.3.5a-windows-386/symbol/item/func.sym index dc88d52..4cebc87 100644 --- a/profile/3.3.5a-windows-386/symbol/item/func.sym +++ b/profile/3.3.5a-windows-386/symbol/item/func.sym @@ -19,3 +19,4 @@ CGItem_C__GetItemName 007071D0 f end=00707213 CGItem_C__Disable 0070AFC0 f end=0070B118 CGItem_C__SetStorage 00706D30 f end=00706D63 CGItem_C__constructor 00709840 f end=00709A07 +CGItem_C__Lock 00706FE0 f end=00707011 diff --git a/profile/3.3.5a-windows-386/symbol/itemsocketinfo/func.sym b/profile/3.3.5a-windows-386/symbol/itemsocketinfo/func.sym index d1a9a48..d5ac0cb 100644 --- a/profile/3.3.5a-windows-386/symbol/itemsocketinfo/func.sym +++ b/profile/3.3.5a-windows-386/symbol/itemsocketinfo/func.sym @@ -1,2 +1,3 @@ CGItemSocketInfo__EnterWorld 005C44F0 f end=005C4549 CGItemSocketInfo__RemoveItem 005C4F40 f end=005C4FED +CGItemSocketInfo__Accept 005C4FF0 f end=005C50DC diff --git a/profile/3.3.5a-windows-386/symbol/main.sym b/profile/3.3.5a-windows-386/symbol/main.sym index bee5e58..3040ae3 100644 --- a/profile/3.3.5a-windows-386/symbol/main.sym +++ b/profile/3.3.5a-windows-386/symbol/main.sym @@ -1,6 +1,3 @@ - - - operator_new 00401010 f end=00401067 type="void* __stdcall func(uint32_t count)" ; void* operator new(size_t) operator_delete 00401030 f end=0040104B type="void __stdcall func(void* ptr)" ; void operator delete(void*) CDataStore__constructor 00401050 f end=0040106E type="CDataStore* __thiscall func(CDataStore* this)" @@ -578,6 +575,7 @@ C33Matrix__FromEulerAnglesZYX 004C56D0 f end=004C581A SE2SoundKitProperties__ResetToDefaults 004C5990 f end=004C5A18 SE2__StopSound 004C6390 f end=004C6410 SE2__PlaySoundKit 004C6A40 f end=004C713B +SE2__PlaySoundKit 004C74A0 f end=004C74E9 SI2__Init 004C82E0 f end=004C8584 SI2__StopZoneAmbience 004C85F0 f end=004C85FD SI2__SetWeatherKitID 004C8610 f end=004C8622 @@ -586,8 +584,11 @@ SI2__OverrideZoneSounds 004CCA30 f end=004CCA9E SI2__DK_GetPlayerFilterName 004CDA20 f end=004CDA60 SI2__DSP_MakeDSPsExpire 004CDC80 f end=004CDD32 SI2__PlayFoleySound 004CFC10 f end=004CFD17 +SI2__PlayItemSound 004D0020 f end=004D008B SI2__PlayItemSound 004D0090 f end=004D0102 SI2__UpdateTaxiSounds 004D0110 f end=004D032D +SI2__PlayMissedSound 004D0850 f end=004D089E +SI2__RegisterCVars 004D1050 f end=004D13DC SI2__RegisterCVars 004D1600 f end=004D1EB8 ChangeHeapAllocTracking 004D2780 f end=004D27C6 HeapUsageDestroy 004D27D0 f end=004D27DC @@ -1177,6 +1178,7 @@ CGGameUI__GetCursorSpell 005136C0 f end=005136C6 CGGameUI__GetCursorVirtualItem 005136D0 f end=005136D6 CGGameUI__GetCursorVirtualItem 005136E0 f end=005136FA CGGameUI__IsAutoLooting 00513700 f end=00513740 +CGGameUI__LockItem 00513740 f end=00513770 CGGameUI__UnlockItem 00513770 f end=005137A0 CGGameUI__InitClientControlState 00513880 f end=00513893 CGGameUI__ClearInstanceResetMap 005138A0 f end=005138AD @@ -1384,6 +1386,7 @@ CGGameUI__UnlockAllItems 00520E40 f end=00520F69 CGGameUI__UpdateActivePlayer 00520F70 f end=00520FD2 CGGameUI__OnClientControlChanged 00520FE0 f end=00521031 CGGameUI__RegisterFrameFactories 00521040 f end=005210CF +CGGameUI__CastItemSpell 005210D0 f end=005216EB CGGameUI__DisplayError 005216F0 f end=005218AD CGGameUI__GetSelectionHighlightColor 00521BF0 f end=005220A6 CGGameUI__AutoMouseOver 005220B0 f end=0052217B @@ -1633,6 +1636,8 @@ Script_GetWintergraspWaitTime 005435A0 f end=005435FD Script_CanQueueForWintergrasp 00543600 f end=00543642 CGWorldFrame__TranslateToMapCoords 00544140 f end=00544415 CGWorldMap__GetPlayerPosition 005444F0 f end=005445EB +CGWorldMap__CreateArrowFrame 00544750 f end=005448A0 +CGWorldMap__CreateMiniArrowFrame 005448A0 f end=005449F0 Script_GetMapContinents 00544B20 f end=00544B8D Script_GetMapZones 00544B90 f end=00544C3B Script_DungeonUsesTerrainMap 00544C40 f end=00544C9D @@ -1653,11 +1658,14 @@ Script_CreateMiniWorldMapArrowFrame 00545F20 f end=00545FD2 Script_UpdateWorldMapArrowFrames 00545FE0 f end=00545FE8 Script_InitWorldMapPing 00545FF0 f end=005460F7 Script_GetNumDungeonMapLevels 00546290 f end=005462BA +CGWorldMap__SetMap 00546310 f end=005468E2 +CGWorldMap__ProcessClick 005468F0 f end=005469D8 Script_SetMapZoom 005469E0 f end=00546A83 Script_ZoomOut 00546A90 f end=00546C4C Script_SetMapByID 00546C50 f end=00546E76 Script_ProcessMapClick 00546E80 f end=00546EEA Script_ClickLandmark 00546EF0 f end=00546FDB +CGWorldMap__SetMapToCurrentZone 00547170 f end=00547A65 Script_SetDungeonMapLevel 00547B80 f end=00547C02 Script_SetMapToCurrentZone 00547C10 f end=00547C1D CGWorldMap__InitializeGame 00547EB0 f end=00548568 @@ -1846,6 +1854,8 @@ Script_PartyLFGStartBackfill 0055A0C0 f end=0055A130 Script_RefreshLFGList 0055D280 f end=0055D2A1 Script_SearchLFGSort 0055D2B0 f end=0055D43D CGLookingForGroup__InitializeGame 0055D440 f end=0055D6A8 +CGUIBindings__StripModifiers 0055D740 f end=0055D851 +CGUIBindings__AddModifiers 0055D860 f end=0055D98E CGUIBindings__AddMetaPrefix 0055D990 f end=0055DAA8 Script_GetNumBindings 0055DC00 f end=0055DC23 Script_GetCurrentBindingSet 0055DC30 f end=0055DC57 @@ -1863,10 +1873,14 @@ Script_GetModifiedClick 0055FC20 f end=0055FCB9 Script_IsModifiedClick 0055FCC0 f end=0055FD13 Script_ClearOverrideBindings 00560560 f end=005605EC CGUIBindings__Initialize 005620F0 f end=00562135 +CGUIBindings__GetKeyBinding 00562140 f end=005622D1 +CGUIBindings__GetReducedKeyBinding 005622E0 f end=00562487 +CGUIBindings__GetCommandAction 00562490 f end=0056254F Script_GetBindingAction 00562550 f end=005625F0 Script_GetBindingByKey 005625F0 f end=0056269B CGUIBindings__CopyBindings 00562B80 f end=00562D5E CGUIBindings__FinishLoadBindings 00562D60 f end=00562DC7 +CGUIBindings__LoadModifiedClick 00562DD0 f end=00562ECA CGUIBindings__Bind 00562ED0 f end=00563142 CGUIBindings__ExecKey 00563150 f end=00563476 Script_SetBinding 00563520 f end=005635DF @@ -1886,6 +1900,7 @@ CGUIBindings__LoadBindings 005641C0 f end=0056430D CGUIBindings__LoadBindingsCallback 00564310 f end=005643A5 CGUIBindings__LoadBindings 005643B0 f end=0056446A CGUIBindings__LoadBinding 00564470 f end=00564754 +CGUIBindings__Load 00564760 f end=005648A0 CGActionBar__IsMacro 005648A0 f end=005648C8 CGActionBar__GetMacroID 005648D0 f end=005648FC CGUIMacros__GetMacroIndexByID 00564AB0 f end=00564AD6 @@ -2033,6 +2048,7 @@ Script_CloseBankFrame 0057B9C0 f end=0057B9E0 Script_GetNumBankSlots 0057BAB0 f end=0057BB30 Script_GetBankSlotCost 0057BB30 f end=0057BBB3 Script_PurchaseSlot 0057BBC0 f end=0057BC8A +CGMinimapFrame__PostLoadXML 0057BEA0 f end=0057BF2C Script_SetZoom 0057BFD0 f end=0057C031 CGxMatrixStack__Identity 0057C340 f end=0057C397 type="void __thiscall func(CGxMatrixStack* this)" GxXformPop 0057C420 f end=0057C44A @@ -2379,6 +2395,7 @@ Script_GetActionInfo 005A8F10 f end=005A91BB Script_GetActionCooldown 005A91C0 f end=005A9288 Script_GetActionAutocast 005A9290 f end=005A9357 CGActionBar__IsConsumableAction 005A9360 f end=005A946E +CGActionBar__HasValidTarget 005A94C0 f end=005A95D6 CGActionBar__ActionHasRange 005A95E0 f end=005A96D0 CGActionBar__GetTexture 005A97F0 f end=005A9B0C Script_GetActionTexture 005A9B30 f end=005A9B99 @@ -2438,8 +2455,11 @@ Script_EquipmentManagerClearIgnoredSlotsForSave 005AD820 f end=005AD828 Script_EquipmentManagerUnignoreSlotForSave 005AD830 f end=005AD872 Script_CanUseEquipmentSets 005AD880 f end=005AD8E3 CGEquipmentManager__SetContainsLockedItems 005AD940 f end=005AD9AF +CGEquipmentManager__UseEquipmentSet 005ADA20 f end=005ADE4A CGEquipmentManager__SetUsesLockedSlots 005AE040 f end=005AE0B3 +CGEquipmentManager__ShutdownGame 005AE1B0 f end=005AE253 CGEquipmentManager__DeleteEquipmentSet 005AE260 f end=005AE37B +CGEquipmentManager__GetSetList 005AE380 f end=005AE489 CGEquipmentManager__GetSetByID 005AE5C0 f end=005AE5F2 CGEquipmentManager__GetSetByName 005AE600 f end=005AE655 CGEquipmentManager__GetFullIconPath 005AE6B0 f end=005AE751 @@ -2453,6 +2473,7 @@ Script_PickupEquipmentSetByName 005AF250 f end=005AF2BB Script_PickupEquipmentSet 005AF2C0 f end=005AF317 Script_EquipmentSetContainsLockedItems 005AF320 f end=005AF380 Script_UseEquipmentSet 005AF380 f end=005AF3F1 +CGEquipmentManager__OnEquipmentSetResult 005AF710 f end=005AF7D7 Script_RenameEquipmentSet 005AF910 f end=005AF9BA Script_SaveEquipmentSet 005AF9C0 f end=005AFBAF CGEquipmentManager__InitializeGame 005AFBB0 f end=005AFC35 @@ -2617,6 +2638,7 @@ Script_GetNewSocketLink 005C4D10 f end=005C4DB4 Script_ClickSocketButton 005C4DC0 f end=005C4E94 Script_GetSocketItemBoundTradeable 005C4EA0 f end=005C4EDA CGItemSocketInfo__RemoveItem 005C4F40 f end=005C4FED +CGItemSocketInfo__Accept 005C4FF0 f end=005C50DC Script_GetExistingSocketInfo 005C5160 f end=005C533D Script_GetExistingSocketLink 005C5340 f end=005C5458 Script_AcceptSockets 005C5460 f end=005C5468 @@ -2907,6 +2929,10 @@ Script_GetInventoryAlertStatus 005E7FA0 f end=005E8030 Script_GetInspectArenaTeamData 005E8030 f end=005E8284 CGCharacterInfo__InitializeGame 005E8440 f end=005E8466 CGCharacterInfo__UpdateItem 005E84C0 f end=005E85C8 +CGCharacterInfo__PickupItem 005E85D0 f end=005E8A55 +CGCharacterInfo__UseItem 005E8A60 f end=005E8BBC +CGCharacterInfo__PickupBag 005E8C30 f end=005E8D2D +CGCharacterInfo__PutItemInBag 005E8D30 f end=005E8FD2 Script_GetInventoryItemsForSlot 005E95C0 f end=005E9BB5 Script_GetInventoryItemTexture 005E9BC0 f end=005E9D71 Script_GetInventoryItemBroken 005E9D80 f end=005E9E31 @@ -3779,6 +3805,8 @@ CGPlayer_C__VehicleAllowsInteraction 006D7AA0 f end=006D7B2B CGPlayer_C__CastRandomCritter 006D7B30 f end=006D7B64 Player_C_ZoneUpdateHandler 006D7BB0 f end=006D7C28 CGPlayer_C__LootUnit 006DAD90 f end=006DAF5E +CGPlayer_C__SplitItem 006DB9D0 f end=006DBADF +CGPlayer_C__AutoStoreItemInBag 006DBAE0 f end=006DBBD6 CGPlayer_C__UpdateRepopTimer 006DC070 f end=006DC0E1 CGPlayer_C__OnDeath 006DC0F0 f end=006DC1B5 CGPlayer_C__GetExpandedSkillRank 006DC230 f end=006DC2B2 @@ -3866,6 +3894,7 @@ CGItem_C__NumBaseCharges 00706BF0 f end=00706C4F CGItem_C__GetCooldowns 00706C50 f end=00706CE5 CGItem_C__SetStorage 00706D30 f end=00706D63 CGItem_C__NumBaseCharges 00706F40 f end=00706F9E +CGItem_C__Lock 00706FE0 f end=00707011 CGItem_C__Unlock 00707020 f end=00707051 CGItem_C__GetPageTextId 00707180 f end=007071C6 CGItem_C__GetItemName 007071D0 f end=00707213 @@ -3999,6 +4028,7 @@ CGUnit_C__SpellInterrupted 0072ED80 f end=0072EE11 CGUnit_C__SetTrackingDirection 0072F040 f end=0072F1E8 CGUnit_C__InitializeComponent 00730100 f end=00730281 CGUnit_C__ShouldRender 00730F30 f end=00731092 +CGUnit_C__HandleAnimEvent 00732650 f end=00732FEC CGUnit_C__GetDefenseSkillRank 00734F70 f end=00734F94 CGUnit_C__GetAttackSkillRank 00734FA0 f end=00734FC4 CGUnit_C__SetSheatheState 00736D30 f end=007370CB @@ -4008,6 +4038,7 @@ CGUnit_C__UpdateAllSmoothFacing 00739630 f end=00739648 CGUnit_C__CheckAndReportSpellInhibitFlags 00739650 f end=0073A51E CGUnit_C__PlaySpellVisualKit_HandleWeapon 0073A6C0 f end=0073A7EC CGUnit_C__UpdateLootAnimKit 0073AC30 f end=0073ACFC +CGUnit_C__PlayDeathAnim 0073AF80 f end=0073B04C CGUnit_C__PlaySpellVisualKit_PlayAnims 0073B140 f end=0073B508 CGUnit_C__PlayFallLandAnimation 0073D2B0 f end=0073D3CC CGUnit_C__OnCollideFallLand 0073D3D0 f end=0073D491 @@ -4370,6 +4401,7 @@ World__SetShadowColor 00780660 f end=0078070D World__SetDetailDoodadDensity 00780710 f end=0078072F World__SetDetailDoodadDist 00780730 f end=00780761 World__ValidateFarClip 00780770 f end=007807F8 +World__SetFarClip 00780800 f end=0078085F World__PrepareAreaOfInterest 00780860 f end=00780CCF CMapStaticEntity__ModelLightingCallback 00780CD0 f end=00780E1F CComand_SetShadow 00780E20 f end=00780F41 @@ -4422,6 +4454,7 @@ AreaListGetName 0078ED80 f end=0078EE22 AreaListRegisterLocation 0078F020 f end=0078F1EC AreaListZoneHasBreathParticles 0078F1F0 f end=0078F2E5 CBarrier__Destroy 0078F510 f end=0078F56C +CWorldScene__ScaleFadeDist 0078F570 f end=0078F6A0 CWorldScene__FrustumXform 0078FB00 f end=0078FB20 CWorldScene__FrustumCull 0078FB20 f end=0078FB47 CWorldScene__FrustumPop 0078FB50 f end=0078FB58 @@ -4431,7 +4464,10 @@ CWorldScene__FrustumSet 00790E20 f end=007910FE CWorldScene__FrustumSet 00791100 f end=00791120 CFacet__Set 007912C0 f end=00791378 CWorldScene__FrustumPush 00791950 f end=00791976 +CWorldScene__AddDoodadDefModelToModelScene 00791CB0 f end=00791EA5 +CWorldScene__AddViewerGroup 00792FC0 f end=00793056 CWorldScene__CullEntitys 00793060 f end=00793269 +CWorldScene__CullEntitysInterior 00793270 f end=00793444 CWorldScene__CullLiquid 007935A0 f end=00793755 CWorldScene__RenderChunksSolid 00793B10 f end=00793C2D CWorldScene__RenderChunksZoneDebug 00793C30 f end=00793D11 @@ -4440,10 +4476,14 @@ CWorldScene__LocateViewer3 00795D40 f end=00795F7F CWorldScene__RenderMapObjDefGroups 007964A0 f end=007968C2 CWorldScene__Destroy 00798310 f end=007CCBD4 CWorldScene__RenderDetailDoodads 007984A0 f end=00798794 +CWorldScene__CullDoodads 007987A0 f end=007989B5 CWorldScene__RenderChunksSinglePass 007989C0 f end=00798D9F CWorldScene__RenderChunks 00798DA0 f end=00799303 CBarrier__Initialize 00799730 f end=007997C5 CWorldScene__Initialize 007997D0 f end=00799891 +CWorldScene__AddDoodadDefs 007998A0 f end=00799977 +CWorldScene__CullDoodadsExterior 00799980 f end=00799B62 +CWorldScene__CullDoodadsInterior 00799B70 f end=00799D36 CWorldScene__CullChunks 00799D40 f end=00799F71 CWorldScene__CullMapObjDefGroups 0079A160 f end=0079A259 CWorldScene__CullSortTable 0079A790 f end=0079A861 @@ -4578,6 +4618,7 @@ CDetailDoodad__AllocInst 007B3910 f end=007B3959 CDetailDoodad__FreeInst 007B3960 f end=007B3987 CMapObjDef__TestAABox 007B3990 f end=007B39AB CMapObjDef__GetGroundType 007B39B0 f end=007B3A08 +CWorldScene__CullMapObjDefGroupFromExterior 007B3A10 f end=007B3B1A CMapObjDefGroup__destructor 007B3BE0 f end=007B3DD6 CMapObjDefGroup__constructor 007B3DE0 f end=007B3EFC CMapObjDefGroup__UpdateLights 007B4090 f end=007B40ED @@ -4653,6 +4694,7 @@ CMapStaticEntity__ModelEventCallback 007BD5A0 f end=007BD8A0 CMap__Preload 007BD9F0 f end=007BDA62 CMap__CreateMapObjDefGroups 007BDE50 f end=007BDFDE CMap__CreateDoodadDef 007BEB40 f end=007BECCA +CMap__CreateDoodadDef 007BECD0 f end=007BEF32 CMap__CreateDoodadDef 007BEF40 f end=007BF120 CMap__CreateMapObjDef 007BF460 f end=007BF738 CMap__CreateMapObjDefGroupDoodads 007BF740 f end=007BF8A8 @@ -5224,6 +5266,7 @@ OsIMEInitialize 0086D0A0 f end=0086D0B8 OsIMEDestroy 0086D0C0 f end=0086D0Df OsTimeStartup 0086D430 f end=0086D439 type="void __stdcall func(TimingMethod timingMethod)" OsTimeShutdown 0086D440 f end=0086D445 +OsGetTimeStamp 0086D490 f end=0086D4C0 OsTlsGetValue 0086D6D0 f end=0086D6DF TSList__LinkToTail 0086E200 f end=0086E25F ; 00005410 OsCallSetContext 0086F5A0 f end=0086F5EA @@ -5486,6 +5529,7 @@ NTempest__Intersect 009836B0 f end=009838C7 CFacet__Set 009838D0 f end=0098393E CFacet__constructor 00983940 f end=0098398F CFrustum__Cull 009839E0 f end=00983A5C +CFrustum__InvCull 00983A60 f end=00983ADC CFrustum__Translate 00983AE0 f end=00983D13 CFrustum__Cull 00983D70 f end=00983E61 CFrustum__CalcPlanesFromCorners 00983E70 f end=00983F39 @@ -5522,6 +5566,9 @@ SI2__UnregisterScriptFunctions 00985ED0 f end=00985EEF Script_VoiceChat_StartCapture 00985EF0 f end=00985F6B SI2__StopGlueAmbience 00985F70 f end=00985FA2 SI2__StopGlueMusic 009860E0 f end=00986128 +SI2__StartGlueMusic 009861C0 f end=009862BE +SI2__StartCreditMusic 009862C0 f end=0098638F +SI2__VoiceChat_AmplifyMicrophoneInput 00986520 f end=009865BA SI2__PlayVocalErrorSound 00986D00 f end=00986DD6 CMovementShared__Root 0098B540 f end=0098B570 CGNamePlateFrame__TriggerDamageFeedback 0098E5B0 f end=0098E5E1 @@ -6015,6 +6062,10 @@ World__groundEffectDistValue 00ADEEB8 l World__loadMax 00ADEEC4 l World__loadMin 00ADEEC8 l World__s_nearClip 00ADEED4 l +CWorldScene__s_fadeRangeDefault 00ADF38C l +CWorldScene__s_fadeDistMaxSqr 00ADF3B4 l +CWorldScene__s_fadeDistMin 00ADF3C8 l +CWorldScene__s_fadeDistMinSqr 00ADF3DC l CMap__bPreload 00ADFBC8 l CMap__s_mapRenderChunkUpdateList 00ADFC30 l CMap__s_mapChunkLiquidUpdateList 00ADFC3C l @@ -6295,6 +6346,10 @@ CGActionBar__m_bonusBarOffset 00C1E59C l CGActionBar__m_tempPageActiveFlags 00C1E5A0 l CGGMTicketInfo__m_ticketID 00C1E8D0 l CGGMTicketInfo__m_responseID 00C1E8D4 l +CGEquipmentManager__m_lastCanUseEquipmentSetsValue 00C1E954 l +CGEquipmentManager__m_swapPending 00C1E956 l +CGEquipmentManager__m_pendingSetID 00C1E958 l +CGEquipmentManager__s_EquipmentSetHeap 00C1E95C l CGCalendar__m_initialize 00C207F0 l CGTalentInfo_Inspect__m_inspectTarget 00C21008 l CGQuestLog__m_numQuest 00C23AD0 l @@ -6470,6 +6525,7 @@ s_cvSplineOpt 00C9ECC4 l type="CVar*" CMissile__s_inFlightMissileList 00CA0B58 l CMissile__s_missileDestroyList 00CA0B5C l s_cvPathDistTol 00CA1194 l type="CVar*" +s_cvShowFootPrintParticles 00CA11A0 l type="CVar*" CGUnit_C__s_unitThreatPool 00CA1244 l CGUnit_C__s_deferredClientControlUpdateGUID 00CA1248 l CGUnit_C__s_deferredClientControlUpdateState 00CA1250 l @@ -6562,6 +6618,7 @@ g_opt 00CAE958 l type="STORMOPTIONS" s_logsysteminit 00CB7220 l type="int32_t" s_defaultdir_critsect 00CB732C l type="CRITICAL_SECTION" s_critsect 00CB7358 l type="CRITICAL_SECTION[4]" +World__particulate 00CD7548 l CWorldScene__s_m2Scene 00CD754C l World__shadowModTexture 00CD7554 l World__detailDoodadAlphaRef 00CD766C l diff --git a/profile/3.3.5a-windows-386/symbol/map/func.sym b/profile/3.3.5a-windows-386/symbol/map/func.sym index 0b67cae..e85172b 100644 --- a/profile/3.3.5a-windows-386/symbol/map/func.sym +++ b/profile/3.3.5a-windows-386/symbol/map/func.sym @@ -94,3 +94,4 @@ CMap__AllocMapChunk 007C0830 f end=007C0897 CMap__AllocAreaLow 007C0A90 f end=007C0ADB CMap__QueryAreaId 00782560 f end=0078267C CMap__LoadTexture 007D9990 f end=007D9A1C +CMap__CreateDoodadDef 007BECD0 f end=007BEF32 diff --git a/profile/3.3.5a-windows-386/symbol/minimapframe/func.sym b/profile/3.3.5a-windows-386/symbol/minimapframe/func.sym index c04d1bc..acd3fe4 100644 --- a/profile/3.3.5a-windows-386/symbol/minimapframe/func.sym +++ b/profile/3.3.5a-windows-386/symbol/minimapframe/func.sym @@ -6,3 +6,4 @@ CGMinimapFrame__MinimapTextureCallback 00581CD0 f end=00581E7F CGMinimapFrame__Render 00581E80 f end=005831A9 CGMinimapFrame__RenderCallback 005832A0 f end=005832B2 CGMinimapFrame__OnFrameRender 005832C0 f end=005832ED +CGMinimapFrame__PostLoadXML 0057BEA0 f end=0057BF2C diff --git a/profile/3.3.5a-windows-386/symbol/os/func.sym b/profile/3.3.5a-windows-386/symbol/os/func.sym index af070b3..dd2ee3c 100644 --- a/profile/3.3.5a-windows-386/symbol/os/func.sym +++ b/profile/3.3.5a-windows-386/symbol/os/func.sym @@ -52,3 +52,4 @@ OsClipboardPutString 008722A0 f end=008722BF IOsClipboardGetString 008726F0 f end=008727BB OsClipboardFreeString 008727C0 f end=008727DE IOsClipboardPutString 008727E0 f end=008728B8 +OsGetTimeStamp 0086D490 f end=0086D4C0 diff --git a/profile/3.3.5a-windows-386/symbol/player/func.sym b/profile/3.3.5a-windows-386/symbol/player/func.sym index 2fd047a..c92adcc 100644 --- a/profile/3.3.5a-windows-386/symbol/player/func.sym +++ b/profile/3.3.5a-windows-386/symbol/player/func.sym @@ -47,6 +47,8 @@ CGPlayer_C__UpdateInteractStatusAll 006DC5A0 f end=006DC633 CGPlayer_C__constructor 006E6B40 f end=006E6E94 CGPlayer__TotalFieldsSaved 004F5530 f end=004F553B CGPlayer_C__SetPlayedTime 006CF470 f end=006CF494 +CGPlayer_C__SplitItem 006DB9D0 f end=006DBADF +CGPlayer_C__AutoStoreItemInBag 006DBAE0 f end=006DBBD6 CloseAllLootRolls 006FAFD0 f end=006FB0FD PlayerNameTriggerNameRegenerate 007E5130 f end=007E5140 PlayerNameShowing 007E5150 f end=007E516B diff --git a/profile/3.3.5a-windows-386/symbol/si2/func.sym b/profile/3.3.5a-windows-386/symbol/si2/func.sym index 0c8ff09..a70c421 100644 --- a/profile/3.3.5a-windows-386/symbol/si2/func.sym +++ b/profile/3.3.5a-windows-386/symbol/si2/func.sym @@ -17,3 +17,9 @@ SI2__DK_GetPlayerFilterName 004CDA20 f end=004CDA60 SI2__PlayFoleySound 004CFC10 f end=004CFD17 SI2__StopZoneAmbience 004C85F0 f end=004C85FD SI2__OverrideZoneSounds 004CCA30 f end=004CCA9E +SI2__PlayItemSound 004D0020 f end=004D008B +SI2__PlayMissedSound 004D0850 f end=004D089E +SI2__RegisterCVars 004D1050 f end=004D13DC +SI2__StartGlueMusic 009861C0 f end=009862BE +SI2__StartCreditMusic 009862C0 f end=0098638F +SI2__VoiceChat_AmplifyMicrophoneInput 00986520 f end=009865BA diff --git a/profile/3.3.5a-windows-386/symbol/sound/func.sym b/profile/3.3.5a-windows-386/symbol/sound/func.sym index cccb9b6..8b210fd 100644 --- a/profile/3.3.5a-windows-386/symbol/sound/func.sym +++ b/profile/3.3.5a-windows-386/symbol/sound/func.sym @@ -1,4 +1,5 @@ SE2SoundKitProperties__ResetToDefaults 004C5990 f end=004C5A18 SE2__StopSound 004C6390 f end=004C6410 SE2__PlaySoundKit 004C6A40 f end=004C713B +SE2__PlaySoundKit 004C74A0 f end=004C74E9 UnitSoundShutdown 00747810 f end=00747848 diff --git a/profile/3.3.5a-windows-386/symbol/uibindings/func.sym b/profile/3.3.5a-windows-386/symbol/uibindings/func.sym index ac15fbc..e2f4e56 100644 --- a/profile/3.3.5a-windows-386/symbol/uibindings/func.sym +++ b/profile/3.3.5a-windows-386/symbol/uibindings/func.sym @@ -12,3 +12,10 @@ CGUIBindings__LoadBindings 005641C0 f end=0056430D CGUIBindings__LoadBindingsCallback 00564310 f end=005643A5 CGUIBindings__LoadBindings 005643B0 f end=0056446A CGUIBindings__LoadBinding 00564470 f end=00564754 +CGUIBindings__StripModifiers 0055D740 f end=0055D851 +CGUIBindings__AddModifiers 0055D860 f end=0055D98E +CGUIBindings__GetKeyBinding 00562140 f end=005622D1 +CGUIBindings__GetReducedKeyBinding 005622E0 f end=00562487 +CGUIBindings__GetCommandAction 00562490 f end=0056254F +CGUIBindings__LoadModifiedClick 00562DD0 f end=00562ECA +CGUIBindings__Load 00564760 f end=005648A0 diff --git a/profile/3.3.5a-windows-386/symbol/unit/func.sym b/profile/3.3.5a-windows-386/symbol/unit/func.sym index 4718eee..f918de8 100644 --- a/profile/3.3.5a-windows-386/symbol/unit/func.sym +++ b/profile/3.3.5a-windows-386/symbol/unit/func.sym @@ -135,6 +135,8 @@ CGUnit_C__NamePlateUpdateColor 007153C0 f end=007153DB CGUnit_C__InitializeActivePlayerComponent 0071CFA0 f end=0071D006 CGUnit_C__SetMaxAlpha 00737390 f end=007374B7 CGUnit_C__IsPartyMember 0052C8C0 f end=0052C9A0 +CGUnit_C__HandleAnimEvent 00732650 f end=00732FEC +CGUnit_C__PlayDeathAnim 0073AF80 f end=0073B04C UnitCombatLogInvalidateName 0074F400 f end=0074F4CC UnitCombatLog 00751150 f end=007512A1 UnitSoundInitialize 00747860 f end=007478EE diff --git a/profile/3.3.5a-windows-386/symbol/world/func.sym b/profile/3.3.5a-windows-386/symbol/world/func.sym index 3611499..200deb1 100644 --- a/profile/3.3.5a-windows-386/symbol/world/func.sym +++ b/profile/3.3.5a-windows-386/symbol/world/func.sym @@ -24,4 +24,5 @@ World__QueryMapId 0077F080 f end=0077F086 World__QueryObjectInside 0077F090 f end=0077F0A4 World__QueryMapObjAreaTable 0077F1B0 f end=0077F1D1 World__Update 007815C0 f end=00781604 +World__SetFarClip 00780800 f end=0078085F diff --git a/profile/3.3.5a-windows-386/symbol/world/label.sym b/profile/3.3.5a-windows-386/symbol/world/label.sym index 4418cf2..df289bc 100644 --- a/profile/3.3.5a-windows-386/symbol/world/label.sym +++ b/profile/3.3.5a-windows-386/symbol/world/label.sym @@ -22,3 +22,4 @@ World__detailDoodadAlphaRef 00CD766C l World__detailDoodadDensity 00CD773C l World__shadowModTexture 00CD7554 l World__shadowColor 00CD7878 l +World__particulate 00CD7548 l diff --git a/profile/3.3.5a-windows-386/symbol/worldmap/func.sym b/profile/3.3.5a-windows-386/symbol/worldmap/func.sym index 73aebfd..4f6bd1b 100644 --- a/profile/3.3.5a-windows-386/symbol/worldmap/func.sym +++ b/profile/3.3.5a-windows-386/symbol/worldmap/func.sym @@ -1,2 +1,7 @@ CGWorldMap__GetPlayerPosition 005444F0 f end=005445EB CGWorldMap__InitializeGame 00547EB0 f end=00548568 +CGWorldMap__CreateArrowFrame 00544750 f end=005448A0 +CGWorldMap__CreateMiniArrowFrame 005448A0 f end=005449F0 +CGWorldMap__SetMap 00546310 f end=005468E2 +CGWorldMap__ProcessClick 005468F0 f end=005469D8 +CGWorldMap__SetMapToCurrentZone 00547170 f end=00547A65 diff --git a/profile/3.3.5a-windows-386/symbol/worldscene/func.sym b/profile/3.3.5a-windows-386/symbol/worldscene/func.sym index 7819479..cb5077b 100644 --- a/profile/3.3.5a-windows-386/symbol/worldscene/func.sym +++ b/profile/3.3.5a-windows-386/symbol/worldscene/func.sym @@ -23,3 +23,12 @@ CWorldScene__CullSortTable 0079A790 f end=0079A861 CWorldScene__ClearObjectFadeoutList 00782E40 f end=00782F17 CWorldScene__RenderChunksSolid 00793B10 f end=00793C2D CWorldScene__RenderChunks 00798DA0 f end=00799303 +CWorldScene__ScaleFadeDist 0078F570 f end=0078F6A0 +CWorldScene__AddDoodadDefModelToModelScene 00791CB0 f end=00791EA5 +CWorldScene__AddViewerGroup 00792FC0 f end=00793056 +CWorldScene__CullEntitysInterior 00793270 f end=00793444 +CWorldScene__CullDoodads 007987A0 f end=007989B5 +CWorldScene__AddDoodadDefs 007998A0 f end=00799977 +CWorldScene__CullDoodadsExterior 00799980 f end=00799B62 +CWorldScene__CullDoodadsInterior 00799B70 f end=00799D36 +CWorldScene__CullMapObjDefGroupFromExterior 007B3A10 f end=007B3B1A diff --git a/profile/3.3.5a-windows-386/symbol/worldscene/label.sym b/profile/3.3.5a-windows-386/symbol/worldscene/label.sym index 632e644..194433b 100644 --- a/profile/3.3.5a-windows-386/symbol/worldscene/label.sym +++ b/profile/3.3.5a-windows-386/symbol/worldscene/label.sym @@ -4,3 +4,7 @@ CWorldScene__frustumIndex 00CD8798 l CWorldScene__frustumStack 00CDB168 l CWorldScene__camTargetEntity 00CD87A8 l CWorldScene__s_m2Scene 00CD754C l +CWorldScene__s_fadeDistMaxSqr 00ADF3B4 l +CWorldScene__s_fadeDistMinSqr 00ADF3DC l +CWorldScene__s_fadeDistMin 00ADF3C8 l +CWorldScene__s_fadeRangeDefault 00ADF38C l diff --git a/profile/3.3.5a-windows-386/x64dbg/game.dd32 b/profile/3.3.5a-windows-386/x64dbg/game.dd32 index 134b200..c810ab8 100644 Binary files a/profile/3.3.5a-windows-386/x64dbg/game.dd32 and b/profile/3.3.5a-windows-386/x64dbg/game.dd32 differ diff --git a/profile/3.3.5a-windows-386/x64dbg/types.json b/profile/3.3.5a-windows-386/x64dbg/types.json index dd43d0d..aac38a1 100644 --- a/profile/3.3.5a-windows-386/x64dbg/types.json +++ b/profile/3.3.5a-windows-386/x64dbg/types.json @@ -664,6 +664,14 @@ "type": "TSList_CMapDoodadDefMapChunkLink", "name": "TSExplicitList_CMapDoodadDefMapChunkLink" }, + { + "type": "TSList_CMapObjGroup", + "name": "TSExplicitList_CMapObjGroup" + }, + { + "type": "TSList_CMapEntityMapChunkLink", + "name": "TSExplicitList_CMapEntityMapChunkLink" + }, { "type": "TSList_CMapObjDefMapChunkLink", "name": "TSExplicitList_CMapObjDefMapChunkLink" @@ -680,6 +688,10 @@ "type": "TSList_CMapObjDefGroupDoodadDefLink", "name": "TSExplicitList_CMapObjDefGroupDoodadDefLink" }, + { + "type": "TSList_CMapObjDefGroupMapEntityLink", + "name": "TSExplicitList_CMapObjDefGroupMapEntityLink" + }, { "type": "TSList_CMapAreaLink", "name": "TSExplicitList_CMapAreaLink" @@ -704,18 +716,10 @@ "type": "TSList_CChunkLiquid", "name": "TSExplicitList_CChunkLiquid" }, - { - "type": "TSList_CMapObjGroup", - "name": "TSExplicitList_CMapObjGroup" - }, { "type": "TSList_CMapStaticEntityMapChunkLink", "name": "TSExplicitList_CMapStaticEntityMapChunkLink" }, - { - "type": "TSList_CMapEntityMapChunkLink", - "name": "TSExplicitList_CMapEntityMapChunkLink" - }, { "type": "TSList_CILayer", "name": "TSExplicitList_CILayer" @@ -29064,6 +29068,22 @@ } ] }, + { + "name": "TSLink_CMapObjDefGroupMapEntityLink", + "size": 8, + "members": [ + { + "type": "TSLink_CMapObjDefGroupMapEntityLink*", + "name": "m_prevlink", + "offset": 0 + }, + { + "type": "CMapObjDefGroupMapEntityLink*", + "name": "m_next", + "offset": 4 + } + ] + }, { "name": "TSLink_CMapObjDefGroupMapObjDefLink", "size": 8, @@ -37261,6 +37281,48 @@ } ] }, + { + "name": "CMapObjDefGroupMapEntityLink", + "size": 28, + "members": [ + { + "type": "uint32_t", + "name": "objectIndex", + "offset": 0 + }, + { + "type": "CMapEntity*", + "name": "owner", + "offset": 4 + }, + { + "type": "CMapObjDef*", + "name": "ref", + "offset": 8 + }, + { + "type": "TSLink_CMapObjDefGroupMapEntityLink", + "name": "refLink", + "offset": 12 + }, + { + "type": "TSLink_CMapObjDefGroupMapEntityLink", + "name": "ownerLink", + "offset": 20 + } + ] + }, + { + "name": "TSLinkedNode_CMapObjDefGroupMapEntityLink", + "size": 8, + "members": [ + { + "type": "TSLink_CMapObjDefGroupMapEntityLink", + "name": "m_link", + "offset": 0 + } + ] + }, { "name": "CMapObjDefGroupMapObjDefLink", "size": 28, @@ -41757,6 +41819,38 @@ } ] }, + { + "name": "TSList_CMapObjGroup", + "size": 12, + "members": [ + { + "type": "ptrdiff_t", + "name": "m_linkoffset", + "offset": 0 + }, + { + "type": "TSLink_CMapObjGroup", + "name": "m_terminator", + "offset": 4 + } + ] + }, + { + "name": "TSList_CMapEntityMapChunkLink", + "size": 12, + "members": [ + { + "type": "ptrdiff_t", + "name": "m_linkoffset", + "offset": 0 + }, + { + "type": "TSLink_CMapEntityMapChunkLink", + "name": "m_terminator", + "offset": 4 + } + ] + }, { "name": "TSList_CMapObjDefMapChunkLink", "size": 12, @@ -41821,6 +41915,22 @@ } ] }, + { + "name": "TSList_CMapObjDefGroupMapEntityLink", + "size": 12, + "members": [ + { + "type": "ptrdiff_t", + "name": "m_linkoffset", + "offset": 0 + }, + { + "type": "TSLink_CMapObjDefGroupMapEntityLink", + "name": "m_terminator", + "offset": 4 + } + ] + }, { "name": "TSList_CMapAreaLink", "size": 12, @@ -41917,22 +42027,6 @@ } ] }, - { - "name": "TSList_CMapObjGroup", - "size": 12, - "members": [ - { - "type": "ptrdiff_t", - "name": "m_linkoffset", - "offset": 0 - }, - { - "type": "TSLink_CMapObjGroup", - "name": "m_terminator", - "offset": 4 - } - ] - }, { "name": "TSList_CMapStaticEntityMapChunkLink", "size": 12, @@ -41949,22 +42043,6 @@ } ] }, - { - "name": "TSList_CMapEntityMapChunkLink", - "size": 12, - "members": [ - { - "type": "ptrdiff_t", - "name": "m_linkoffset", - "offset": 0 - }, - { - "type": "TSLink_CMapEntityMapChunkLink", - "name": "m_terminator", - "offset": 4 - } - ] - }, { "name": "TSList_CILayer", "size": 12, @@ -42608,93 +42686,6 @@ } ] }, - { - "name": "SMOHeader", - "size": 64, - "members": [ - { - "type": "uint32_t", - "name": "nTextures", - "offset": 0 - }, - { - "type": "uint32_t", - "name": "nGroups", - "offset": 4 - }, - { - "type": "uint32_t", - "name": "nPortals", - "offset": 8 - }, - { - "type": "uint32_t", - "name": "nLights", - "offset": 12 - }, - { - "type": "uint32_t", - "name": "nDoodadNames", - "offset": 16 - }, - { - "type": "uint32_t", - "name": "nDoodadDefs", - "offset": 20 - }, - { - "type": "uint32_t", - "name": "nDoodadSets", - "offset": 24 - }, - { - "type": "uint32_t", - "name": "ambColor", - "offset": 28 - }, - { - "type": "uint32_t", - "name": "wmoID", - "offset": 32 - }, - { - "type": "CAaBox", - "name": "bounding_box", - "offset": 36 - }, - { - "type": "uint16_t", - "name": "flags", - "offset": 60 - }, - { - "type": "uint16_t", - "name": "numLod", - "offset": 62 - } - ] - }, - { - "name": "SMOGroupInfo", - "size": 32, - "members": [ - { - "type": "uint32_t", - "name": "flags", - "offset": 0 - }, - { - "type": "CAaBox", - "name": "bbox", - "offset": 4 - }, - { - "type": "uint32_t", - "name": "nameOffset", - "offset": 28 - } - ] - }, { "name": "CMapObjGroup", "size": 444, @@ -43196,6 +43187,93 @@ } ] }, + { + "name": "SMOHeader", + "size": 64, + "members": [ + { + "type": "uint32_t", + "name": "nTextures", + "offset": 0 + }, + { + "type": "uint32_t", + "name": "nGroups", + "offset": 4 + }, + { + "type": "uint32_t", + "name": "nPortals", + "offset": 8 + }, + { + "type": "uint32_t", + "name": "nLights", + "offset": 12 + }, + { + "type": "uint32_t", + "name": "nDoodadNames", + "offset": 16 + }, + { + "type": "uint32_t", + "name": "nDoodadDefs", + "offset": 20 + }, + { + "type": "uint32_t", + "name": "nDoodadSets", + "offset": 24 + }, + { + "type": "uint32_t", + "name": "ambColor", + "offset": 28 + }, + { + "type": "uint32_t", + "name": "wmoID", + "offset": 32 + }, + { + "type": "CAaBox", + "name": "bounding_box", + "offset": 36 + }, + { + "type": "uint16_t", + "name": "flags", + "offset": 60 + }, + { + "type": "uint16_t", + "name": "numLod", + "offset": 62 + } + ] + }, + { + "name": "SMOGroupInfo", + "size": 32, + "members": [ + { + "type": "uint32_t", + "name": "flags", + "offset": 0 + }, + { + "type": "CAaBox", + "name": "bbox", + "offset": 4 + }, + { + "type": "uint32_t", + "name": "nameOffset", + "offset": 28 + } + ] + }, { "name": "M2ModelColor", "size": 32, @@ -52092,20 +52170,15 @@ "offset": 48 }, { - "type": "void*", - "name": "unk_m2Model_034", + "type": "CM2Model*", + "name": "model", "offset": 52 }, { - "type": "C3Vector", - "name": "vec1", + "type": "CAaSphere", + "name": "sphere", "offset": 56 }, - { - "type": "float", - "name": "unk_044", - "offset": 68 - }, { "type": "CAaBox", "name": "bboxStaticEntity", @@ -52258,6 +52331,490 @@ } ] }, + { + "name": "CMapObj", + "size": 2552, + "members": [ + { + "type": "int32_t", + "name": "objectIndex", + "offset": 0 + }, + { + "type": "int32_t", + "name": "unk_04", + "offset": 4 + }, + { + "type": "int32_t", + "name": "unk_08", + "offset": 8 + }, + { + "type": "int32_t", + "name": "unk_0C", + "offset": 12 + }, + { + "type": "int32_t", + "name": "unk_10", + "offset": 16 + }, + { + "type": "int32_t", + "name": "unk_14", + "offset": 20 + }, + { + "type": "int32_t", + "name": "unk_18", + "offset": 24 + }, + { + "type": "char", + "name": "m_wmoName", + "arrsize": 260, + "offset": 28 + }, + { + "type": "SMOHeader*", + "name": "header", + "offset": 288 + }, + { + "type": "char*", + "name": "textureNameList", + "offset": 292 + }, + { + "type": "char*", + "name": "groupNameList", + "offset": 296 + }, + { + "type": "char*", + "name": "skybox", + "offset": 300 + }, + { + "type": "SMOGroupInfo*", + "name": "groupInfo", + "offset": 304 + }, + { + "type": "C3Vector*", + "name": "portalVertexList", + "offset": 308 + }, + { + "type": "SMOPortal*", + "name": "portalList", + "offset": 312 + }, + { + "type": "SMOPortalRef*", + "name": "portalRefList", + "offset": 316 + }, + { + "type": "C3Vector*", + "name": "visBlockVertList", + "offset": 320 + }, + { + "type": "SMOVisibleBlock*", + "name": "visBlockList", + "offset": 324 + }, + { + "type": "SMOLight*", + "name": "lightList", + "offset": 328 + }, + { + "type": "SMODoodadSet*", + "name": "doodadSetList", + "offset": 332 + }, + { + "type": "char*", + "name": "doodadNameList", + "offset": 336 + }, + { + "type": "SMODoodadDef*", + "name": "doodadDefList", + "offset": 340 + }, + { + "type": "SMOFog*", + "name": "fogList", + "offset": 344 + }, + { + "type": "C4Plane*", + "name": "convexVolumePlanes", + "offset": 348 + }, + { + "type": "SMOMaterial*", + "name": "materialList", + "offset": 352 + }, + { + "type": "int32_t", + "name": "texturesSize", + "offset": 356 + }, + { + "type": "int32_t", + "name": "groupNameSize", + "offset": 360 + }, + { + "type": "int32_t", + "name": "groupInfoCount", + "offset": 364 + }, + { + "type": "int32_t", + "name": "planeVertCount", + "offset": 368 + }, + { + "type": "int32_t", + "name": "portalsCount", + "offset": 372 + }, + { + "type": "int32_t", + "name": "portalRefCount", + "offset": 376 + }, + { + "type": "int32_t", + "name": "visBlockVertCount", + "offset": 380 + }, + { + "type": "int32_t", + "name": "visBlockCount", + "offset": 384 + }, + { + "type": "int32_t", + "name": "ligtsCount", + "offset": 388 + }, + { + "type": "int32_t", + "name": "doodadSetCount", + "offset": 392 + }, + { + "type": "int32_t", + "name": "doodadNameSize", + "offset": 396 + }, + { + "type": "int32_t", + "name": "doodadDefCount", + "offset": 400 + }, + { + "type": "int32_t", + "name": "fogsCount", + "offset": 404 + }, + { + "type": "int32_t", + "name": "convexVolumePlaneCount", + "offset": 408 + }, + { + "type": "int32_t", + "name": "materialsCount", + "offset": 412 + }, + { + "type": "uint32_t", + "name": "argb_color", + "offset": 416 + }, + { + "type": "int32_t", + "name": "unk_1A4", + "offset": 420 + }, + { + "type": "CAaBox", + "name": "bbox", + "offset": 424 + }, + { + "type": "float", + "name": "distToCamera", + "offset": 448 + }, + { + "type": "int32_t", + "name": "unk_1C4", + "offset": 452 + }, + { + "type": "int32_t", + "name": "unk_1C8", + "offset": 456 + }, + { + "type": "void*", + "name": "pWmoData", + "offset": 460 + }, + { + "type": "int32_t", + "name": "wmoFileSize", + "offset": 464 + }, + { + "type": "int32_t", + "name": "refCount", + "offset": 468 + }, + { + "type": "float", + "name": "flushTimer", + "offset": 472 + }, + { + "type": "CAsyncObject*", + "name": "asyncObject", + "offset": 476 + }, + { + "type": "int32_t", + "name": "isGroupLoaded", + "offset": 480 + }, + { + "type": "int32_t", + "name": "unk_1E4", + "offset": 484 + }, + { + "type": "TSExplicitList_CMapObjGroup", + "name": "mapObjGroupList", + "offset": 488 + }, + { + "type": "int32_t", + "name": "mapObjGroupCount", + "offset": 500 + }, + { + "type": "CMapObjGroup*", + "name": "mapObjGroupArray", + "arrsize": 512, + "offset": 504 + } + ] + }, + { + "name": "CMapEntity", + "size": 208, + "members": [ + { + "type": "void**", + "name": "vtable", + "offset": 0 + }, + { + "type": "int32_t", + "name": "objectIndex", + "offset": 4 + }, + { + "type": "uint16_t", + "name": "type", + "offset": 8 + }, + { + "type": "uint16_t", + "name": "refCount", + "offset": 10 + }, + { + "type": "int32_t", + "name": "unk_C", + "offset": 12 + }, + { + "type": "CMapEntity*", + "name": "prev", + "offset": 16 + }, + { + "type": "CMapEntity*", + "name": "next", + "offset": 20 + }, + { + "type": "TSExplicitList_CMapEntityMapChunkLink", + "name": "linkList", + "offset": 24 + }, + { + "type": "int32_t", + "name": "unk_024", + "offset": 36 + }, + { + "type": "uint32_t", + "name": "unkFlags_28", + "offset": 40 + }, + { + "type": "int32_t", + "name": "unkCounter", + "offset": 44 + }, + { + "type": "float", + "name": "unk_030", + "offset": 48 + }, + { + "type": "CM2Model*", + "name": "model", + "offset": 52 + }, + { + "type": "CAaSphere", + "name": "sphere", + "offset": 56 + }, + { + "type": "CAaBox", + "name": "bboxStaticEntity", + "offset": 72 + }, + { + "type": "C3Vector", + "name": "vec2", + "offset": 96 + }, + { + "type": "C3Vector", + "name": "position", + "offset": 108 + }, + { + "type": "float", + "name": "scale", + "offset": 120 + }, + { + "type": "int32_t", + "name": "unk_07C", + "offset": 124 + }, + { + "type": "int32_t", + "name": "unk_080", + "offset": 128 + }, + { + "type": "CImVector", + "name": "m2AmbietColor", + "offset": 132 + }, + { + "type": "CImVector", + "name": "m2DiffuseColor", + "offset": 136 + }, + { + "type": "float", + "name": "unk_08C", + "offset": 140 + }, + { + "type": "int32_t", + "name": "unk_090", + "offset": 144 + }, + { + "type": "int32_t", + "name": "unk_094", + "offset": 148 + }, + { + "type": "uint64_t", + "name": "guid", + "offset": 152 + }, + { + "type": "int32_t", + "name": "unk_0A0", + "offset": 160 + }, + { + "type": "int32_t", + "name": "unk_0A4", + "offset": 164 + }, + { + "type": "int32_t", + "name": "unk_0A8", + "offset": 168 + }, + { + "type": "int32_t", + "name": "unk_0AC", + "offset": 172 + }, + { + "type": "int32_t", + "name": "unk_0B0", + "offset": 176 + }, + { + "type": "int32_t", + "name": "unk_0B4", + "offset": 180 + }, + { + "type": "int32_t", + "name": "unk_0B8", + "offset": 184 + }, + { + "type": "int32_t", + "name": "unk_0BC", + "offset": 188 + }, + { + "type": "CImVector", + "name": "ambientTarget", + "offset": 192 + }, + { + "type": "float", + "name": "dirLightScaleTarget", + "offset": 196 + }, + { + "type": "int32_t", + "name": "unk_0C8", + "offset": 200 + }, + { + "type": "int32_t", + "name": "unk_0CC", + "offset": 204 + } + ] + }, { "name": "CMapObjDef", "size": 344, @@ -52363,8 +52920,8 @@ "offset": 240 }, { - "type": "void*", - "name": "CMapObjPtr_owner", + "type": "CMapObj*", + "name": "owner", "offset": 244 }, { @@ -52579,20 +53136,10 @@ "offset": 120 }, { - "type": "int32_t", - "name": "TSExplicitList__m_linkoffset_unk_84", + "type": "TSExplicitList_CMapObjDefGroupMapEntityLink", + "name": "mapEntityLinkList", "offset": 132 }, - { - "type": "void*", - "name": "TSExplicitList__m_ptr1_unk_88", - "offset": 136 - }, - { - "type": "void*", - "name": "TSExplicitList__m_ptr2_unk_8C", - "offset": 140 - }, { "type": "int32_t", "name": "TSExplicitList__m_linkoffset_unk_90", @@ -53128,294 +53675,6 @@ } ] }, - { - "name": "CMapObj", - "size": 2552, - "members": [ - { - "type": "int32_t", - "name": "objectIndex", - "offset": 0 - }, - { - "type": "int32_t", - "name": "unk_04", - "offset": 4 - }, - { - "type": "int32_t", - "name": "unk_08", - "offset": 8 - }, - { - "type": "int32_t", - "name": "unk_0C", - "offset": 12 - }, - { - "type": "int32_t", - "name": "unk_10", - "offset": 16 - }, - { - "type": "int32_t", - "name": "unk_14", - "offset": 20 - }, - { - "type": "int32_t", - "name": "unk_18", - "offset": 24 - }, - { - "type": "char", - "name": "m_wmoName", - "arrsize": 260, - "offset": 28 - }, - { - "type": "SMOHeader*", - "name": "header", - "offset": 288 - }, - { - "type": "char*", - "name": "textureNameList", - "offset": 292 - }, - { - "type": "char*", - "name": "groupNameList", - "offset": 296 - }, - { - "type": "char*", - "name": "skybox", - "offset": 300 - }, - { - "type": "SMOGroupInfo*", - "name": "groupInfo", - "offset": 304 - }, - { - "type": "C3Vector*", - "name": "portalVertexList", - "offset": 308 - }, - { - "type": "SMOPortal*", - "name": "portalList", - "offset": 312 - }, - { - "type": "SMOPortalRef*", - "name": "portalRefList", - "offset": 316 - }, - { - "type": "C3Vector*", - "name": "visBlockVertList", - "offset": 320 - }, - { - "type": "SMOVisibleBlock*", - "name": "visBlockList", - "offset": 324 - }, - { - "type": "SMOLight*", - "name": "lightList", - "offset": 328 - }, - { - "type": "SMODoodadSet*", - "name": "doodadSetList", - "offset": 332 - }, - { - "type": "char*", - "name": "doodadNameList", - "offset": 336 - }, - { - "type": "SMODoodadDef*", - "name": "doodadDefList", - "offset": 340 - }, - { - "type": "SMOFog*", - "name": "fogList", - "offset": 344 - }, - { - "type": "C4Plane*", - "name": "convexVolumePlanes", - "offset": 348 - }, - { - "type": "SMOMaterial*", - "name": "materialList", - "offset": 352 - }, - { - "type": "int32_t", - "name": "texturesSize", - "offset": 356 - }, - { - "type": "int32_t", - "name": "groupNameSize", - "offset": 360 - }, - { - "type": "int32_t", - "name": "groupInfoCount", - "offset": 364 - }, - { - "type": "int32_t", - "name": "planeVertCount", - "offset": 368 - }, - { - "type": "int32_t", - "name": "portalsCount", - "offset": 372 - }, - { - "type": "int32_t", - "name": "portalRefCount", - "offset": 376 - }, - { - "type": "int32_t", - "name": "visBlockVertCount", - "offset": 380 - }, - { - "type": "int32_t", - "name": "visBlockCount", - "offset": 384 - }, - { - "type": "int32_t", - "name": "ligtsCount", - "offset": 388 - }, - { - "type": "int32_t", - "name": "doodadSetCount", - "offset": 392 - }, - { - "type": "int32_t", - "name": "doodadNameSize", - "offset": 396 - }, - { - "type": "int32_t", - "name": "doodadDefCount", - "offset": 400 - }, - { - "type": "int32_t", - "name": "fogsCount", - "offset": 404 - }, - { - "type": "int32_t", - "name": "convexVolumePlaneCount", - "offset": 408 - }, - { - "type": "int32_t", - "name": "materialsCount", - "offset": 412 - }, - { - "type": "uint32_t", - "name": "argb_color", - "offset": 416 - }, - { - "type": "int32_t", - "name": "unk_1A4", - "offset": 420 - }, - { - "type": "CAaBox", - "name": "bbox", - "offset": 424 - }, - { - "type": "float", - "name": "distToCamera", - "offset": 448 - }, - { - "type": "int32_t", - "name": "unk_1C4", - "offset": 452 - }, - { - "type": "int32_t", - "name": "unk_1C8", - "offset": 456 - }, - { - "type": "void*", - "name": "pWmoData", - "offset": 460 - }, - { - "type": "int32_t", - "name": "wmoFileSize", - "offset": 464 - }, - { - "type": "int32_t", - "name": "refCount", - "offset": 468 - }, - { - "type": "float", - "name": "flushTimer", - "offset": 472 - }, - { - "type": "CAsyncObject*", - "name": "asyncObject", - "offset": 476 - }, - { - "type": "int32_t", - "name": "isGroupLoaded", - "offset": 480 - }, - { - "type": "int32_t", - "name": "unk_1E4", - "offset": 484 - }, - { - "type": "TSExplicitList_CMapObjGroup", - "name": "mapObjGroupList", - "offset": 488 - }, - { - "type": "int32_t", - "name": "mapObjGroupCount", - "offset": 500 - }, - { - "type": "CMapObjGroup*", - "name": "mapObjGroupArray", - "arrsize": 512, - "offset": 504 - } - ] - }, { "name": "CMapStaticEntity", "size": 144, @@ -53481,20 +53740,15 @@ "offset": 48 }, { - "type": "void*", - "name": "unk_m2Model_034", + "type": "CM2Model*", + "name": "model", "offset": 52 }, { - "type": "C3Vector", - "name": "vec1", + "type": "CAaSphere", + "name": "sphere", "offset": 56 }, - { - "type": "float", - "name": "unk_044", - "offset": 68 - }, { "type": "CAaBox", "name": "bbox", @@ -53542,207 +53796,6 @@ } ] }, - { - "name": "CMapEntity", - "size": 208, - "members": [ - { - "type": "void**", - "name": "vtable", - "offset": 0 - }, - { - "type": "int32_t", - "name": "objectIndex", - "offset": 4 - }, - { - "type": "uint16_t", - "name": "type", - "offset": 8 - }, - { - "type": "uint16_t", - "name": "refCount", - "offset": 10 - }, - { - "type": "int32_t", - "name": "unk_C", - "offset": 12 - }, - { - "type": "CMapEntity*", - "name": "prev", - "offset": 16 - }, - { - "type": "CMapEntity*", - "name": "next", - "offset": 20 - }, - { - "type": "TSExplicitList_CMapEntityMapChunkLink", - "name": "linkList", - "offset": 24 - }, - { - "type": "int32_t", - "name": "unk_024", - "offset": 36 - }, - { - "type": "uint32_t", - "name": "unkFlags_28", - "offset": 40 - }, - { - "type": "int32_t", - "name": "unkCounter", - "offset": 44 - }, - { - "type": "float", - "name": "unk_030", - "offset": 48 - }, - { - "type": "void*", - "name": "unk_m2Model_034", - "offset": 52 - }, - { - "type": "C3Vector", - "name": "vec1", - "offset": 56 - }, - { - "type": "float", - "name": "unk_044", - "offset": 68 - }, - { - "type": "CAaBox", - "name": "bboxStaticEntity", - "offset": 72 - }, - { - "type": "C3Vector", - "name": "vec2", - "offset": 96 - }, - { - "type": "C3Vector", - "name": "position", - "offset": 108 - }, - { - "type": "float", - "name": "scale", - "offset": 120 - }, - { - "type": "int32_t", - "name": "unk_07C", - "offset": 124 - }, - { - "type": "int32_t", - "name": "unk_080", - "offset": 128 - }, - { - "type": "CImVector", - "name": "m2AmbietColor", - "offset": 132 - }, - { - "type": "CImVector", - "name": "m2DiffuseColor", - "offset": 136 - }, - { - "type": "float", - "name": "unk_08C", - "offset": 140 - }, - { - "type": "int32_t", - "name": "unk_090", - "offset": 144 - }, - { - "type": "int32_t", - "name": "unk_094", - "offset": 148 - }, - { - "type": "uint64_t", - "name": "guid", - "offset": 152 - }, - { - "type": "int32_t", - "name": "unk_0A0", - "offset": 160 - }, - { - "type": "int32_t", - "name": "unk_0A4", - "offset": 164 - }, - { - "type": "int32_t", - "name": "unk_0A8", - "offset": 168 - }, - { - "type": "int32_t", - "name": "unk_0AC", - "offset": 172 - }, - { - "type": "int32_t", - "name": "unk_0B0", - "offset": 176 - }, - { - "type": "int32_t", - "name": "unk_0B4", - "offset": 180 - }, - { - "type": "int32_t", - "name": "unk_0B8", - "offset": 184 - }, - { - "type": "int32_t", - "name": "unk_0BC", - "offset": 188 - }, - { - "type": "CImVector", - "name": "ambientTarget", - "offset": 192 - }, - { - "type": "float", - "name": "dirLightScaleTarget", - "offset": 196 - }, - { - "type": "int32_t", - "name": "unk_0C8", - "offset": 200 - }, - { - "type": "int32_t", - "name": "unk_0CC", - "offset": 204 - } - ] - }, { "name": "M2Attachment", "size": 40,