diff --git a/src/ZoneCode/Game/T6/T6_Commands.txt b/src/ZoneCode/Game/T6/T6_Commands.txt index e148b099..dd6b95c1 100644 --- a/src/ZoneCode/Game/T6/T6_Commands.txt +++ b/src/ZoneCode/Game/T6/T6_Commands.txt @@ -465,6 +465,8 @@ set string name; // ========================================= // FxEffectDef // ========================================= +use FxElemVisuals; +set condition anonymous never; // ========================================= // FxImpactTable @@ -499,6 +501,31 @@ set string StringTableCell::string; // ========================================= // ddlRoot_t // ========================================= +use ddlRoot_t; +set string name; +set count ddlDef 1; + +// ddlDef_t +use ddlDef_t; +set count structList structCount; +set count enumList enumCount; +set count next 1; + +// ddlStructDef_t +use ddlStructDef_t; +set string name; +set count members memberCount; +set count hashTable memberCount; + +// ddlMemberDef_t +set string ddlMemberDef_t::name; + +// ddlEnumDef_t +use ddlEnumDef_t; +set string name; +set string members; +set count members memberCount; +set count hashTable memberCount; // ========================================= // EmblemSet @@ -524,6 +551,30 @@ set string KeyValuePair::value; // ========================================= // VehicleDef // ========================================= +use VehicleDef; +set string name; +set string turretWeapon; +set string gunnerWeapon; +set string sndNames; +set string sndMaterialNames; +set string futzName; +set string animSet; +set string deathFxSound; +set string shootShock; +set string shootRumble; +set string rumbleType; +set string compassIcon; +set string gasButtonName; +set string reverseBrakeButtonName; +set string handBrakeButtonName; +set string attackButtonName; +set string attackSecondaryButtonName; +set string boostButtonName; +set string moveUpButtonName; +set string moveDownButtonName; +set string switchSeatButtonName; +set string steerGraphName; +set string accelGraphName; // ========================================= // MemoryBlock diff --git a/src/ZoneLoading/Game/T6/ContentLoaderT6.cpp b/src/ZoneLoading/Game/T6/ContentLoaderT6.cpp index 4b0b0ea6..052400b3 100644 --- a/src/ZoneLoading/Game/T6/ContentLoaderT6.cpp +++ b/src/ZoneLoading/Game/T6/ContentLoaderT6.cpp @@ -139,11 +139,11 @@ void ContentLoaderT6::LoadXAsset(const bool atStreamStart) LOAD_ASSET(ASSET_TYPE_STRINGTABLE, StringTable, stringTable); // LOAD_ASSET(ASSET_TYPE_LEADERBOARD, LeaderboardDef, leaderboardDef); // LOAD_ASSET(ASSET_TYPE_XGLOBALS, XGlobals, xGlobals); - // LOAD_ASSET(ASSET_TYPE_DDL, ddlRoot_t, ddlRoot); + LOAD_ASSET(ASSET_TYPE_DDL, ddlRoot_t, ddlRoot); // LOAD_ASSET(ASSET_TYPE_GLASSES, Glasses, glasses); // LOAD_ASSET(ASSET_TYPE_EMBLEMSET, EmblemSet, emblemSet); LOAD_ASSET(ASSET_TYPE_SCRIPTPARSETREE, ScriptParseTree, scriptParseTree); - // LOAD_ASSET(ASSET_TYPE_KEYVALUEPAIRS, KeyValuePairs, keyValuePairs); + LOAD_ASSET(ASSET_TYPE_KEYVALUEPAIRS, KeyValuePairs, keyValuePairs); // LOAD_ASSET(ASSET_TYPE_VEHICLEDEF, VehicleDef, vehicleDef); // LOAD_ASSET(ASSET_TYPE_MEMORYBLOCK, MemoryBlock, memoryBlock); // LOAD_ASSET(ASSET_TYPE_ADDON_MAP_ENTS, AddonMapEnts, addonMapEnts);