XML update. Added user version to the ControllerLink priority field.

gen/ControllerLink.h

@@ -46,8 +46,7 @@ struct ControllerLink {
 	/*!
 	 * Idle animations tend to have low values for this, and blocks that have
 	 * high values tend to correspond with the important parts of the
-	 * animation. WARNING: BREAKS CIV4 NIF FILES! Only observed in Oblivion
-	 * NIF files so far.
+	 * animation.
 	 */
 	byte priority_;
 	/*!

gen/FurniturePosition.cpp

@@ -4,7 +4,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #include "gen/FurniturePosition.h"
 
 //Constructor
-FurniturePosition::FurniturePosition() : unknownShort((ushort)0), positionRef1_((byte)0), positionRef2_((byte)0) {};
+FurniturePosition::FurniturePosition() : orientation((ushort)0), positionRef1((byte)0), positionRef2((byte)0) {};
 
 //Destructor
 FurniturePosition::~FurniturePosition() {};

gen/FurniturePosition.h

@@ -16,21 +16,23 @@ struct FurniturePosition {
 	/*! Default Destructor */
 	~FurniturePosition();
 	/*!
-	 * Unknown. Position?
+	 * Offset of furniture marker.
 	 */
-	Vector3 unknownVector;
+	Vector3 offset;
 	/*!
-	 * Unknown.
+	 * Furniture marker orientation.
 	 */
-	ushort unknownShort;
+	ushort orientation;
 	/*!
-	 * This might refer to a furnituremarkerxx.nif file.
+	 * Refers to a furnituremarkerxx.nif file. Always seems to be the same as
+	 * Position Ref 2.
 	 */
-	byte positionRef1_;
+	byte positionRef1;
 	/*!
-	 * This might also refer to a furnituremarkerxx.nif file.
+	 * Refers to a furnituremarkerxx.nif file. Always seems to be the same as
+	 * Position Ref 1.
 	 */
-	byte positionRef2_;
+	byte positionRef2;
 };
 
 #endif

gen/obj_defines.h

@@ -2109,7 +2109,7 @@ ushort unknownShort1; \
 ushort unknownShort2; \
 ushort unknownShort3; \
 ushort unknownShort4; \
-Vector3 unknownVector; \
+Vector3 dimensions; \
 float unknownFloat2; \
 
 #define BHK_BOX_SHAPE_INCLUDE "bhkConvexShape.h" \
@@ -2126,7 +2126,7 @@ NifStream( unknownShort1, in, version ); \
 NifStream( unknownShort2, in, version ); \
 NifStream( unknownShort3, in, version ); \
 NifStream( unknownShort4, in, version ); \
-NifStream( unknownVector, in, version ); \
+NifStream( dimensions, in, version ); \
 NifStream( unknownFloat2, in, version ); \
 
 #define BHK_BOX_SHAPE_WRITE \
@@ -2136,7 +2136,7 @@ NifStream( unknownShort1, out, version ); \
 NifStream( unknownShort2, out, version ); \
 NifStream( unknownShort3, out, version ); \
 NifStream( unknownShort4, out, version ); \
-NifStream( unknownVector, out, version ); \
+NifStream( dimensions, out, version ); \
 NifStream( unknownFloat2, out, version ); \
 
 #define BHK_BOX_SHAPE_STRING \
@@ -2147,7 +2147,7 @@ out << "Unknown Short 1:  " << unknownShort1 << endl; \
 out << "Unknown Short 2:  " << unknownShort2 << endl; \
 out << "Unknown Short 3:  " << unknownShort3 << endl; \
 out << "Unknown Short 4:  " << unknownShort4 << endl; \
-out << "Unknown Vector:  " << unknownVector << endl; \
+out << "Dimensions:  " << dimensions << endl; \
 out << "Unknown Float 2:  " << unknownFloat2 << endl; \
 return out.str(); \
 
@@ -2165,9 +2165,9 @@ ushort unknownShort1; \
 ushort unknownShort2; \
 ushort unknownShort3; \
 ushort unknownShort4; \
-Vector3 unknownVector1; \
+Vector3 firstPoint; \
 float radius1; \
-Vector3 unknownVector2; \
+Vector3 secondPoint; \
 float radius2; \
 
 #define BHK_CAPSULE_SHAPE_INCLUDE "bhkConvexShape.h" \
@@ -2184,9 +2184,9 @@ NifStream( unknownShort1, in, version ); \
 NifStream( unknownShort2, in, version ); \
 NifStream( unknownShort3, in, version ); \
 NifStream( unknownShort4, in, version ); \
-NifStream( unknownVector1, in, version ); \
+NifStream( firstPoint, in, version ); \
 NifStream( radius1, in, version ); \
-NifStream( unknownVector2, in, version ); \
+NifStream( secondPoint, in, version ); \
 NifStream( radius2, in, version ); \
 
 #define BHK_CAPSULE_SHAPE_WRITE \
@@ -2196,9 +2196,9 @@ NifStream( unknownShort1, out, version ); \
 NifStream( unknownShort2, out, version ); \
 NifStream( unknownShort3, out, version ); \
 NifStream( unknownShort4, out, version ); \
-NifStream( unknownVector1, out, version ); \
+NifStream( firstPoint, out, version ); \
 NifStream( radius1, out, version ); \
-NifStream( unknownVector2, out, version ); \
+NifStream( secondPoint, out, version ); \
 NifStream( radius2, out, version ); \
 
 #define BHK_CAPSULE_SHAPE_STRING \
@@ -2209,9 +2209,9 @@ out << "Unknown Short 1:  " << unknownShort1 << endl; \
 out << "Unknown Short 2:  " << unknownShort2 << endl; \
 out << "Unknown Short 3:  " << unknownShort3 << endl; \
 out << "Unknown Short 4:  " << unknownShort4 << endl; \
-out << "Unknown Vector 1:  " << unknownVector1 << endl; \
+out << "First Point:  " << firstPoint << endl; \
 out << "Radius 1:  " << radius1 << endl; \
-out << "Unknown Vector 2:  " << unknownVector2 << endl; \
+out << "Second Point:  " << secondPoint << endl; \
 out << "Radius 2:  " << radius2 << endl; \
 return out.str(); \
 
@@ -3718,20 +3718,20 @@ NiExtraData::Read( in, link_stack, version, user_version ); \
 NifStream( numPositions, in, version ); \
 positions.resize(numPositions); \
 for (uint i0 = 0; i0 < positions.size(); i0++) { \
-	NifStream( positions[i0].unknownVector, in, version ); \
-	NifStream( positions[i0].unknownShort, in, version ); \
-	NifStream( positions[i0].positionRef1_, in, version ); \
-	NifStream( positions[i0].positionRef2_, in, version ); \
+	NifStream( positions[i0].offset, in, version ); \
+	NifStream( positions[i0].orientation, in, version ); \
+	NifStream( positions[i0].positionRef1, in, version ); \
+	NifStream( positions[i0].positionRef2, in, version ); \
 }; \
 
 #define B_S_FURNITURE_MARKER_WRITE \
 NiExtraData::Write( out, link_map, version, user_version ); \
 NifStream( numPositions, out, version ); \
 for (uint i0 = 0; i0 < positions.size(); i0++) { \
-	NifStream( positions[i0].unknownVector, out, version ); \
-	NifStream( positions[i0].unknownShort, out, version ); \
-	NifStream( positions[i0].positionRef1_, out, version ); \
-	NifStream( positions[i0].positionRef2_, out, version ); \
+	NifStream( positions[i0].offset, out, version ); \
+	NifStream( positions[i0].orientation, out, version ); \
+	NifStream( positions[i0].positionRef1, out, version ); \
+	NifStream( positions[i0].positionRef2, out, version ); \
 }; \
 
 #define B_S_FURNITURE_MARKER_STRING \
@@ -3739,10 +3739,10 @@ stringstream out; \
 out << NiExtraData::asString(); \
 out << "Num Positions:  " << numPositions << endl; \
 for (uint i0 = 0; i0 < positions.size(); i0++) { \
-	out << "  Unknown Vector:  " << positions[i0].unknownVector << endl; \
-	out << "  Unknown Short:  " << positions[i0].unknownShort << endl; \
-	out << "  Position Ref 1?:  " << positions[i0].positionRef1_ << endl; \
-	out << "  Position Ref 2?:  " << positions[i0].positionRef2_ << endl; \
+	out << "  Offset:  " << positions[i0].offset << endl; \
+	out << "  Orientation:  " << positions[i0].orientation << endl; \
+	out << "  Position Ref 1:  " << positions[i0].positionRef1 << endl; \
+	out << "  Position Ref 2:  " << positions[i0].positionRef2 << endl; \
 }; \
 return out.str(); \
 

obj/ABoneLODController.h

@@ -10,13 +10,13 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "gen/obj_defines.h"
 
-/*
- * ABoneLODController
- */
-
 class ABoneLODController;
 typedef Ref<ABoneLODController> ABoneLODControllerRef;
 
+/*!
+ * ABoneLODController - Level of detail controller for bones?
+ */
+
 class ABoneLODController : public A_BONE_L_O_D_CONTROLLER_PARENT {
 public:
 	ABoneLODController();

obj/AKeyedData.h

@@ -8,13 +8,13 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "gen/obj_defines.h"
 
-/*
- * AKeyedData
- */
-
 class AKeyedData;
 typedef Ref<AKeyedData> AKeyedDataRef;
 
+/*!
+ * AKeyedData - Single items of data linked to particular key times.
+ */
+
 class AKeyedData : public A_KEYED_DATA_PARENT {
 public:
 	AKeyedData();

obj/APSysCtlr.h

@@ -8,13 +8,13 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "gen/obj_defines.h"
 
-/*
- * APSysCtlr
- */
-
 class APSysCtlr;
 typedef Ref<APSysCtlr> APSysCtlrRef;
 
+/*!
+ * APSysCtlr - Unknown.
+ */
+
 class APSysCtlr : public A_P_SYS_CTLR_PARENT {
 public:
 	APSysCtlr();

obj/APSysData.h

@@ -8,13 +8,13 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "gen/obj_defines.h"
 
-/*
- * APSysData
- */
-
 class APSysData;
 typedef Ref<APSysData> APSysDataRef;
 
+/*!
+ * APSysData - Particle system data.  Probably really NiPSysData.
+ */
+
 class APSysData : public A_P_SYS_DATA_PARENT {
 public:
 	APSysData();

obj/AParticleModifier.h

@@ -12,13 +12,13 @@ class NiParticleSystemController;
 
 #include "gen/obj_defines.h"
 
-/*
- * AParticleModifier
- */
-
 class AParticleModifier;
 typedef Ref<AParticleModifier> AParticleModifierRef;
 
+/*!
+ * AParticleModifier - A particle system modifier.
+ */
+
 class AParticleModifier : public A_PARTICLE_MODIFIER_PARENT {
 public:
 	AParticleModifier();

obj/AbhkConstraint.h

@@ -12,13 +12,13 @@ class bhkShape;
 
 #include "gen/obj_defines.h"
 
-/*
- * AbhkConstraint
- */
-
 class AbhkConstraint;
 typedef Ref<AbhkConstraint> AbhkConstraintRef;
 
+/*!
+ * AbhkConstraint - Describes a physical constraint.
+ */
+
 class AbhkConstraint : public ABHK_CONSTRAINT_PARENT {
 public:
 	AbhkConstraint();

obj/AbhkRagdollConstraint.h

@@ -8,13 +8,13 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "gen/obj_defines.h"
 
-/*
- * AbhkRagdollConstraint
- */
-
 class AbhkRagdollConstraint;
 typedef Ref<AbhkRagdollConstraint> AbhkRagdollConstraintRef;
 
+/*!
+ * AbhkRagdollConstraint - Ragdoll constraint.
+ */
+
 class AbhkRagdollConstraint : public ABHK_RAGDOLL_CONSTRAINT_PARENT {
 public:
 	AbhkRagdollConstraint();

obj/AbhkShapeCollection.h

@@ -8,13 +8,14 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "gen/obj_defines.h"
 
-/*
- * AbhkShapeCollection
- */
-
 class AbhkShapeCollection;
 typedef Ref<AbhkShapeCollection> AbhkShapeCollectionRef;
 
+/*!
+ * AbhkShapeCollection - Havok data, not sure where to put in the
+ * hierarchy.
+ */
+
 class AbhkShapeCollection : public ABHK_SHAPE_COLLECTION_PARENT {
 public:
 	AbhkShapeCollection();

obj/AvoidNode.h

@@ -8,13 +8,13 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "gen/obj_defines.h"
 
-/*
- * AvoidNode
- */
-
 class AvoidNode;
 typedef Ref<AvoidNode> AvoidNodeRef;
 
+/*!
+ * AvoidNode - Morrowind specific?
+ */
+
 class AvoidNode : public AVOID_NODE_PARENT {
 public:
 	AvoidNode();

obj/BSBound.h

@@ -8,13 +8,13 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "gen/obj_defines.h"
 
-/*
- * BSBound
- */
-
 class BSBound;
 typedef Ref<BSBound> BSBoundRef;
 
+/*!
+ * BSBound - Unknown.
+ */
+
 class BSBound : public B_S_BOUND_PARENT {
 public:
 	BSBound();

obj/BSFurnitureMarker.h

@@ -10,13 +10,13 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "gen/obj_defines.h"
 
-/*
- * BSFurnitureMarker
- */
-
 class BSFurnitureMarker;
 typedef Ref<BSFurnitureMarker> BSFurnitureMarkerRef;
 
+/*!
+ * BSFurnitureMarker - Unknown. Marks furniture sitting positions?
+ */
+
 class BSFurnitureMarker : public B_S_FURNITURE_MARKER_PARENT {
 public:
 	BSFurnitureMarker();

obj/BSKeyframeController.h

@@ -12,13 +12,13 @@ class NiKeyframeData;
 
 #include "gen/obj_defines.h"
 
-/*
- * BSKeyframeController
- */
-
 class BSKeyframeController;
 typedef Ref<BSKeyframeController> BSKeyframeControllerRef;
 
+/*!
+ * BSKeyframeController - An extended keyframe controller.
+ */
+
 class BSKeyframeController : public B_S_KEYFRAME_CONTROLLER_PARENT {
 public:
 	BSKeyframeController();

obj/BSPSysArrayEmitter.h

@@ -8,13 +8,13 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "gen/obj_defines.h"
 
-/*
- * BSPSysArrayEmitter
- */
-
 class BSPSysArrayEmitter;
 typedef Ref<BSPSysArrayEmitter> BSPSysArrayEmitterRef;
 
+/*!
+ * BSPSysArrayEmitter - Unknown.
+ */
+
 class BSPSysArrayEmitter : public B_S_P_SYS_ARRAY_EMITTER_PARENT {
 public:
 	BSPSysArrayEmitter();

obj/BSParentVelocityModifier.h

@@ -8,13 +8,13 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "gen/obj_defines.h"
 
-/*
- * BSParentVelocityModifier
- */
-
 class BSParentVelocityModifier;
 typedef Ref<BSParentVelocityModifier> BSParentVelocityModifierRef;
 
+/*!
+ * BSParentVelocityModifier - Unknown.
+ */
+
 class BSParentVelocityModifier : public B_S_PARENT_VELOCITY_MODIFIER_PARENT {
 public:
 	BSParentVelocityModifier();

obj/BSXFlags.h

@@ -8,13 +8,13 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "gen/obj_defines.h"
 
-/*
- * BSXFlags
- */
-
 class BSXFlags;
 typedef Ref<BSXFlags> BSXFlagsRef;
 
+/*!
+ * BSXFlags - Unknown.
+ */
+
 class BSXFlags : public B_S_X_FLAGS_PARENT {
 public:
 	BSXFlags();

obj/FxButton.h

@@ -8,13 +8,13 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "gen/obj_defines.h"
 
-/*
- * FxButton
- */
-
 class FxButton;
 typedef Ref<FxButton> FxButtonRef;
 
+/*!
+ * FxButton - Unknown.
+ */
+
 class FxButton : public FX_BUTTON_PARENT {
 public:
 	FxButton();