From f3b976fe990ee6ac5792cde1336631bcb57d7d19 Mon Sep 17 00:00:00 2001
From: Amorilia <amorilia@users.sourceforge.net>
Date: Mon, 1 Sep 2008 11:07:44 +0000
Subject: [PATCH] nif.xml: Priority? -> Priority (syncing with PyFFI)
---
include/gen/ControllerLink.h | 2 +-
src/gen/ControllerLink.cpp | 4 ++--
src/obj/NiSequence.cpp | 10 +++++-----
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/include/gen/ControllerLink.h b/include/gen/ControllerLink.h
index f3051ffb..65c682a1 100644
--- a/include/gen/ControllerLink.h
+++ b/include/gen/ControllerLink.h
@@ -49,7 +49,7 @@ struct ControllerLink {
* Idle animations tend to have low values for this, and NIF objects that have high
* values tend to correspond with the important parts of the animation.
*/
- byte priority_;
+ byte priority;
/*!
* Refers to the NiStringPalette which contains the name of the controlled NIF
* object.
diff --git a/src/gen/ControllerLink.cpp b/src/gen/ControllerLink.cpp
index 95b6b86f..f3b02717 100644
--- a/src/gen/ControllerLink.cpp
+++ b/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), variableOffset1((unsigned int)-1), variableOffset2((unsigned int)-1) {};
//Copy Constructor
ControllerLink::ControllerLink( const ControllerLink & src ) {
@@ -27,7 +27,7 @@ ControllerLink & ControllerLink::operator=( const ControllerLink & src ) {
this->interpolator = src.interpolator;
this->unknownLink2 = src.unknownLink2;
this->unknownShort0 = src.unknownShort0;
- this->priority_ = src.priority_;
+ this->priority = src.priority;
this->stringPalette = src.stringPalette;
this->nodeName = src.nodeName;
this->nodeNameOffset = src.nodeNameOffset;
diff --git a/src/obj/NiSequence.cpp b/src/obj/NiSequence.cpp
index 2e6c1135..455bb30e 100644
--- a/src/obj/NiSequence.cpp
+++ b/src/obj/NiSequence.cpp
@@ -78,10 +78,10 @@ void NiSequence::Read( istream& in, list<unsigned int> & link_stack, const NifIn
NifStream( controlledBlocks[i1].unknownShort0, in, info );
};
if ( ( info.version >= 0x0A01006A ) && ( info.userVersion == 10 ) ) {
- NifStream( controlledBlocks[i1].priority_, in, info );
+ NifStream( controlledBlocks[i1].priority, in, info );
};
if ( ( info.version >= 0x0A01006A ) && ( info.userVersion == 11 ) ) {
- NifStream( controlledBlocks[i1].priority_, in, info );
+ NifStream( controlledBlocks[i1].priority, in, info );
};
if ( ( info.version >= 0x0A020000 ) && ( info.version <= 0x14000005 ) ) {
NifStream( block_num, in, info );
@@ -207,10 +207,10 @@ void NiSequence::Write( ostream& out, const map<NiObjectRef,unsigned int> & link
NifStream( controlledBlocks[i1].unknownShort0, out, info );
};
if ( ( info.version >= 0x0A01006A ) && ( info.userVersion == 10 ) ) {
- NifStream( controlledBlocks[i1].priority_, out, info );
+ NifStream( controlledBlocks[i1].priority, out, info );
};
if ( ( info.version >= 0x0A01006A ) && ( info.userVersion == 11 ) ) {
- NifStream( controlledBlocks[i1].priority_, out, info );
+ NifStream( controlledBlocks[i1].priority, out, info );
};
if ( ( info.version >= 0x0A020000 ) && ( info.version <= 0x14000005 ) ) {
if ( info.version < VER_3_3_0_13 ) {
@@ -298,7 +298,7 @@ std::string NiSequence::asString( bool verbose ) const {
out << " Interpolator: " << controlledBlocks[i1].interpolator << endl;
out << " Unknown Link 2: " << controlledBlocks[i1].unknownLink2 << endl;
out << " Unknown Short 0: " << controlledBlocks[i1].unknownShort0 << endl;
- out << " Priority?: " << controlledBlocks[i1].priority_ << endl;
+ out << " Priority: " << controlledBlocks[i1].priority << endl;
out << " String Palette: " << controlledBlocks[i1].stringPalette << endl;
out << " Node Name: " << controlledBlocks[i1].nodeName << endl;
out << " Node Name Offset: " << controlledBlocks[i1].nodeNameOffset << endl;
--
GitLab