IW5 Fixups

This commit is contained in:
Jan
2021-07-23 16:28:59 +02:00
parent 02b0f11c29
commit 88710cb3bf
27 changed files with 566 additions and 269 deletions

View File

@ -51,6 +51,8 @@ block runtime XFILE_BLOCK_RUNTIME default;
block normal XFILE_BLOCK_VIRTUAL default;
block normal XFILE_BLOCK_LARGE;
block normal XFILE_BLOCK_CALLBACK;
block normal XFILE_BLOCK_VERTEX;
block normal XFILE_BLOCK_INDEX;
block normal XFILE_BLOCK_SCRIPT;
#include "XAssets/PhysPreset.txt"

View File

@ -5,4 +5,14 @@ use AddonMapEnts;
set block XFILE_BLOCK_TEMP;
set string name;
set name name;
set count entityString numEntityChars;
set count entityString numEntityChars;
// MapTriggers
// see MapEnts
// ClipInfo
// see clipMap_t
// cmodel2_t
use cmodel2_t;
set reusable info;

View File

@ -43,6 +43,7 @@ set string name;
use FxElemExtendedDefPtr;
set condition trailDef FxElemDef::elemType == FX_ELEM_TYPE_TRAIL;
set condition sparkFountainDef FxElemDef::elemType == FX_ELEM_TYPE_SPARK_FOUNTAIN;
set condition spotLightDef FxElemDef::elemType == FX_ELEM_TYPE_SPOT_LIGHT;
// FxTrailDef
use FxTrailDef;

View File

@ -57,6 +57,7 @@ set count smodelIndexes smodelIndexCount;
use GfxCell;
set count portals portalCount;
set count reflectionProbes reflectionProbeCount;
set count reflectionProbeReferences reflectionProbeReferenceCount;
// GfxPortal
use GfxPortal;
@ -69,6 +70,7 @@ set count reflectionProbes reflectionProbeCount;
set count reflectionProbeOrigins reflectionProbeCount;
set block reflectionProbeTextures XFILE_BLOCK_RUNTIME;
set count reflectionProbeTextures reflectionProbeCount;
set count reflectionProbeReferences reflectionProbeReferenceCount;
set count lightmaps lightmapCount;
set block lightmapPrimaryTextures XFILE_BLOCK_RUNTIME;
set count lightmapPrimaryTextures lightmapCount;

View File

@ -4,4 +4,14 @@
use GlassWorld;
set block XFILE_BLOCK_TEMP;
set string name;
set name name;
set name name;
// G_GlassData
use G_GlassData;
set count glassPieces pieceCount;
set count glassNames glassNameCount;
// G_GlassName
use G_GlassName;
set string nameStr;
set count pieceIndices pieceCount;

View File

@ -6,13 +6,9 @@ set block XFILE_BLOCK_TEMP;
set string name;
set name name;
set count entityString numEntityChars;
set count stages stageCount;
// MapTriggers
use MapTriggers;
set count models count;
set count hulls hullCount;
set count slabs slabCount;
// Stage
set string Stage::name;
set count slabs slabCount;

View File

@ -11,6 +11,7 @@ set reusable constantTable;
set count constantTable constantCount;
set reusable stateBitsTable;
set count stateBitsTable stateBitsCount;
set condition subMaterials never;
// MaterialTextureDef
use MaterialTextureDef;

View File

@ -4,4 +4,32 @@
use PathData;
set block XFILE_BLOCK_TEMP;
set string name;
set name name;
set name name;
set count nodes nodeCount;
set block basenodes XFILE_BLOCK_RUNTIME;
set count basenodes nodeCount;
set count chainNodeForNode nodeCount;
set count nodeForChainNode nodeCount;
set count pathVis visBytes;
set count nodeTree nodeTreeCount;
// pathnode_t
set condition pathnode_t::dynamic never;
set condition pathnode_t::transient never;
// pathnode_constant_t
use pathnode_constant_t;
set scriptstring targetname;
set scriptstring script_linkName;
set scriptstring script_noteworthy;
set scriptstring target;
set scriptstring animscript;
set count Links totalLinkCount;
// pathnode_tree_t
use pathnode_tree_t;
set condition u::child axis >= 0;
set reusable u::child;
// pathnode_tree_nodes_t
set count pathnode_tree_nodes_t::nodes nodeCount;

View File

@ -5,6 +5,4 @@ use RawFile;
set block XFILE_BLOCK_TEMP;
set string name;
set name name;
set condition data::compressedBuffer compressedLen > 0;
set count data::compressedBuffer compressedLen;
set count data::buffer len + 1;
set count buffer compressedLen;

View File

@ -4,4 +4,8 @@
use ScriptFile;
set block XFILE_BLOCK_TEMP;
set string name;
set name name;
set name name;
set block buffer XFILE_BLOCK_SCRIPT;
set count buffer compressedLen;
set block bytecode XFILE_BLOCK_SCRIPT;
set count bytecode bytecodeLen;

View File

@ -4,4 +4,5 @@
use SurfaceFxTable;
set block XFILE_BLOCK_TEMP;
set string name;
set name name;
set name name;
set count table 6;

View File

@ -8,6 +8,8 @@ set name name;
set string useHintString;
set string turretWeaponName;
set scriptstring trophyTags;
set scriptstring audioOriginTag;
set scriptstring audioOriginTagAlt;
set string surfaceSndPrefix;
// VehiclePhysDef

View File

@ -4,4 +4,18 @@
use VehicleTrack;
set block XFILE_BLOCK_TEMP;
set string name;
set name name;
set name name;
set reusable segments;
set count segments segmentCount;
// VehicleTrackSegment
use VehicleTrackSegment;
set string targetName;
set count sectors sectorCount;
set reusable nextBranches;
set count nextBranches nextBranchesCount;
set reusable prevBranches;
set count prevBranches prevBranchesCount;
// VehicleTrackSector
set count VehicleTrackSector::obstacles obstacleCount;

View File

@ -3,5 +3,17 @@
// =========================================
use WeaponAttachment;
set block XFILE_BLOCK_TEMP;
set string name;
set name name;
set string szInternalName;
set name szInternalName;
set string szDisplayName;
set reusable worldModels;
set count worldModels 16;
set reusable viewModels;
set count viewModels 16;
set reusable reticleViewModels;
set count reticleViewModels 8;
// AttRumbles
use AttRumbles;
set string fireRumble;
set string meleeImpactRumble;

View File

@ -10,14 +10,44 @@ set string szDisplayName;
set reusable hideTags;
set scriptstring hideTags;
set count hideTags 32;
set reusable scopes;
set count scopes 6;
set reusable underBarrels;
set count underBarrels 3;
set reusable others;
set count others 4;
set string szXAnims;
set reusable szXAnims;
set count szXAnims 37;
set count szXAnims NUM_WEAP_ANIMS;
set reusable animOverrides;
set count animOverrides numAnimOverrides;
set reusable soundOverrides;
set count soundOverrides numSoundOverrides;
set reusable fxOverrides;
set count fxOverrides numFXOverrides;
set reusable reloadOverrides;
set count reloadOverrides numReloadStateTimerOverrides;
set reusable notetrackOverrides;
set count notetrackOverrides numNotetrackOverrides;
set string szAltWeaponName;
set reusable accuracyGraphKnots;
set count accuracyGraphKnots[0] accuracyGraphKnotCount[0];
set count accuracyGraphKnots[1] accuracyGraphKnotCount[1];
// AnimOverrideEntry
use AnimOverrideEntry;
set string overrideAnim;
set string altmodeAnim;
// NoteTrackToSoundEntry
use NoteTrackToSoundEntry;
set reusable notetrackSoundMapKeys;
set scriptstring notetrackSoundMapKeys;
set count notetrackSoundMapKeys 24;
set reusable notetrackSoundMapValues;
set scriptstring notetrackSoundMapValues;
set count notetrackSoundMapValues 24;
// WeaponDef
use WeaponDef;
set string szOverlayName;
@ -25,17 +55,17 @@ set reusable gunXModel;
set count gunXModel 16;
set reusable szXAnimsRightHanded;
set string szXAnimsRightHanded;
set count szXAnimsRightHanded 37;
set count szXAnimsRightHanded NUM_WEAP_ANIMS;
set reusable szXAnimsLeftHanded;
set string szXAnimsLeftHanded;
set count szXAnimsLeftHanded 37;
set count szXAnimsLeftHanded NUM_WEAP_ANIMS;
set string szModeName;
set reusable notetrackSoundMapKeys;
set scriptstring notetrackSoundMapKeys;
set count notetrackSoundMapKeys 16;
set count notetrackSoundMapKeys 24;
set reusable notetrackSoundMapValues;
set scriptstring notetrackSoundMapValues;
set count notetrackSoundMapValues 16;
set count notetrackSoundMapValues 24;
set reusable notetrackRumbleMapKeys;
set scriptstring notetrackRumbleMapKeys;
set count notetrackRumbleMapKeys 16;
@ -44,6 +74,8 @@ set scriptstring notetrackRumbleMapValues;
set count notetrackRumbleMapValues 16;
set reusable bounceSound;
set count bounceSound 31;
set reusable rollingSound;
set count rollingSound 31;
set reusable worldModel;
set count worldModel 16;
set string szAmmoName;
@ -63,10 +95,11 @@ set string szUseHintString;
set string dropHintString;
set string szScript;
set reusable locationDamageMultipliers;
set count locationDamageMultipliers 20;
set count locationDamageMultipliers HITLOC_NUM;
set string fireRumble;
set string meleeImpactRumble;
set string turretBarrelSpinRumble;
set scriptstring stowTag;
reorder:
...
accuracyGraphName0

View File

@ -24,49 +24,7 @@ set count boneInfo numBones;
// XModelLodInfo
use XModelLodInfo;
set block modelSurfs XFILE_BLOCK_TEMP;
set action modelSurfs SetModelSurfs(XModelLodInfo, XModelSurfs);
set reusable modelSurfs;
set condition surfs never;
// XModelSurfs
use XModelSurfs;
set block XFILE_BLOCK_VIRTUAL;
set string name;
set count surfs XModelLodInfo::numsurfs; // No this is not a mistake. This is how the game does it.
// XSurface
use XSurface;
set reusable verts0;
set block verts0 XFILE_BLOCK_VERTEX;
set count verts0 vertCount;
set reusable vertList;
set count vertList vertListCount;
set reusable triIndices;
set block triIndices XFILE_BLOCK_INDEX;
set count triIndices triCount;
reorder:
zoneHandle
vertInfo
verts0
vertList
triIndices;
// XSurfaceVertexInfo
use XSurfaceVertexInfo;
set reusable vertsBlend;
set count vertsBlend vertCount[0]
+ 3 * vertCount[1]
+ 5 * vertCount[2]
+ 7 * vertCount[3];
// XRigidVertList
set reusable XRigidVertList::collisionTree;
// XSurfaceCollisionTree
use XSurfaceCollisionTree;
set count nodes nodeCount;
set count leafs leafCount;
// XModelCollSurf_s
set count XModelCollSurf_s::collTris numCollTris;

View File

@ -4,4 +4,44 @@
use XModelSurfs;
set block XFILE_BLOCK_TEMP;
set string name;
set name name;
set name name;
set count surfs numsurfs;
// XSurface
use XSurface;
set reusable vertList;
set count vertList vertListCount;
set reusable triIndices;
set block triIndices XFILE_BLOCK_INDEX;
set count triIndices triCount;
reorder:
zoneHandle
vertInfo
verts0
vertList
triIndices;
// XSurfaceVertexInfo
use XSurfaceVertexInfo;
set reusable vertsBlend;
set count vertsBlend vertCount[0]
+ 3 * vertCount[1]
+ 5 * vertCount[2]
+ 7 * vertCount[3];
// GfxVertexUnion0
use GfxVertexUnion0;
set condition quantizedNoColorVerts0 never;
set condition quantizedVerts0 never;
set condition verts0 never;
set reusable packedVerts0;
set block packedVerts0 XFILE_BLOCK_VERTEX;
set count packedVerts0 XSurface::vertCount;
// XRigidVertList
set reusable XRigidVertList::collisionTree;
// XSurfaceCollisionTree
use XSurfaceCollisionTree;
set count nodes nodeCount;
set count leafs leafCount;

View File

@ -5,17 +5,11 @@ use clipMap_t;
set block XFILE_BLOCK_TEMP;
set string name;
set name name;
set reusable planes;
set count planes planeCount;
set block pInfo XFILE_BLOCK_TEMP;
set reusable pInfo;
set count staticModelList numStaticModels;
set count materials numMaterials;
set count brushsides numBrushSides;
set count brushEdges numBrushEdges;
set count nodes numNodes;
set count leafs numLeafs;
set count leafbrushNodes leafbrushNodesCount;
set count leafbrushes numLeafBrushes;
set count leafsurfaces numLeafSurfaces;
set count verts vertCount;
set count triIndices 3 * triCount;
set count triEdgeIsWalkable ((3 * triCount + 31) / 32) * 4;
@ -23,10 +17,8 @@ set count borders borderCount;
set count partitions partitionCount;
set count aabbTrees aabbTreeCount;
set count cmodels numSubModels;
set count brushes numBrushes;
set count brushBounds numBrushes;
set count brushContents numBrushes;
set count smodelNodes smodelNodeCount;
set count stages stageCount;
set count dynEntDefList[0] dynEntCount[0];
set count dynEntDefList[1] dynEntCount[1];
set block dynEntPoseList XFILE_BLOCK_RUNTIME;
@ -38,20 +30,34 @@ set count dynEntClientList[1] dynEntCount[1];
set block dynEntCollList XFILE_BLOCK_RUNTIME;
set count dynEntCollList[0] dynEntCount[0];
set count dynEntCollList[1] dynEntCount[1];
reorder:
...
leafs
leafbrushes
leafbrushNodes;
reorder:
...
brushContents
smodelNodes
mapEnts;
// ClipInfo
use ClipInfo;
set reusable planes;
set count planes planeCount;
set reusable materials;
set count materials numMaterials;
set reusable brushsides;
set count brushsides numBrushSides;
set reusable brushEdges;
set count brushEdges numBrushEdges;
set reusable leafbrushNodes;
set count leafbrushNodes leafbrushNodesCount;
set reusable leafbrushes;
set count leafbrushes numLeafBrushes;
set reusable brushes;
set count brushes numBrushes;
set reusable brushBounds;
set count brushBounds numBrushes;
set reusable brushContents;
set count brushContents numBrushes;
// ClipMaterial
set string ClipMaterial::name;
// cbrushside_t
// see PhysCollmap
// cNode_t
set reusable cNode_t::plane;
@ -62,10 +68,15 @@ set reusable data::leaf::brushes;
set count data::leaf::brushes leafBrushCount;
// CollisionPartition
use CollisionPartition;
set reusable borders;
set reusable CollisionPartition::borders;
// cbrush_t
use cbrush_t;
set reusable sides;
set reusable baseAdjacentSide;
set reusable baseAdjacentSide;
// Stage
set string Stage::name;
// DynEntityDef
set reusable DynEntityDef::hinge;

View File

@ -5,7 +5,16 @@ use menuDef_t;
set block XFILE_BLOCK_TEMP;
set string window::name;
set name window::name;
set string font;
set count items itemCount;
// windowDef_t
use windowDef_t;
set string name;
set string group;
// menuData_t
use menuData_t;
set reusable expressionData;
set reusable visibleExp;
set string allowedBinding;
set string soundName;
@ -15,32 +24,10 @@ set reusable rectWExp;
set reusable rectHExp;
set reusable openSoundExp;
set reusable closeSoundExp;
set count items itemCount;
set reusable expressionData;
set reusable soundLoopExp;
reorder:
expressionData
window
font
onOpen
onClose
onCloseRequest
onESC
onKey
visibleExp
allowedBinding
soundName
rectXExp
rectYExp
rectWExp
rectHExp
openSoundExp
closeSoundExp
items;
// windowDef_t
use windowDef_t;
set string name;
set string group;
onOpen;
// MenuEventHandlerSet
set count MenuEventHandlerSet::eventHandlers eventHandlerCount;
@ -72,7 +59,7 @@ set reusable expression;
use Statement_s;
set count entries numEntries;
set reusable supportingData;
set condition lastResult never;
set condition persistentState never;
// expressionEntry
set condition expressionEntry::data::operand type == EET_OPERAND;
@ -123,6 +110,9 @@ set condition enumDvarName itemDef_s::type == 13;
set condition ticker itemDef_s::type == 20;
set condition scroll itemDef_s::type == 21;
// listBoxDef_s
set reusable listBoxDef_s::elementHeightExp;
// multiDef_s
use multiDef_s;
set string dvarList;