diff --git a/src/ZoneCode/Game/IW3/XAssets/ComWorld.txt b/src/ZoneCode/Game/IW3/XAssets/ComWorld.txt index 494f2208..6bd5b8b9 100644 --- a/src/ZoneCode/Game/IW3/XAssets/ComWorld.txt +++ b/src/ZoneCode/Game/IW3/XAssets/ComWorld.txt @@ -2,6 +2,7 @@ // ComWorld // ========================================= use ComWorld; +set block XFILE_BLOCK_TEMP; set string name; set name name; set count primaryLights primaryLightCount; diff --git a/src/ZoneCode/Game/IW3/XAssets/Font_s.txt b/src/ZoneCode/Game/IW3/XAssets/Font_s.txt index 478248b3..f37cf707 100644 --- a/src/ZoneCode/Game/IW3/XAssets/Font_s.txt +++ b/src/ZoneCode/Game/IW3/XAssets/Font_s.txt @@ -2,6 +2,7 @@ // Font_s // ========================================= use Font_s; +set block XFILE_BLOCK_TEMP; set string fontName; set name fontName; set reusable glyphs; diff --git a/src/ZoneCode/Game/IW3/XAssets/FxEffectDef.txt b/src/ZoneCode/Game/IW3/XAssets/FxEffectDef.txt index 0e803c63..9698c3d0 100644 --- a/src/ZoneCode/Game/IW3/XAssets/FxEffectDef.txt +++ b/src/ZoneCode/Game/IW3/XAssets/FxEffectDef.txt @@ -2,6 +2,7 @@ // FxEffectDef // ========================================= use FxEffectDef; +set block XFILE_BLOCK_TEMP; set string name; set name name; set count elemDefs elemDefCountEmission + elemDefCountLooping + elemDefCountOneShot; diff --git a/src/ZoneCode/Game/IW3/XAssets/FxImpactTable.txt b/src/ZoneCode/Game/IW3/XAssets/FxImpactTable.txt index 8909ad19..6bc02194 100644 --- a/src/ZoneCode/Game/IW3/XAssets/FxImpactTable.txt +++ b/src/ZoneCode/Game/IW3/XAssets/FxImpactTable.txt @@ -2,6 +2,7 @@ // FxImpactTable // ========================================= use FxImpactTable; +set block XFILE_BLOCK_TEMP; set string name; set name name; set count table 12; \ No newline at end of file diff --git a/src/ZoneCode/Game/IW3/XAssets/GameWorldMp.txt b/src/ZoneCode/Game/IW3/XAssets/GameWorldMp.txt index de8e45ee..27732a84 100644 --- a/src/ZoneCode/Game/IW3/XAssets/GameWorldMp.txt +++ b/src/ZoneCode/Game/IW3/XAssets/GameWorldMp.txt @@ -2,5 +2,6 @@ // GameWorldMp // ========================================= use GameWorldMp; +set block XFILE_BLOCK_TEMP; set string name; set name name; \ No newline at end of file diff --git a/src/ZoneCode/Game/IW3/XAssets/GameWorldSp.txt b/src/ZoneCode/Game/IW3/XAssets/GameWorldSp.txt index c8d16979..18559f15 100644 --- a/src/ZoneCode/Game/IW3/XAssets/GameWorldSp.txt +++ b/src/ZoneCode/Game/IW3/XAssets/GameWorldSp.txt @@ -2,6 +2,7 @@ // GameWorldSp // ========================================= use GameWorldSp; +set block XFILE_BLOCK_TEMP; set string name; set name name; diff --git a/src/ZoneCode/Game/IW3/XAssets/GfxImage.txt b/src/ZoneCode/Game/IW3/XAssets/GfxImage.txt index 474674cb..38e3bec4 100644 --- a/src/ZoneCode/Game/IW3/XAssets/GfxImage.txt +++ b/src/ZoneCode/Game/IW3/XAssets/GfxImage.txt @@ -2,6 +2,7 @@ // GfxImage // ========================================= use GfxImage; +set block XFILE_BLOCK_TEMP; set action OnImageLoaded(GfxImage); set string name; set name name; diff --git a/src/ZoneCode/Game/IW3/XAssets/GfxLightDef.txt b/src/ZoneCode/Game/IW3/XAssets/GfxLightDef.txt index a587320e..ca07fc87 100644 --- a/src/ZoneCode/Game/IW3/XAssets/GfxLightDef.txt +++ b/src/ZoneCode/Game/IW3/XAssets/GfxLightDef.txt @@ -2,5 +2,6 @@ // GfxLightDef // ========================================= use GfxLightDef; +set block XFILE_BLOCK_TEMP; set string name; set name name; \ No newline at end of file diff --git a/src/ZoneCode/Game/IW3/XAssets/GfxWorld.txt b/src/ZoneCode/Game/IW3/XAssets/GfxWorld.txt index 99e16a64..5c7a4c86 100644 --- a/src/ZoneCode/Game/IW3/XAssets/GfxWorld.txt +++ b/src/ZoneCode/Game/IW3/XAssets/GfxWorld.txt @@ -2,6 +2,7 @@ // GfxWorld // ========================================= use GfxWorld; +set block XFILE_BLOCK_TEMP; set string name; set name name; set string baseName; diff --git a/src/ZoneCode/Game/IW3/XAssets/LoadedSound.txt b/src/ZoneCode/Game/IW3/XAssets/LoadedSound.txt index fa0a092f..0cef20e5 100644 --- a/src/ZoneCode/Game/IW3/XAssets/LoadedSound.txt +++ b/src/ZoneCode/Game/IW3/XAssets/LoadedSound.txt @@ -2,6 +2,7 @@ // LoadedSound // ========================================= use LoadedSound; +set block XFILE_BLOCK_TEMP; set string name; set name name; diff --git a/src/ZoneCode/Game/IW3/XAssets/LocalizeEntry.txt b/src/ZoneCode/Game/IW3/XAssets/LocalizeEntry.txt index 98fb1f89..a93f61b4 100644 --- a/src/ZoneCode/Game/IW3/XAssets/LocalizeEntry.txt +++ b/src/ZoneCode/Game/IW3/XAssets/LocalizeEntry.txt @@ -2,6 +2,7 @@ // LocalizeEntry // ========================================= use LocalizeEntry; +set block XFILE_BLOCK_TEMP; set string name; set name name; set string value; \ No newline at end of file diff --git a/src/ZoneCode/Game/IW3/XAssets/MapEnts.txt b/src/ZoneCode/Game/IW3/XAssets/MapEnts.txt index 88f12c65..7540ff74 100644 --- a/src/ZoneCode/Game/IW3/XAssets/MapEnts.txt +++ b/src/ZoneCode/Game/IW3/XAssets/MapEnts.txt @@ -2,6 +2,7 @@ // MapEnts // ========================================= use MapEnts; +set block XFILE_BLOCK_TEMP; set string name; set name name; set count entityString numEntityChars; \ No newline at end of file diff --git a/src/ZoneCode/Game/IW3/XAssets/Material.txt b/src/ZoneCode/Game/IW3/XAssets/Material.txt index adf46797..b0f52d34 100644 --- a/src/ZoneCode/Game/IW3/XAssets/Material.txt +++ b/src/ZoneCode/Game/IW3/XAssets/Material.txt @@ -2,6 +2,7 @@ // Material // ========================================= use Material; +set block XFILE_BLOCK_TEMP; set string info::name; set name info::name; set reusable textureTable; diff --git a/src/ZoneCode/Game/IW3/XAssets/MaterialTechniqueSet.txt b/src/ZoneCode/Game/IW3/XAssets/MaterialTechniqueSet.txt index b025dec1..2494619d 100644 --- a/src/ZoneCode/Game/IW3/XAssets/MaterialTechniqueSet.txt +++ b/src/ZoneCode/Game/IW3/XAssets/MaterialTechniqueSet.txt @@ -2,6 +2,7 @@ // MaterialTechniqueSet // ========================================= use MaterialTechniqueSet; +set block XFILE_BLOCK_TEMP; set string name; set name name; set condition remappedTechniqueSet never; diff --git a/src/ZoneCode/Game/IW3/XAssets/MenuList.txt b/src/ZoneCode/Game/IW3/XAssets/MenuList.txt index bcc2bb31..5db2bd62 100644 --- a/src/ZoneCode/Game/IW3/XAssets/MenuList.txt +++ b/src/ZoneCode/Game/IW3/XAssets/MenuList.txt @@ -2,6 +2,7 @@ // MenuList // ========================================= use MenuList; +set block XFILE_BLOCK_TEMP; set string name; set name name; set count menus menuCount; \ No newline at end of file diff --git a/src/ZoneCode/Game/IW3/XAssets/PhysPreset.txt b/src/ZoneCode/Game/IW3/XAssets/PhysPreset.txt index 7478bc2a..38346b9b 100644 --- a/src/ZoneCode/Game/IW3/XAssets/PhysPreset.txt +++ b/src/ZoneCode/Game/IW3/XAssets/PhysPreset.txt @@ -2,6 +2,7 @@ // PhysPreset // ========================================= use PhysPreset; +set block XFILE_BLOCK_TEMP; set string name; set name name; set string sndAliasPrefix; \ No newline at end of file diff --git a/src/ZoneCode/Game/IW3/XAssets/RawFile.txt b/src/ZoneCode/Game/IW3/XAssets/RawFile.txt index 242b2d68..29e05132 100644 --- a/src/ZoneCode/Game/IW3/XAssets/RawFile.txt +++ b/src/ZoneCode/Game/IW3/XAssets/RawFile.txt @@ -2,6 +2,7 @@ // RawFile // ========================================= use RawFile; +set block XFILE_BLOCK_TEMP; set string name; set name name; set count buffer len + 1; \ No newline at end of file diff --git a/src/ZoneCode/Game/IW3/XAssets/SndCurve.txt b/src/ZoneCode/Game/IW3/XAssets/SndCurve.txt index 2281b2d0..7c90a72a 100644 --- a/src/ZoneCode/Game/IW3/XAssets/SndCurve.txt +++ b/src/ZoneCode/Game/IW3/XAssets/SndCurve.txt @@ -2,5 +2,6 @@ // SndCurve // ========================================= use SndCurve; +set block XFILE_BLOCK_TEMP; set string filename; set name filename; \ No newline at end of file diff --git a/src/ZoneCode/Game/IW3/XAssets/StringTable.txt b/src/ZoneCode/Game/IW3/XAssets/StringTable.txt index b161cabb..0e036fff 100644 --- a/src/ZoneCode/Game/IW3/XAssets/StringTable.txt +++ b/src/ZoneCode/Game/IW3/XAssets/StringTable.txt @@ -2,6 +2,7 @@ // StringTable // ========================================= use StringTable; +// String table is not in the temp block for some reason. nice. set string name; set name name; set string values; diff --git a/src/ZoneCode/Game/IW3/XAssets/WeaponDef.txt b/src/ZoneCode/Game/IW3/XAssets/WeaponDef.txt index 25d9a0af..2a276d2c 100644 --- a/src/ZoneCode/Game/IW3/XAssets/WeaponDef.txt +++ b/src/ZoneCode/Game/IW3/XAssets/WeaponDef.txt @@ -2,6 +2,7 @@ // WeaponDef // ========================================= use WeaponDef; +set block XFILE_BLOCK_TEMP; set string szInternalName; set name szInternalName; set string szDisplayName; diff --git a/src/ZoneCode/Game/IW3/XAssets/XAnimParts.txt b/src/ZoneCode/Game/IW3/XAssets/XAnimParts.txt index 87a3a48a..529f3cab 100644 --- a/src/ZoneCode/Game/IW3/XAssets/XAnimParts.txt +++ b/src/ZoneCode/Game/IW3/XAssets/XAnimParts.txt @@ -2,6 +2,7 @@ // XAnimParts // ========================================= use XAnimParts; +set block XFILE_BLOCK_TEMP; set string name; set name name; set scriptstring names; diff --git a/src/ZoneCode/Game/IW3/XAssets/XModel.txt b/src/ZoneCode/Game/IW3/XAssets/XModel.txt index 7661d792..c2ebeaaa 100644 --- a/src/ZoneCode/Game/IW3/XAssets/XModel.txt +++ b/src/ZoneCode/Game/IW3/XAssets/XModel.txt @@ -2,6 +2,7 @@ // XModel // ========================================= use XModel; +set block XFILE_BLOCK_TEMP; set string name; set name name; set scriptstring boneNames; diff --git a/src/ZoneCode/Game/IW3/XAssets/clipMap_t.txt b/src/ZoneCode/Game/IW3/XAssets/clipMap_t.txt index 94a15464..c5186b25 100644 --- a/src/ZoneCode/Game/IW3/XAssets/clipMap_t.txt +++ b/src/ZoneCode/Game/IW3/XAssets/clipMap_t.txt @@ -2,6 +2,7 @@ // clipMap_t // ========================================= use clipMap_t; +set block XFILE_BLOCK_TEMP; set string name; set name name; set reusable planes; diff --git a/src/ZoneCode/Game/IW3/XAssets/menuDef_t.txt b/src/ZoneCode/Game/IW3/XAssets/menuDef_t.txt index 44bba130..1dee4cfe 100644 --- a/src/ZoneCode/Game/IW3/XAssets/menuDef_t.txt +++ b/src/ZoneCode/Game/IW3/XAssets/menuDef_t.txt @@ -2,6 +2,7 @@ // menuDef_t // ========================================= use menuDef_t; +set block XFILE_BLOCK_TEMP; set string window::name; set name window::name; set string font; diff --git a/src/ZoneCode/Game/IW3/XAssets/snd_alias_list_t.txt b/src/ZoneCode/Game/IW3/XAssets/snd_alias_list_t.txt index 6c5bc736..c781faf9 100644 --- a/src/ZoneCode/Game/IW3/XAssets/snd_alias_list_t.txt +++ b/src/ZoneCode/Game/IW3/XAssets/snd_alias_list_t.txt @@ -2,6 +2,7 @@ // snd_alias_list_t // ========================================= use snd_alias_list_t; +set block XFILE_BLOCK_TEMP; set string aliasName; set name aliasName; set reusable head; diff --git a/src/ZoneCode/Game/IW4/XAssets/AddonMapEnts.txt b/src/ZoneCode/Game/IW4/XAssets/AddonMapEnts.txt index e2f03d89..213a8428 100644 --- a/src/ZoneCode/Game/IW4/XAssets/AddonMapEnts.txt +++ b/src/ZoneCode/Game/IW4/XAssets/AddonMapEnts.txt @@ -2,6 +2,7 @@ // AddonMapEnts // ========================================= use AddonMapEnts; +set block XFILE_BLOCK_TEMP; set string name; set name name; set count entityString numEntityChars; \ No newline at end of file diff --git a/src/ZoneCode/Game/IW4/XAssets/ComWorld.txt b/src/ZoneCode/Game/IW4/XAssets/ComWorld.txt index 494f2208..6bd5b8b9 100644 --- a/src/ZoneCode/Game/IW4/XAssets/ComWorld.txt +++ b/src/ZoneCode/Game/IW4/XAssets/ComWorld.txt @@ -2,6 +2,7 @@ // ComWorld // ========================================= use ComWorld; +set block XFILE_BLOCK_TEMP; set string name; set name name; set count primaryLights primaryLightCount; diff --git a/src/ZoneCode/Game/IW4/XAssets/Font_s.txt b/src/ZoneCode/Game/IW4/XAssets/Font_s.txt index 478248b3..f37cf707 100644 --- a/src/ZoneCode/Game/IW4/XAssets/Font_s.txt +++ b/src/ZoneCode/Game/IW4/XAssets/Font_s.txt @@ -2,6 +2,7 @@ // Font_s // ========================================= use Font_s; +set block XFILE_BLOCK_TEMP; set string fontName; set name fontName; set reusable glyphs; diff --git a/src/ZoneCode/Game/IW4/XAssets/FxEffectDef.txt b/src/ZoneCode/Game/IW4/XAssets/FxEffectDef.txt index ac839940..261df4c7 100644 --- a/src/ZoneCode/Game/IW4/XAssets/FxEffectDef.txt +++ b/src/ZoneCode/Game/IW4/XAssets/FxEffectDef.txt @@ -2,6 +2,7 @@ // FxEffectDef // ========================================= use FxEffectDef; +set block XFILE_BLOCK_TEMP; set string name; set name name; set count elemDefs elemDefCountEmission + elemDefCountLooping + elemDefCountOneShot; diff --git a/src/ZoneCode/Game/IW4/XAssets/FxImpactTable.txt b/src/ZoneCode/Game/IW4/XAssets/FxImpactTable.txt index 8b28737e..990b4fcc 100644 --- a/src/ZoneCode/Game/IW4/XAssets/FxImpactTable.txt +++ b/src/ZoneCode/Game/IW4/XAssets/FxImpactTable.txt @@ -2,6 +2,7 @@ // FxImpactTable // ========================================= use FxImpactTable; +set block XFILE_BLOCK_TEMP; set string name; set name name; set count table 15; \ No newline at end of file diff --git a/src/ZoneCode/Game/IW4/XAssets/FxWorld.txt b/src/ZoneCode/Game/IW4/XAssets/FxWorld.txt index 4b50ef27..8f20223e 100644 --- a/src/ZoneCode/Game/IW4/XAssets/FxWorld.txt +++ b/src/ZoneCode/Game/IW4/XAssets/FxWorld.txt @@ -2,6 +2,7 @@ // FxWorld // ========================================= use FxWorld; +set block XFILE_BLOCK_TEMP; set string name; set name name; diff --git a/src/ZoneCode/Game/IW4/XAssets/GameWorldMp.txt b/src/ZoneCode/Game/IW4/XAssets/GameWorldMp.txt index de8e45ee..27732a84 100644 --- a/src/ZoneCode/Game/IW4/XAssets/GameWorldMp.txt +++ b/src/ZoneCode/Game/IW4/XAssets/GameWorldMp.txt @@ -2,5 +2,6 @@ // GameWorldMp // ========================================= use GameWorldMp; +set block XFILE_BLOCK_TEMP; set string name; set name name; \ No newline at end of file diff --git a/src/ZoneCode/Game/IW4/XAssets/GameWorldSp.txt b/src/ZoneCode/Game/IW4/XAssets/GameWorldSp.txt index 1cd3f011..bca8ab69 100644 --- a/src/ZoneCode/Game/IW4/XAssets/GameWorldSp.txt +++ b/src/ZoneCode/Game/IW4/XAssets/GameWorldSp.txt @@ -2,6 +2,7 @@ // GameWorldSp // ========================================= use GameWorldSp; +set block XFILE_BLOCK_TEMP; set string name; set name name; diff --git a/src/ZoneCode/Game/IW4/XAssets/GfxImage.txt b/src/ZoneCode/Game/IW4/XAssets/GfxImage.txt index 474674cb..38e3bec4 100644 --- a/src/ZoneCode/Game/IW4/XAssets/GfxImage.txt +++ b/src/ZoneCode/Game/IW4/XAssets/GfxImage.txt @@ -2,6 +2,7 @@ // GfxImage // ========================================= use GfxImage; +set block XFILE_BLOCK_TEMP; set action OnImageLoaded(GfxImage); set string name; set name name; diff --git a/src/ZoneCode/Game/IW4/XAssets/GfxLightDef.txt b/src/ZoneCode/Game/IW4/XAssets/GfxLightDef.txt index a587320e..ca07fc87 100644 --- a/src/ZoneCode/Game/IW4/XAssets/GfxLightDef.txt +++ b/src/ZoneCode/Game/IW4/XAssets/GfxLightDef.txt @@ -2,5 +2,6 @@ // GfxLightDef // ========================================= use GfxLightDef; +set block XFILE_BLOCK_TEMP; set string name; set name name; \ No newline at end of file diff --git a/src/ZoneCode/Game/IW4/XAssets/GfxWorld.txt b/src/ZoneCode/Game/IW4/XAssets/GfxWorld.txt index 473b1db5..d8069d2c 100644 --- a/src/ZoneCode/Game/IW4/XAssets/GfxWorld.txt +++ b/src/ZoneCode/Game/IW4/XAssets/GfxWorld.txt @@ -2,6 +2,7 @@ // GfxWorld // ========================================= use GfxWorld; +set block XFILE_BLOCK_TEMP; set string name; set name name; set string baseName; diff --git a/src/ZoneCode/Game/IW4/XAssets/LeaderboardDef.txt b/src/ZoneCode/Game/IW4/XAssets/LeaderboardDef.txt index 8398c04f..8dd30900 100644 --- a/src/ZoneCode/Game/IW4/XAssets/LeaderboardDef.txt +++ b/src/ZoneCode/Game/IW4/XAssets/LeaderboardDef.txt @@ -2,6 +2,7 @@ // LeaderboardDef // ========================================= use LeaderboardDef; +set block XFILE_BLOCK_TEMP; set string name; set name name; set count columns columnCount; diff --git a/src/ZoneCode/Game/IW4/XAssets/LoadedSound.txt b/src/ZoneCode/Game/IW4/XAssets/LoadedSound.txt index fa0a092f..0cef20e5 100644 --- a/src/ZoneCode/Game/IW4/XAssets/LoadedSound.txt +++ b/src/ZoneCode/Game/IW4/XAssets/LoadedSound.txt @@ -2,6 +2,7 @@ // LoadedSound // ========================================= use LoadedSound; +set block XFILE_BLOCK_TEMP; set string name; set name name; diff --git a/src/ZoneCode/Game/IW4/XAssets/LocalizeEntry.txt b/src/ZoneCode/Game/IW4/XAssets/LocalizeEntry.txt index 98fb1f89..a93f61b4 100644 --- a/src/ZoneCode/Game/IW4/XAssets/LocalizeEntry.txt +++ b/src/ZoneCode/Game/IW4/XAssets/LocalizeEntry.txt @@ -2,6 +2,7 @@ // LocalizeEntry // ========================================= use LocalizeEntry; +set block XFILE_BLOCK_TEMP; set string name; set name name; set string value; \ No newline at end of file diff --git a/src/ZoneCode/Game/IW4/XAssets/MapEnts.txt b/src/ZoneCode/Game/IW4/XAssets/MapEnts.txt index 03dd896c..e8edf78e 100644 --- a/src/ZoneCode/Game/IW4/XAssets/MapEnts.txt +++ b/src/ZoneCode/Game/IW4/XAssets/MapEnts.txt @@ -2,6 +2,7 @@ // MapEnts // ========================================= use MapEnts; +set block XFILE_BLOCK_TEMP; set string name; set name name; set count entityString numEntityChars; diff --git a/src/ZoneCode/Game/IW4/XAssets/Material.txt b/src/ZoneCode/Game/IW4/XAssets/Material.txt index adf46797..b0f52d34 100644 --- a/src/ZoneCode/Game/IW4/XAssets/Material.txt +++ b/src/ZoneCode/Game/IW4/XAssets/Material.txt @@ -2,6 +2,7 @@ // Material // ========================================= use Material; +set block XFILE_BLOCK_TEMP; set string info::name; set name info::name; set reusable textureTable; diff --git a/src/ZoneCode/Game/IW4/XAssets/MaterialPixelShader.txt b/src/ZoneCode/Game/IW4/XAssets/MaterialPixelShader.txt index bb551119..76a69ebc 100644 --- a/src/ZoneCode/Game/IW4/XAssets/MaterialPixelShader.txt +++ b/src/ZoneCode/Game/IW4/XAssets/MaterialPixelShader.txt @@ -2,6 +2,7 @@ // MaterialPixelShader // ========================================= use MaterialPixelShader; +set block XFILE_BLOCK_TEMP; set string name; set name name; diff --git a/src/ZoneCode/Game/IW4/XAssets/MaterialTechniqueSet.txt b/src/ZoneCode/Game/IW4/XAssets/MaterialTechniqueSet.txt index 4b34b49b..1a6780c3 100644 --- a/src/ZoneCode/Game/IW4/XAssets/MaterialTechniqueSet.txt +++ b/src/ZoneCode/Game/IW4/XAssets/MaterialTechniqueSet.txt @@ -2,6 +2,7 @@ // MaterialTechniqueSet // ========================================= use MaterialTechniqueSet; +set block XFILE_BLOCK_TEMP; set string name; set name name; set condition remappedTechniqueSet never; diff --git a/src/ZoneCode/Game/IW4/XAssets/MaterialVertexDeclaration.txt b/src/ZoneCode/Game/IW4/XAssets/MaterialVertexDeclaration.txt index 47f1addc..fda4bd7a 100644 --- a/src/ZoneCode/Game/IW4/XAssets/MaterialVertexDeclaration.txt +++ b/src/ZoneCode/Game/IW4/XAssets/MaterialVertexDeclaration.txt @@ -2,6 +2,7 @@ // MaterialVertexDeclaration // ========================================= use MaterialVertexDeclaration; +set block XFILE_BLOCK_TEMP; set string name; set name name; diff --git a/src/ZoneCode/Game/IW4/XAssets/MaterialVertexShader.txt b/src/ZoneCode/Game/IW4/XAssets/MaterialVertexShader.txt index 37c2a44d..c4731d45 100644 --- a/src/ZoneCode/Game/IW4/XAssets/MaterialVertexShader.txt +++ b/src/ZoneCode/Game/IW4/XAssets/MaterialVertexShader.txt @@ -2,6 +2,7 @@ // MaterialVertexShader // ========================================= use MaterialVertexShader; +set block XFILE_BLOCK_TEMP; set string name; set name name; diff --git a/src/ZoneCode/Game/IW4/XAssets/MenuList.txt b/src/ZoneCode/Game/IW4/XAssets/MenuList.txt index bcc2bb31..5db2bd62 100644 --- a/src/ZoneCode/Game/IW4/XAssets/MenuList.txt +++ b/src/ZoneCode/Game/IW4/XAssets/MenuList.txt @@ -2,6 +2,7 @@ // MenuList // ========================================= use MenuList; +set block XFILE_BLOCK_TEMP; set string name; set name name; set count menus menuCount; \ No newline at end of file diff --git a/src/ZoneCode/Game/IW4/XAssets/PhysCollmap.txt b/src/ZoneCode/Game/IW4/XAssets/PhysCollmap.txt index 68c66746..09f0540f 100644 --- a/src/ZoneCode/Game/IW4/XAssets/PhysCollmap.txt +++ b/src/ZoneCode/Game/IW4/XAssets/PhysCollmap.txt @@ -2,6 +2,7 @@ // PhysCollmap // ========================================= use PhysCollmap; +set block XFILE_BLOCK_TEMP; set string name; set name name; set count geoms count; diff --git a/src/ZoneCode/Game/IW4/XAssets/PhysPreset.txt b/src/ZoneCode/Game/IW4/XAssets/PhysPreset.txt index 7478bc2a..38346b9b 100644 --- a/src/ZoneCode/Game/IW4/XAssets/PhysPreset.txt +++ b/src/ZoneCode/Game/IW4/XAssets/PhysPreset.txt @@ -2,6 +2,7 @@ // PhysPreset // ========================================= use PhysPreset; +set block XFILE_BLOCK_TEMP; set string name; set name name; set string sndAliasPrefix; \ No newline at end of file diff --git a/src/ZoneCode/Game/IW4/XAssets/RawFile.txt b/src/ZoneCode/Game/IW4/XAssets/RawFile.txt index b9b93b93..fd5cc065 100644 --- a/src/ZoneCode/Game/IW4/XAssets/RawFile.txt +++ b/src/ZoneCode/Game/IW4/XAssets/RawFile.txt @@ -2,6 +2,7 @@ // RawFile // ========================================= use RawFile; +set block XFILE_BLOCK_TEMP; set string name; set name name; set condition data::compressedBuffer compressedLen > 0; diff --git a/src/ZoneCode/Game/IW4/XAssets/SndCurve.txt b/src/ZoneCode/Game/IW4/XAssets/SndCurve.txt index 2281b2d0..7c90a72a 100644 --- a/src/ZoneCode/Game/IW4/XAssets/SndCurve.txt +++ b/src/ZoneCode/Game/IW4/XAssets/SndCurve.txt @@ -2,5 +2,6 @@ // SndCurve // ========================================= use SndCurve; +set block XFILE_BLOCK_TEMP; set string filename; set name filename; \ No newline at end of file diff --git a/src/ZoneCode/Game/IW4/XAssets/StringTable.txt b/src/ZoneCode/Game/IW4/XAssets/StringTable.txt index d3a3141d..7e818127 100644 --- a/src/ZoneCode/Game/IW4/XAssets/StringTable.txt +++ b/src/ZoneCode/Game/IW4/XAssets/StringTable.txt @@ -2,6 +2,7 @@ // StringTable // ========================================= use StringTable; +set block XFILE_BLOCK_TEMP; set string name; set name name; set count values columnCount * rowCount; diff --git a/src/ZoneCode/Game/IW4/XAssets/StructuredDataDefSet.txt b/src/ZoneCode/Game/IW4/XAssets/StructuredDataDefSet.txt index b7e95bad..44c21d4e 100644 --- a/src/ZoneCode/Game/IW4/XAssets/StructuredDataDefSet.txt +++ b/src/ZoneCode/Game/IW4/XAssets/StructuredDataDefSet.txt @@ -2,6 +2,7 @@ // StructuredDataDefSet // ========================================= use StructuredDataDefSet; +set block XFILE_BLOCK_TEMP; set string name; set name name; set count defs defCount; diff --git a/src/ZoneCode/Game/IW4/XAssets/TracerDef.txt b/src/ZoneCode/Game/IW4/XAssets/TracerDef.txt index 63ff7667..d51f996f 100644 --- a/src/ZoneCode/Game/IW4/XAssets/TracerDef.txt +++ b/src/ZoneCode/Game/IW4/XAssets/TracerDef.txt @@ -2,5 +2,6 @@ // TracerDef // ========================================= use TracerDef; +set block XFILE_BLOCK_TEMP; set string name; set name name; \ No newline at end of file diff --git a/src/ZoneCode/Game/IW4/XAssets/VehicleDef.txt b/src/ZoneCode/Game/IW4/XAssets/VehicleDef.txt index 2e3be62d..ec44c85a 100644 --- a/src/ZoneCode/Game/IW4/XAssets/VehicleDef.txt +++ b/src/ZoneCode/Game/IW4/XAssets/VehicleDef.txt @@ -2,6 +2,7 @@ // VehicleDef // ========================================= use VehicleDef; +set block XFILE_BLOCK_TEMP; set string name; set name name; set string useHintString; diff --git a/src/ZoneCode/Game/IW4/XAssets/WeaponCompleteDef.txt b/src/ZoneCode/Game/IW4/XAssets/WeaponCompleteDef.txt index e3234598..d55ed68f 100644 --- a/src/ZoneCode/Game/IW4/XAssets/WeaponCompleteDef.txt +++ b/src/ZoneCode/Game/IW4/XAssets/WeaponCompleteDef.txt @@ -2,6 +2,7 @@ // WeaponCompleteDef // ========================================= use WeaponCompleteDef; +set block XFILE_BLOCK_TEMP; set string szInternalName; set name szInternalName; set reusable weapDef; diff --git a/src/ZoneCode/Game/IW4/XAssets/XAnimParts.txt b/src/ZoneCode/Game/IW4/XAssets/XAnimParts.txt index b519c6d1..5e856218 100644 --- a/src/ZoneCode/Game/IW4/XAssets/XAnimParts.txt +++ b/src/ZoneCode/Game/IW4/XAssets/XAnimParts.txt @@ -2,6 +2,7 @@ // XAnimParts // ========================================= use XAnimParts; +set block XFILE_BLOCK_TEMP; set string name; set name name; set scriptstring names; diff --git a/src/ZoneCode/Game/IW4/XAssets/XModel.txt b/src/ZoneCode/Game/IW4/XAssets/XModel.txt index 4606f77c..8d524564 100644 --- a/src/ZoneCode/Game/IW4/XAssets/XModel.txt +++ b/src/ZoneCode/Game/IW4/XAssets/XModel.txt @@ -2,6 +2,7 @@ // XModel // ========================================= use XModel; +set block XFILE_BLOCK_TEMP; set string name; set name name; set scriptstring boneNames; diff --git a/src/ZoneCode/Game/IW4/XAssets/clipMap_t.txt b/src/ZoneCode/Game/IW4/XAssets/clipMap_t.txt index 349d39a3..f2636192 100644 --- a/src/ZoneCode/Game/IW4/XAssets/clipMap_t.txt +++ b/src/ZoneCode/Game/IW4/XAssets/clipMap_t.txt @@ -2,6 +2,7 @@ // clipMap_t // ========================================= use clipMap_t; +set block XFILE_BLOCK_TEMP; set string name; set name name; set reusable planes; diff --git a/src/ZoneCode/Game/IW4/XAssets/menuDef_t.txt b/src/ZoneCode/Game/IW4/XAssets/menuDef_t.txt index c73f9abe..70db6feb 100644 --- a/src/ZoneCode/Game/IW4/XAssets/menuDef_t.txt +++ b/src/ZoneCode/Game/IW4/XAssets/menuDef_t.txt @@ -2,6 +2,7 @@ // menuDef_t // ========================================= use menuDef_t; +set block XFILE_BLOCK_TEMP; set string window::name; set name window::name; set string font; diff --git a/src/ZoneCode/Game/IW4/XAssets/snd_alias_list_t.txt b/src/ZoneCode/Game/IW4/XAssets/snd_alias_list_t.txt index 459a9cf5..8558afc7 100644 --- a/src/ZoneCode/Game/IW4/XAssets/snd_alias_list_t.txt +++ b/src/ZoneCode/Game/IW4/XAssets/snd_alias_list_t.txt @@ -2,6 +2,7 @@ // snd_alias_list_t // ========================================= use snd_alias_list_t; +set block XFILE_BLOCK_TEMP; set string aliasName; set name aliasName; set reusable head; diff --git a/src/ZoneCode/Game/T6/XAssets/AddonMapEnts.txt b/src/ZoneCode/Game/T6/XAssets/AddonMapEnts.txt index bd5e831d..bc95797f 100644 --- a/src/ZoneCode/Game/T6/XAssets/AddonMapEnts.txt +++ b/src/ZoneCode/Game/T6/XAssets/AddonMapEnts.txt @@ -2,6 +2,7 @@ // AddonMapEnts // ========================================= use AddonMapEnts; +set block XFILE_BLOCK_TEMP; set string name; set name name; set count entityString numEntityChars; diff --git a/src/ZoneCode/Game/T6/XAssets/ComWorld.txt b/src/ZoneCode/Game/T6/XAssets/ComWorld.txt index 494f2208..6bd5b8b9 100644 --- a/src/ZoneCode/Game/T6/XAssets/ComWorld.txt +++ b/src/ZoneCode/Game/T6/XAssets/ComWorld.txt @@ -2,6 +2,7 @@ // ComWorld // ========================================= use ComWorld; +set block XFILE_BLOCK_TEMP; set string name; set name name; set count primaryLights primaryLightCount; diff --git a/src/ZoneCode/Game/T6/XAssets/DestructibleDef.txt b/src/ZoneCode/Game/T6/XAssets/DestructibleDef.txt index e6353c17..2060abe7 100644 --- a/src/ZoneCode/Game/T6/XAssets/DestructibleDef.txt +++ b/src/ZoneCode/Game/T6/XAssets/DestructibleDef.txt @@ -2,6 +2,7 @@ // DestructibleDef // ========================================= use DestructibleDef; +set block XFILE_BLOCK_TEMP; set string name; set name name; set count pieces numPieces; diff --git a/src/ZoneCode/Game/T6/XAssets/EmblemSet.txt b/src/ZoneCode/Game/T6/XAssets/EmblemSet.txt index 68d3d31d..c37f24ac 100644 --- a/src/ZoneCode/Game/T6/XAssets/EmblemSet.txt +++ b/src/ZoneCode/Game/T6/XAssets/EmblemSet.txt @@ -2,6 +2,7 @@ // EmblemSet // ========================================= use EmblemSet; +set block XFILE_BLOCK_TEMP; set count layers layerCount; set count categories categoryCount; set count iconTypes iconTypeCount; diff --git a/src/ZoneCode/Game/T6/XAssets/FontIcon.txt b/src/ZoneCode/Game/T6/XAssets/FontIcon.txt index 2efc6208..f292f486 100644 --- a/src/ZoneCode/Game/T6/XAssets/FontIcon.txt +++ b/src/ZoneCode/Game/T6/XAssets/FontIcon.txt @@ -2,6 +2,7 @@ // FontIcon // ========================================= use FontIcon; +set block XFILE_BLOCK_TEMP; set string name; set name name; set reusable fontIconEntry; diff --git a/src/ZoneCode/Game/T6/XAssets/Font_s.txt b/src/ZoneCode/Game/T6/XAssets/Font_s.txt index 8cedd629..73809f62 100644 --- a/src/ZoneCode/Game/T6/XAssets/Font_s.txt +++ b/src/ZoneCode/Game/T6/XAssets/Font_s.txt @@ -2,6 +2,7 @@ // Font_s // ========================================= use Font_s; +set block XFILE_BLOCK_TEMP; set string fontName; set name fontName; set reusable glyphs; diff --git a/src/ZoneCode/Game/T6/XAssets/FootstepFXTableDef.txt b/src/ZoneCode/Game/T6/XAssets/FootstepFXTableDef.txt index 8d708572..90463815 100644 --- a/src/ZoneCode/Game/T6/XAssets/FootstepFXTableDef.txt +++ b/src/ZoneCode/Game/T6/XAssets/FootstepFXTableDef.txt @@ -2,5 +2,6 @@ // FootstepFXTableDef // ========================================= use FootstepFXTableDef; +set block XFILE_BLOCK_TEMP; set string name; set name name; \ No newline at end of file diff --git a/src/ZoneCode/Game/T6/XAssets/FootstepTableDef.txt b/src/ZoneCode/Game/T6/XAssets/FootstepTableDef.txt index e3a96a9a..d8942f86 100644 --- a/src/ZoneCode/Game/T6/XAssets/FootstepTableDef.txt +++ b/src/ZoneCode/Game/T6/XAssets/FootstepTableDef.txt @@ -2,5 +2,6 @@ // FootstepTableDef // ========================================= use FootstepTableDef; +set block XFILE_BLOCK_TEMP; set string name; set name name; \ No newline at end of file diff --git a/src/ZoneCode/Game/T6/XAssets/FxEffectDef.txt b/src/ZoneCode/Game/T6/XAssets/FxEffectDef.txt index fe3a19dc..569379af 100644 --- a/src/ZoneCode/Game/T6/XAssets/FxEffectDef.txt +++ b/src/ZoneCode/Game/T6/XAssets/FxEffectDef.txt @@ -2,6 +2,7 @@ // FxEffectDef // ========================================= use FxEffectDef; +set block XFILE_BLOCK_TEMP; set string name; set name name; set count elemDefs elemDefCountLooping + elemDefCountOneShot + elemDefCountEmission; diff --git a/src/ZoneCode/Game/T6/XAssets/FxImpactTable.txt b/src/ZoneCode/Game/T6/XAssets/FxImpactTable.txt index cf503f0b..5545afd5 100644 --- a/src/ZoneCode/Game/T6/XAssets/FxImpactTable.txt +++ b/src/ZoneCode/Game/T6/XAssets/FxImpactTable.txt @@ -2,6 +2,7 @@ // FxImpactTable // ========================================= use FxImpactTable; +set block XFILE_BLOCK_TEMP; set string name; //set name name; set count table 21; \ No newline at end of file diff --git a/src/ZoneCode/Game/T6/XAssets/GameWorldMp.txt b/src/ZoneCode/Game/T6/XAssets/GameWorldMp.txt index de8e45ee..27732a84 100644 --- a/src/ZoneCode/Game/T6/XAssets/GameWorldMp.txt +++ b/src/ZoneCode/Game/T6/XAssets/GameWorldMp.txt @@ -2,5 +2,6 @@ // GameWorldMp // ========================================= use GameWorldMp; +set block XFILE_BLOCK_TEMP; set string name; set name name; \ No newline at end of file diff --git a/src/ZoneCode/Game/T6/XAssets/GameWorldSp.txt b/src/ZoneCode/Game/T6/XAssets/GameWorldSp.txt index 28f29508..0a8a6a67 100644 --- a/src/ZoneCode/Game/T6/XAssets/GameWorldSp.txt +++ b/src/ZoneCode/Game/T6/XAssets/GameWorldSp.txt @@ -2,6 +2,7 @@ // GameWorldSp // ========================================= use GameWorldSp; +set block XFILE_BLOCK_TEMP; set string name; set name name; diff --git a/src/ZoneCode/Game/T6/XAssets/GfxImage.txt b/src/ZoneCode/Game/T6/XAssets/GfxImage.txt index e59e9746..63446ba4 100644 --- a/src/ZoneCode/Game/T6/XAssets/GfxImage.txt +++ b/src/ZoneCode/Game/T6/XAssets/GfxImage.txt @@ -2,6 +2,7 @@ // GfxImage // ========================================= use GfxImage; +set block XFILE_BLOCK_TEMP; set action OnImageLoaded(GfxImage); set string name; set name name; diff --git a/src/ZoneCode/Game/T6/XAssets/GfxLightDef.txt b/src/ZoneCode/Game/T6/XAssets/GfxLightDef.txt index a587320e..ca07fc87 100644 --- a/src/ZoneCode/Game/T6/XAssets/GfxLightDef.txt +++ b/src/ZoneCode/Game/T6/XAssets/GfxLightDef.txt @@ -2,5 +2,6 @@ // GfxLightDef // ========================================= use GfxLightDef; +set block XFILE_BLOCK_TEMP; set string name; set name name; \ No newline at end of file diff --git a/src/ZoneCode/Game/T6/XAssets/GfxWorld.txt b/src/ZoneCode/Game/T6/XAssets/GfxWorld.txt index 07145d72..f2d16c27 100644 --- a/src/ZoneCode/Game/T6/XAssets/GfxWorld.txt +++ b/src/ZoneCode/Game/T6/XAssets/GfxWorld.txt @@ -2,6 +2,7 @@ // GfxWorld // ========================================= use GfxWorld; +set block XFILE_BLOCK_TEMP; set string name; set name name; set string baseName; diff --git a/src/ZoneCode/Game/T6/XAssets/Glasses.txt b/src/ZoneCode/Game/T6/XAssets/Glasses.txt index e7913e73..8bbd95a4 100644 --- a/src/ZoneCode/Game/T6/XAssets/Glasses.txt +++ b/src/ZoneCode/Game/T6/XAssets/Glasses.txt @@ -2,6 +2,7 @@ // Glasses // ========================================= use Glasses; +set block XFILE_BLOCK_TEMP; set string name; set name name; set count glasses numGlasses; diff --git a/src/ZoneCode/Game/T6/XAssets/KeyValuePairs.txt b/src/ZoneCode/Game/T6/XAssets/KeyValuePairs.txt index 50cd661d..37c69fab 100644 --- a/src/ZoneCode/Game/T6/XAssets/KeyValuePairs.txt +++ b/src/ZoneCode/Game/T6/XAssets/KeyValuePairs.txt @@ -2,6 +2,7 @@ // KeyValuePairs // ========================================= use KeyValuePairs; +set block XFILE_BLOCK_TEMP; set string name; set name name; set count keyValuePairs numVariables; diff --git a/src/ZoneCode/Game/T6/XAssets/LeaderboardDef.txt b/src/ZoneCode/Game/T6/XAssets/LeaderboardDef.txt index abf1ead9..5137b1c1 100644 --- a/src/ZoneCode/Game/T6/XAssets/LeaderboardDef.txt +++ b/src/ZoneCode/Game/T6/XAssets/LeaderboardDef.txt @@ -2,6 +2,7 @@ // LeaderboardDef // ========================================= use LeaderboardDef; +set block XFILE_BLOCK_TEMP; set string name; set name name; set count columns columnCount; diff --git a/src/ZoneCode/Game/T6/XAssets/LocalizeEntry.txt b/src/ZoneCode/Game/T6/XAssets/LocalizeEntry.txt index 95c71e26..6dc49902 100644 --- a/src/ZoneCode/Game/T6/XAssets/LocalizeEntry.txt +++ b/src/ZoneCode/Game/T6/XAssets/LocalizeEntry.txt @@ -2,6 +2,7 @@ // LocalizeEntry // ========================================= use LocalizeEntry; +set block XFILE_BLOCK_TEMP; set string value; set string name; set name name; \ No newline at end of file diff --git a/src/ZoneCode/Game/T6/XAssets/MapEnts.txt b/src/ZoneCode/Game/T6/XAssets/MapEnts.txt index a7db1dfb..e7ccb22a 100644 --- a/src/ZoneCode/Game/T6/XAssets/MapEnts.txt +++ b/src/ZoneCode/Game/T6/XAssets/MapEnts.txt @@ -2,6 +2,7 @@ // MapEnts // ========================================= use MapEnts; +set block XFILE_BLOCK_TEMP; set string name; set name name; set count entityString numEntityChars; diff --git a/src/ZoneCode/Game/T6/XAssets/Material.txt b/src/ZoneCode/Game/T6/XAssets/Material.txt index a079ca8e..367a82e6 100644 --- a/src/ZoneCode/Game/T6/XAssets/Material.txt +++ b/src/ZoneCode/Game/T6/XAssets/Material.txt @@ -2,6 +2,7 @@ // Material // ========================================= use Material; +set block XFILE_BLOCK_TEMP; set string info::name; set name info::name; set reusable textureTable; diff --git a/src/ZoneCode/Game/T6/XAssets/MaterialTechniqueSet.txt b/src/ZoneCode/Game/T6/XAssets/MaterialTechniqueSet.txt index 2ec72626..544e056f 100644 --- a/src/ZoneCode/Game/T6/XAssets/MaterialTechniqueSet.txt +++ b/src/ZoneCode/Game/T6/XAssets/MaterialTechniqueSet.txt @@ -2,6 +2,7 @@ // MaterialTechniqueSet // ========================================= use MaterialTechniqueSet; +set block XFILE_BLOCK_TEMP; set string name; set name name; set reusable techniques; diff --git a/src/ZoneCode/Game/T6/XAssets/MemoryBlock.txt b/src/ZoneCode/Game/T6/XAssets/MemoryBlock.txt index ea3e104b..00c9fd64 100644 --- a/src/ZoneCode/Game/T6/XAssets/MemoryBlock.txt +++ b/src/ZoneCode/Game/T6/XAssets/MemoryBlock.txt @@ -2,6 +2,7 @@ // MemoryBlock // ========================================= use MemoryBlock; +set block XFILE_BLOCK_TEMP; set string name; set name name; diff --git a/src/ZoneCode/Game/T6/XAssets/MenuList.txt b/src/ZoneCode/Game/T6/XAssets/MenuList.txt index bcc2bb31..5db2bd62 100644 --- a/src/ZoneCode/Game/T6/XAssets/MenuList.txt +++ b/src/ZoneCode/Game/T6/XAssets/MenuList.txt @@ -2,6 +2,7 @@ // MenuList // ========================================= use MenuList; +set block XFILE_BLOCK_TEMP; set string name; set name name; set count menus menuCount; \ No newline at end of file diff --git a/src/ZoneCode/Game/T6/XAssets/PhysConstraints.txt b/src/ZoneCode/Game/T6/XAssets/PhysConstraints.txt index 386fa670..6a476b3e 100644 --- a/src/ZoneCode/Game/T6/XAssets/PhysConstraints.txt +++ b/src/ZoneCode/Game/T6/XAssets/PhysConstraints.txt @@ -2,6 +2,7 @@ // PhysConstraints // ========================================= use PhysConstraints; +set block XFILE_BLOCK_TEMP; set string name; set name name; diff --git a/src/ZoneCode/Game/T6/XAssets/PhysPreset.txt b/src/ZoneCode/Game/T6/XAssets/PhysPreset.txt index 7478bc2a..38346b9b 100644 --- a/src/ZoneCode/Game/T6/XAssets/PhysPreset.txt +++ b/src/ZoneCode/Game/T6/XAssets/PhysPreset.txt @@ -2,6 +2,7 @@ // PhysPreset // ========================================= use PhysPreset; +set block XFILE_BLOCK_TEMP; set string name; set name name; set string sndAliasPrefix; \ No newline at end of file diff --git a/src/ZoneCode/Game/T6/XAssets/Qdb.txt b/src/ZoneCode/Game/T6/XAssets/Qdb.txt index b9b1b8cd..4f7d87cc 100644 --- a/src/ZoneCode/Game/T6/XAssets/Qdb.txt +++ b/src/ZoneCode/Game/T6/XAssets/Qdb.txt @@ -2,6 +2,7 @@ // Qdb // ========================================= use Qdb; +set block XFILE_BLOCK_TEMP; set string name; set name name; set count buffer len + 1; \ No newline at end of file diff --git a/src/ZoneCode/Game/T6/XAssets/RawFile.txt b/src/ZoneCode/Game/T6/XAssets/RawFile.txt index 242b2d68..29e05132 100644 --- a/src/ZoneCode/Game/T6/XAssets/RawFile.txt +++ b/src/ZoneCode/Game/T6/XAssets/RawFile.txt @@ -2,6 +2,7 @@ // RawFile // ========================================= use RawFile; +set block XFILE_BLOCK_TEMP; set string name; set name name; set count buffer len + 1; \ No newline at end of file diff --git a/src/ZoneCode/Game/T6/XAssets/ScriptParseTree.txt b/src/ZoneCode/Game/T6/XAssets/ScriptParseTree.txt index ce008f94..d5b933eb 100644 --- a/src/ZoneCode/Game/T6/XAssets/ScriptParseTree.txt +++ b/src/ZoneCode/Game/T6/XAssets/ScriptParseTree.txt @@ -2,6 +2,7 @@ // ScriptParseTree // ========================================= use ScriptParseTree; +set block XFILE_BLOCK_TEMP; set string name; set name name; set count buffer len + 1; \ No newline at end of file diff --git a/src/ZoneCode/Game/T6/XAssets/SkinnedVertsDef.txt b/src/ZoneCode/Game/T6/XAssets/SkinnedVertsDef.txt index 2cf5c334..e0b19d50 100644 --- a/src/ZoneCode/Game/T6/XAssets/SkinnedVertsDef.txt +++ b/src/ZoneCode/Game/T6/XAssets/SkinnedVertsDef.txt @@ -2,5 +2,6 @@ // SkinnedVertsDef // ========================================= use SkinnedVertsDef; +set block XFILE_BLOCK_TEMP; set string name; set name name; \ No newline at end of file diff --git a/src/ZoneCode/Game/T6/XAssets/Slug.txt b/src/ZoneCode/Game/T6/XAssets/Slug.txt index fd9cabaf..049159c6 100644 --- a/src/ZoneCode/Game/T6/XAssets/Slug.txt +++ b/src/ZoneCode/Game/T6/XAssets/Slug.txt @@ -2,6 +2,7 @@ // Slug // ========================================= use Slug; +set block XFILE_BLOCK_TEMP; set string name; set name name; set count buffer len + 1; \ No newline at end of file diff --git a/src/ZoneCode/Game/T6/XAssets/SndBank.txt b/src/ZoneCode/Game/T6/XAssets/SndBank.txt index 7818e60a..3911a392 100644 --- a/src/ZoneCode/Game/T6/XAssets/SndBank.txt +++ b/src/ZoneCode/Game/T6/XAssets/SndBank.txt @@ -2,6 +2,7 @@ // SndBank // ========================================= use SndBank; +set block XFILE_BLOCK_TEMP; set string name; set name name; set count alias aliasCount; diff --git a/src/ZoneCode/Game/T6/XAssets/SndDriverGlobals.txt b/src/ZoneCode/Game/T6/XAssets/SndDriverGlobals.txt index 9223752c..eee19c7b 100644 --- a/src/ZoneCode/Game/T6/XAssets/SndDriverGlobals.txt +++ b/src/ZoneCode/Game/T6/XAssets/SndDriverGlobals.txt @@ -2,6 +2,7 @@ // SndDriverGlobals // ========================================= use SndDriverGlobals; +set block XFILE_BLOCK_TEMP; set string name; set name name; set count groups groupCount; diff --git a/src/ZoneCode/Game/T6/XAssets/SndPatch.txt b/src/ZoneCode/Game/T6/XAssets/SndPatch.txt index 14739cbd..9dee7c8f 100644 --- a/src/ZoneCode/Game/T6/XAssets/SndPatch.txt +++ b/src/ZoneCode/Game/T6/XAssets/SndPatch.txt @@ -2,6 +2,7 @@ // SndPatch // ========================================= use SndPatch; +set block XFILE_BLOCK_TEMP; set string name; set name name; set count elements elementCount; \ No newline at end of file diff --git a/src/ZoneCode/Game/T6/XAssets/StringTable.txt b/src/ZoneCode/Game/T6/XAssets/StringTable.txt index 7620e719..b1b5e1ac 100644 --- a/src/ZoneCode/Game/T6/XAssets/StringTable.txt +++ b/src/ZoneCode/Game/T6/XAssets/StringTable.txt @@ -2,6 +2,7 @@ // StringTable // ========================================= use StringTable; +set block XFILE_BLOCK_TEMP; set string name; set name name; set count values columnCount * rowCount; diff --git a/src/ZoneCode/Game/T6/XAssets/TracerDef.txt b/src/ZoneCode/Game/T6/XAssets/TracerDef.txt index 63ff7667..d51f996f 100644 --- a/src/ZoneCode/Game/T6/XAssets/TracerDef.txt +++ b/src/ZoneCode/Game/T6/XAssets/TracerDef.txt @@ -2,5 +2,6 @@ // TracerDef // ========================================= use TracerDef; +set block XFILE_BLOCK_TEMP; set string name; set name name; \ No newline at end of file diff --git a/src/ZoneCode/Game/T6/XAssets/VehicleDef.txt b/src/ZoneCode/Game/T6/XAssets/VehicleDef.txt index 4780632e..edeef39c 100644 --- a/src/ZoneCode/Game/T6/XAssets/VehicleDef.txt +++ b/src/ZoneCode/Game/T6/XAssets/VehicleDef.txt @@ -2,6 +2,7 @@ // VehicleDef // ========================================= use VehicleDef; +set block XFILE_BLOCK_TEMP; set string name; set name name; set string turretWeapon; diff --git a/src/ZoneCode/Game/T6/XAssets/WeaponAttachment.txt b/src/ZoneCode/Game/T6/XAssets/WeaponAttachment.txt index 314fff50..65d388f0 100644 --- a/src/ZoneCode/Game/T6/XAssets/WeaponAttachment.txt +++ b/src/ZoneCode/Game/T6/XAssets/WeaponAttachment.txt @@ -2,6 +2,7 @@ // WeaponAttachment // ========================================= use WeaponAttachment; +set block XFILE_BLOCK_TEMP; set string szInternalName; set name szInternalName; set string szDisplayName; \ No newline at end of file diff --git a/src/ZoneCode/Game/T6/XAssets/WeaponAttachmentUnique.txt b/src/ZoneCode/Game/T6/XAssets/WeaponAttachmentUnique.txt index 898456fd..70a29d34 100644 --- a/src/ZoneCode/Game/T6/XAssets/WeaponAttachmentUnique.txt +++ b/src/ZoneCode/Game/T6/XAssets/WeaponAttachmentUnique.txt @@ -2,6 +2,7 @@ // WeaponAttachmentUnique // ========================================= use WeaponAttachmentUnique; +set block XFILE_BLOCK_TEMP; set string szInternalName; set name szInternalName; set string szAltWeaponName; diff --git a/src/ZoneCode/Game/T6/XAssets/WeaponCamo.txt b/src/ZoneCode/Game/T6/XAssets/WeaponCamo.txt index 704d7947..db426441 100644 --- a/src/ZoneCode/Game/T6/XAssets/WeaponCamo.txt +++ b/src/ZoneCode/Game/T6/XAssets/WeaponCamo.txt @@ -2,6 +2,7 @@ // WeaponCamo // ========================================= use WeaponCamo; +set block XFILE_BLOCK_TEMP; set string name; set name name; set count camoSets numCamoSets; diff --git a/src/ZoneCode/Game/T6/XAssets/WeaponVariantDef.txt b/src/ZoneCode/Game/T6/XAssets/WeaponVariantDef.txt index 9f3e6d77..a4567854 100644 --- a/src/ZoneCode/Game/T6/XAssets/WeaponVariantDef.txt +++ b/src/ZoneCode/Game/T6/XAssets/WeaponVariantDef.txt @@ -2,6 +2,7 @@ // WeaponVariantDef // ========================================= use WeaponVariantDef; +set block XFILE_BLOCK_TEMP; set string szInternalName; set name szInternalName; set reusable weapDef; diff --git a/src/ZoneCode/Game/T6/XAssets/XAnimParts.txt b/src/ZoneCode/Game/T6/XAssets/XAnimParts.txt index b519c6d1..5e856218 100644 --- a/src/ZoneCode/Game/T6/XAssets/XAnimParts.txt +++ b/src/ZoneCode/Game/T6/XAssets/XAnimParts.txt @@ -2,6 +2,7 @@ // XAnimParts // ========================================= use XAnimParts; +set block XFILE_BLOCK_TEMP; set string name; set name name; set scriptstring names; diff --git a/src/ZoneCode/Game/T6/XAssets/XGlobals.txt b/src/ZoneCode/Game/T6/XAssets/XGlobals.txt index 24a41e4c..96361b03 100644 --- a/src/ZoneCode/Game/T6/XAssets/XGlobals.txt +++ b/src/ZoneCode/Game/T6/XAssets/XGlobals.txt @@ -2,6 +2,7 @@ // XGlobals // ========================================= use XGlobals; +set block XFILE_BLOCK_TEMP; set string name; set name name; set arraycount gumps gumpsCount; diff --git a/src/ZoneCode/Game/T6/XAssets/XModel.txt b/src/ZoneCode/Game/T6/XAssets/XModel.txt index 68951a96..13bf0712 100644 --- a/src/ZoneCode/Game/T6/XAssets/XModel.txt +++ b/src/ZoneCode/Game/T6/XAssets/XModel.txt @@ -2,6 +2,7 @@ // XModel // ========================================= use XModel; +set block XFILE_BLOCK_TEMP; set string name; set name name; set scriptstring boneNames; diff --git a/src/ZoneCode/Game/T6/XAssets/ZBarrierDef.txt b/src/ZoneCode/Game/T6/XAssets/ZBarrierDef.txt index 456ac914..d903bbec 100644 --- a/src/ZoneCode/Game/T6/XAssets/ZBarrierDef.txt +++ b/src/ZoneCode/Game/T6/XAssets/ZBarrierDef.txt @@ -2,6 +2,7 @@ // ZBarrierDef // ========================================= use ZBarrierDef; +set block XFILE_BLOCK_TEMP; set string name; set name name; set scriptstring zombieTauntAnimState; diff --git a/src/ZoneCode/Game/T6/XAssets/clipMap_t.txt b/src/ZoneCode/Game/T6/XAssets/clipMap_t.txt index e2b567c7..ab35cc83 100644 --- a/src/ZoneCode/Game/T6/XAssets/clipMap_t.txt +++ b/src/ZoneCode/Game/T6/XAssets/clipMap_t.txt @@ -2,6 +2,7 @@ // clipMap_t // ========================================= use clipMap_t; +set block XFILE_BLOCK_TEMP; set string name; set name name; set block pInfo XFILE_BLOCK_TEMP; diff --git a/src/ZoneCode/Game/T6/XAssets/ddlRoot_t.txt b/src/ZoneCode/Game/T6/XAssets/ddlRoot_t.txt index 7d3c576b..aeb44d56 100644 --- a/src/ZoneCode/Game/T6/XAssets/ddlRoot_t.txt +++ b/src/ZoneCode/Game/T6/XAssets/ddlRoot_t.txt @@ -2,6 +2,7 @@ // ddlRoot_t // ========================================= use ddlRoot_t; +set block XFILE_BLOCK_TEMP; set string name; set name name; set count ddlDef 1; diff --git a/src/ZoneCode/Game/T6/XAssets/menuDef_t.txt b/src/ZoneCode/Game/T6/XAssets/menuDef_t.txt index 6c137220..3dd0fa9c 100644 --- a/src/ZoneCode/Game/T6/XAssets/menuDef_t.txt +++ b/src/ZoneCode/Game/T6/XAssets/menuDef_t.txt @@ -2,6 +2,7 @@ // menuDef_t // ========================================= use menuDef_t; +set block XFILE_BLOCK_TEMP; set string window::name; set name window::name; set string font; diff --git a/src/ZoneCodeGeneratorLib/Generating/Templates/ZoneLoadTemplate.cpp b/src/ZoneCodeGeneratorLib/Generating/Templates/ZoneLoadTemplate.cpp index 9dd4f5a2..7b56ebb4 100644 --- a/src/ZoneCodeGeneratorLib/Generating/Templates/ZoneLoadTemplate.cpp +++ b/src/ZoneCodeGeneratorLib/Generating/Templates/ZoneLoadTemplate.cpp @@ -908,16 +908,16 @@ class ZoneLoadTemplate::Internal final : BaseTemplate LINE("assert(atStreamStart);") } - if (info->m_block) + if (computations.IsAsset()) + { + LINE("") + LINE("m_stream->PushBlock(" << m_env.m_default_normal_block->m_name << ");") + } + else if (info->m_block) { LINE("") LINE("m_stream->PushBlock("<m_block->m_name<<");") } - else if (computations.IsAsset()) - { - LINE("") - LINE("m_stream->PushBlock("<m_name<<");") - } for (const auto& member : info->m_ordered_members) { @@ -934,8 +934,9 @@ class ZoneLoadTemplate::Internal final : BaseTemplate LINE("}") } - void PrintLoadTempPtrMethod(StructureInformation* info) + void PrintLoadPtrMethod(StructureInformation* info) { + const bool inTemp = info->m_block && info->m_block->m_type == FastFileBlockType::TEMP; LINE("void "<m_definition)<<"(const bool atStreamStart)") LINE("{") m_intendation++; @@ -949,24 +950,42 @@ class ZoneLoadTemplate::Internal final : BaseTemplate m_intendation--; LINE("") - LINE("m_stream->PushBlock("<m_name<<");") - LINE("") + if (inTemp) + { + LINE("m_stream->PushBlock(" << m_env.m_default_temp_block->m_name << ");") + LINE("") + } + LINE("if(*"<< MakeTypePtrVarName(info->m_definition)<<" != nullptr)") LINE("{") m_intendation++; - LINE("if(*" << MakeTypePtrVarName(info->m_definition) << " == PTR_FOLLOWING || *" << MakeTypePtrVarName(info->m_definition) << " == PTR_INSERT)") + if (inTemp) + { + LINE("if(*" << MakeTypePtrVarName(info->m_definition) << " == PTR_FOLLOWING || *" << MakeTypePtrVarName(info->m_definition) << " == PTR_INSERT)") + } + else + { + LINE("if(*" << MakeTypePtrVarName(info->m_definition) << " == PTR_FOLLOWING)") + } LINE("{") m_intendation++; - LINE(info->m_definition->GetFullName() << "* ptr = *" << MakeTypePtrVarName(info->m_definition) << ";") + if (inTemp) + { + LINE(info->m_definition->GetFullName() << "* ptr = *" << MakeTypePtrVarName(info->m_definition) << ";") + } LINE("*" << MakeTypePtrVarName(info->m_definition) << " = m_stream->Alloc<" << info->m_definition->GetFullName() << ">("<< info->m_definition->GetAlignment() <<");") - LINE("") - LINE(info->m_definition->GetFullName() << "** toInsert = nullptr;") - LINE("if(ptr == PTR_INSERT)") - m_intendation++; - LINE("toInsert = m_stream->InsertPointer<"<m_definition->GetFullName()<<">();") - m_intendation--; + + if (inTemp) + { + LINE("") + LINE(info->m_definition->GetFullName() << "** toInsert = nullptr;") + LINE("if(ptr == PTR_INSERT)") + m_intendation++; + LINE("toInsert = m_stream->InsertPointer<" << info->m_definition->GetFullName() << ">();") + m_intendation--; + } auto startLoadSection = true; @@ -982,7 +1001,7 @@ class ZoneLoadTemplate::Internal final : BaseTemplate } else { - LINE("#error Temp method cannot have leaf type") + LINE("#error Ptr method cannot have leaf type") } if (info->m_post_load_action) @@ -997,15 +1016,18 @@ class ZoneLoadTemplate::Internal final : BaseTemplate LINE("LoadAsset_"<m_definition)<<"("<m_definition)<<");") } - if (!startLoadSection) + if (inTemp) { - LINE("") - } + if (!startLoadSection) + { + LINE("") + } - LINE("if(toInsert != nullptr)") - m_intendation++; - LINE("*toInsert = *"<m_definition)<<";") - m_intendation--; + LINE("if(toInsert != nullptr)") + m_intendation++; + LINE("*toInsert = *" << MakeTypePtrVarName(info->m_definition) << ";") + m_intendation--; + } m_intendation--; LINE("}") @@ -1013,7 +1035,14 @@ class ZoneLoadTemplate::Internal final : BaseTemplate LINE("{") m_intendation++; - LINE("*"<m_definition)<<" = m_stream->ConvertOffsetToAlias(*"<m_definition)<<");") + if (inTemp) + { + LINE("*" << MakeTypePtrVarName(info->m_definition) << " = m_stream->ConvertOffsetToAlias(*" << MakeTypePtrVarName(info->m_definition) << ");") + } + else + { + LINE("*" << MakeTypePtrVarName(info->m_definition) << " = m_stream->ConvertOffsetToPointer(*" << MakeTypePtrVarName(info->m_definition) << ");") + } m_intendation--; LINE("}") @@ -1021,8 +1050,11 @@ class ZoneLoadTemplate::Internal final : BaseTemplate m_intendation--; LINE("}") - LINE("") - LINE("m_stream->PopBlock();") + if (inTemp) + { + LINE("") + LINE("m_stream->PopBlock();") + } m_intendation--; LINE("}") @@ -1249,7 +1281,7 @@ public: LINE("") PrintLoadMethod(m_env.m_asset); LINE("") - PrintLoadTempPtrMethod(m_env.m_asset); + PrintLoadPtrMethod(m_env.m_asset); LINE("") PrintLoadAssetMethod(m_env.m_asset); LINE("") diff --git a/src/ZoneCodeGeneratorLib/Generating/Templates/ZoneWriteTemplate.cpp b/src/ZoneCodeGeneratorLib/Generating/Templates/ZoneWriteTemplate.cpp index 64915c63..9f4b3c3c 100644 --- a/src/ZoneCodeGeneratorLib/Generating/Templates/ZoneWriteTemplate.cpp +++ b/src/ZoneCodeGeneratorLib/Generating/Templates/ZoneWriteTemplate.cpp @@ -267,7 +267,7 @@ class ZoneWriteTemplate::Internal final : BaseTemplate void WriteMember_DynamicArray(StructureInformation* info, MemberInformation* member, const DeclarationModifierComputations& modifier) const { std::string memberAccess; - if(!(info->m_definition->GetType() == DataDefinitionType::UNION && StructureComputations(info).GetDynamicMember())) + if (!(info->m_definition->GetType() == DataDefinitionType::UNION && StructureComputations(info).GetDynamicMember())) memberAccess = MakeMemberAccess("originalData", info, member, modifier); else memberAccess = MakeMemberAccess(info, member, modifier); @@ -418,11 +418,11 @@ class ZoneWriteTemplate::Internal final : BaseTemplate return; } - if(writeType == MemberWriteType::ARRAY_POINTER) + if (writeType == MemberWriteType::ARRAY_POINTER) { LINE("m_stream->ReusableAddOffset("<ReusableAddOffset("<m_block) - { - LINE("") - LINE("m_stream->PushBlock(" << info->m_block->m_name << ");") - } - else if (computations.IsAsset()) + if (computations.IsAsset()) { LINE("") LINE("m_stream->PushBlock(" << m_env.m_default_normal_block->m_name << ");") } + else if (info->m_block) + { + LINE("") + LINE("m_stream->PushBlock(" << info->m_block->m_name << ");") + } for (const auto& member : info->m_ordered_members) { @@ -811,8 +811,9 @@ class ZoneWriteTemplate::Internal final : BaseTemplate LINE("}") } - void PrintWriteTempPtrMethod(StructureInformation* info) + void PrintWritePtrMethod(StructureInformation* info) { + const bool inTemp = info->m_block && info->m_block->m_type == FastFileBlockType::TEMP; LINE("void " << WriterClassName(m_env.m_asset) << "::WritePtr_" << MakeSafeTypeName(info->m_definition) << "(const bool atStreamStart)") LINE("{") m_intendation++; @@ -826,8 +827,11 @@ class ZoneWriteTemplate::Internal final : BaseTemplate m_intendation--; LINE("") - LINE("m_stream->PushBlock(" << m_env.m_default_temp_block->m_name << ");") - LINE("") + if (inTemp) + { + LINE("m_stream->PushBlock(" << m_env.m_default_temp_block->m_name << ");") + LINE("") + } LINE("if(m_stream->ReusableShouldWrite(" << MakeTypePtrVarName(info->m_definition) << "))") LINE("{") m_intendation++; @@ -842,7 +846,7 @@ class ZoneWriteTemplate::Internal final : BaseTemplate } else { - LINE("#error Temp method cannot have leaf type") + LINE("#error Ptr method cannot have leaf type") } LINE("") @@ -851,8 +855,11 @@ class ZoneWriteTemplate::Internal final : BaseTemplate m_intendation--; LINE("}") - LINE("") - LINE("m_stream->PopBlock();") + if (inTemp) + { + LINE("") + LINE("m_stream->PopBlock();") + } m_intendation--; LINE("}") @@ -915,7 +922,7 @@ class ZoneWriteTemplate::Internal final : BaseTemplate { LINE("m_stream->Align("<GetAlignment()<<");") - if(reusable) + if (reusable) { LINE("m_stream->ReusableAddOffset(*"<