nif.xml: Variable Offset x -> Variable x Offset (syncing with pyffi)

include/gen/ControllerLink.h

@@ -94,7 +94,7 @@ struct ControllerLink {
 	 * Offset in the string palette where some variable string starts (such as
 	 * 'SELF_ILLUM', '0-0-TT_TRANSLATE_U', 'tongue_out', etc.). Usually, -1.
 	 */
-	unsigned int variableOffset1;
+	unsigned int variable1Offset;
 	/*! Another variable string, apparently used for particle system controllers. */
 	IndexString variable2;
 	/*!
@@ -102,7 +102,7 @@ struct ControllerLink {
 	 * 'EmitterActive' and 'BirthRate' have been observed in official files, used for
 	 * particle system controllers). Usually, -1.
 	 */
-	unsigned int variableOffset2;
+	unsigned int variable2Offset;
 };
 
 }

src/gen/ControllerLink.cpp

@@ -13,7 +13,7 @@ All rights reserved.  Please see niflib.h for license. */
 using namespace Niflib;
 
 //Constructor
-ControllerLink::ControllerLink() : controller(NULL), interpolator(NULL), unknownLink2(NULL), unknownShort0((unsigned short)0), priority((byte)0), stringPalette(NULL), nodeNameOffset((unsigned int)-1), propertyTypeOffset((unsigned int)-1), controllerTypeOffset((unsigned int)-1), variableOffset1((unsigned int)-1), variableOffset2((unsigned int)-1) {};
+ControllerLink::ControllerLink() : controller(NULL), interpolator(NULL), unknownLink2(NULL), unknownShort0((unsigned short)0), priority((byte)0), stringPalette(NULL), nodeNameOffset((unsigned int)-1), propertyTypeOffset((unsigned int)-1), controllerTypeOffset((unsigned int)-1), variable1Offset((unsigned int)-1), variable2Offset((unsigned int)-1) {};
 
 //Copy Constructor
 ControllerLink::ControllerLink( const ControllerLink & src ) {
@@ -36,9 +36,9 @@ ControllerLink & ControllerLink::operator=( const ControllerLink & src ) {
 	this->controllerType = src.controllerType;
 	this->controllerTypeOffset = src.controllerTypeOffset;
 	this->variable1 = src.variable1;
-	this->variableOffset1 = src.variableOffset1;
+	this->variable1Offset = src.variable1Offset;
 	this->variable2 = src.variable2;
-	this->variableOffset2 = src.variableOffset2;
+	this->variable2Offset = src.variable2Offset;
 	return *this;
 };
 

src/obj/NiSequence.cpp

@@ -121,7 +121,7 @@ void NiSequence::Read( istream& in, list<unsigned int> & link_stack, const NifIn
 			NifStream( controlledBlocks[i1].variable1, in, info );
 		};
 		if ( ( info.version >= 0x0A020000 ) && ( info.version <= 0x14000005 ) ) {
-			NifStream( controlledBlocks[i1].variableOffset1, in, info );
+			NifStream( controlledBlocks[i1].variable1Offset, in, info );
 		};
 		if ( ( info.version >= 0x0A01006A ) && ( info.version <= 0x0A01006A ) ) {
 			NifStream( controlledBlocks[i1].variable2, in, info );
@@ -130,7 +130,7 @@ void NiSequence::Read( istream& in, list<unsigned int> & link_stack, const NifIn
 			NifStream( controlledBlocks[i1].variable2, in, info );
 		};
 		if ( ( info.version >= 0x0A020000 ) && ( info.version <= 0x14000005 ) ) {
-			NifStream( controlledBlocks[i1].variableOffset2, in, info );
+			NifStream( controlledBlocks[i1].variable2Offset, in, info );
 		};
 	};
 
@@ -257,7 +257,7 @@ void NiSequence::Write( ostream& out, const map<NiObjectRef,unsigned int> & link
 			NifStream( controlledBlocks[i1].variable1, out, info );
 		};
 		if ( ( info.version >= 0x0A020000 ) && ( info.version <= 0x14000005 ) ) {
-			NifStream( controlledBlocks[i1].variableOffset1, out, info );
+			NifStream( controlledBlocks[i1].variable1Offset, out, info );
 		};
 		if ( ( info.version >= 0x0A01006A ) && ( info.version <= 0x0A01006A ) ) {
 			NifStream( controlledBlocks[i1].variable2, out, info );
@@ -266,7 +266,7 @@ void NiSequence::Write( ostream& out, const map<NiObjectRef,unsigned int> & link
 			NifStream( controlledBlocks[i1].variable2, out, info );
 		};
 		if ( ( info.version >= 0x0A020000 ) && ( info.version <= 0x14000005 ) ) {
-			NifStream( controlledBlocks[i1].variableOffset2, out, info );
+			NifStream( controlledBlocks[i1].variable2Offset, out, info );
 		};
 	};
 
@@ -307,9 +307,9 @@ std::string NiSequence::asString( bool verbose ) const {
 		out << "    Controller Type:  " << controlledBlocks[i1].controllerType << endl;
 		out << "    Controller Type Offset:  " << controlledBlocks[i1].controllerTypeOffset << endl;
 		out << "    Variable 1:  " << controlledBlocks[i1].variable1 << endl;
-		out << "    Variable Offset 1:  " << controlledBlocks[i1].variableOffset1 << endl;
+		out << "    Variable 1 Offset:  " << controlledBlocks[i1].variable1Offset << endl;
 		out << "    Variable 2:  " << controlledBlocks[i1].variable2 << endl;
-		out << "    Variable Offset 2:  " << controlledBlocks[i1].variableOffset2 << endl;
+		out << "    Variable 2 Offset:  " << controlledBlocks[i1].variable2Offset << endl;
 	};
 	return out.str();