diff --git a/include/NIF_IO.h b/include/NIF_IO.h index 0a94bd9c290d761e77f18669736958f7c8842538..5983eaa330404b540d5e5db00944029661691daf 100644 --- a/include/NIF_IO.h +++ b/include/NIF_IO.h @@ -141,12 +141,12 @@ using namespace std; // return v_[index]; // } // -// T& operator[](uint index) { +// T& operator[](unsigned int index) { // // assert( index >= 0 && index < len_ ) // return v_[index]; // } // -// const T& operator[](uint index) const { +// const T& operator[](unsigned int index) const { // // assert( index >= 0 && index < len_ ) // return v_[index]; // } @@ -214,10 +214,10 @@ struct array { memset(data, 0, sizeof(data[0]) * size); } ~array() {} - T & operator[]( uint index ) { + T & operator[]( unsigned int index ) { return data[index]; } - const T & operator[]( uint index ) const { + const T & operator[]( unsigned int index ) const { return data[index]; } private: @@ -230,8 +230,8 @@ int BlockSearch( istream& in ); //-- Read Utility Functions--// int ReadInt( istream& in ); -uint ReadUInt( istream& in ); -ushort ReadUShort( istream& in ); +unsigned int ReadUInt( istream& in ); +unsigned short ReadUShort( istream& in ); short ReadShort( istream& in ); byte ReadByte( istream& in ); float ReadFloat( istream &in ); @@ -240,8 +240,8 @@ bool ReadBool( istream &in, unsigned int version ); //-- Write Utility Functions --// void WriteInt( int val, ostream& out ); -void WriteUInt( uint val, ostream& out ); -void WriteUShort( ushort val, ostream& out ); +void WriteUInt( unsigned int val, ostream& out ); +void WriteUShort( unsigned short val, ostream& out ); void WriteShort( short val, ostream& out ); void WriteByte( byte val, ostream& out ); void WriteFloat( float val, ostream& out ); @@ -255,110 +255,110 @@ void WriteBool( bool val, ostream& out, unsigned int version ); //--Basic Types--// //int -void NifStream( int & val, istream& in, uint version = 0 ); -void NifStream( int const & val, ostream& out, uint version = 0 ); +void NifStream( int & val, istream& in, unsigned int version = 0 ); +void NifStream( int const & val, ostream& out, unsigned int version = 0 ); -//uint -void NifStream( uint & val, istream& in, uint version = 0 ); -void NifStream( uint const & val, ostream& out, uint version = 0 ); +//unsigned int +void NifStream( unsigned int & val, istream& in, unsigned int version = 0 ); +void NifStream( unsigned int const & val, ostream& out, unsigned int version = 0 ); -//ushort -void NifStream( ushort & val, istream& in, uint version = 0 ); -void NifStream( ushort const & val, ostream& out, uint version = 0 ); +//unsigned short +void NifStream( unsigned short & val, istream& in, unsigned int version = 0 ); +void NifStream( unsigned short const & val, ostream& out, unsigned int version = 0 ); //short -void NifStream( short & val, istream& in, uint version = 0 ); -void NifStream( short const & val, ostream& out, uint version = 0 ); +void NifStream( short & val, istream& in, unsigned int version = 0 ); +void NifStream( short const & val, ostream& out, unsigned int version = 0 ); //byte -void NifStream( byte & val, istream& in, uint version = 0 ); -void NifStream( byte const & val, ostream& out, uint version = 0 ); +void NifStream( byte & val, istream& in, unsigned int version = 0 ); +void NifStream( byte const & val, ostream& out, unsigned int version = 0 ); //bool -void NifStream( bool & val, istream& in, uint version ); // version is significant -void NifStream( bool const & val, ostream& out, uint version ); // version is significant +void NifStream( bool & val, istream& in, unsigned int version ); // version is significant +void NifStream( bool const & val, ostream& out, unsigned int version ); // version is significant //float -void NifStream( float & val, istream& in, uint version = 0 ); -void NifStream( float const & val, ostream& out, uint version = 0 ); +void NifStream( float & val, istream& in, unsigned int version = 0 ); +void NifStream( float const & val, ostream& out, unsigned int version = 0 ); //string -void NifStream( string & val, istream& in, uint version = 0 ); -void NifStream( string const & val, ostream& out, uint version = 0 ); +void NifStream( string & val, istream& in, unsigned int version = 0 ); +void NifStream( string const & val, ostream& out, unsigned int version = 0 ); //--Structs--// //TexCoord -void NifStream( TexCoord & val, istream& in, uint version = 0 ); -void NifStream( TexCoord const & val, ostream& out, uint version = 0 ); +void NifStream( TexCoord & val, istream& in, unsigned int version = 0 ); +void NifStream( TexCoord const & val, ostream& out, unsigned int version = 0 ); //Triangle -void NifStream( Triangle & val, istream& in, uint version = 0 ); -void NifStream( Triangle const & val, ostream& out, uint version = 0 ); +void NifStream( Triangle & val, istream& in, unsigned int version = 0 ); +void NifStream( Triangle const & val, ostream& out, unsigned int version = 0 ); //Vector3 -void NifStream( Vector3 & val, istream& in, uint version = 0 ); -void NifStream( Vector3 const & val, ostream& out, uint version = 0 ); +void NifStream( Vector3 & val, istream& in, unsigned int version = 0 ); +void NifStream( Vector3 const & val, ostream& out, unsigned int version = 0 ); //Float2 -void NifStream( Float2 & val, istream& in, uint version = 0 ); -void NifStream( Float2 const & val, ostream& out, uint version = 0 ); +void NifStream( Float2 & val, istream& in, unsigned int version = 0 ); +void NifStream( Float2 const & val, ostream& out, unsigned int version = 0 ); //Matrix22 -void NifStream( Matrix22 & val, istream& in, uint version = 0 ); -void NifStream( Matrix22 const & val, ostream& out, uint version = 0 ); +void NifStream( Matrix22 & val, istream& in, unsigned int version = 0 ); +void NifStream( Matrix22 const & val, ostream& out, unsigned int version = 0 ); //Float3 -void NifStream( Float3 & val, istream& in, uint version = 0 ); -void NifStream( Float3 const & val, ostream& out, uint version = 0 ); +void NifStream( Float3 & val, istream& in, unsigned int version = 0 ); +void NifStream( Float3 const & val, ostream& out, unsigned int version = 0 ); //Matrix33 -void NifStream( Matrix33 & val, istream& in, uint version = 0 ); -void NifStream( Matrix33 const & val, ostream& out, uint version = 0 ); +void NifStream( Matrix33 & val, istream& in, unsigned int version = 0 ); +void NifStream( Matrix33 const & val, ostream& out, unsigned int version = 0 ); //Float4 -void NifStream( Float4 & val, istream& in, uint version = 0 ); -void NifStream( Float4 const & val, ostream& out, uint version = 0 ); +void NifStream( Float4 & val, istream& in, unsigned int version = 0 ); +void NifStream( Float4 const & val, ostream& out, unsigned int version = 0 ); //Matrix44 -void NifStream( Matrix44 & val, istream& in, uint version = 0 ); -void NifStream( Matrix44 const & val, ostream& out, uint version = 0 ); +void NifStream( Matrix44 & val, istream& in, unsigned int version = 0 ); +void NifStream( Matrix44 const & val, ostream& out, unsigned int version = 0 ); //Color3 -void NifStream( Color3 & val, istream& in, uint version = 0 ); -void NifStream( Color3 const & val, ostream& out, uint version = 0 ); +void NifStream( Color3 & val, istream& in, unsigned int version = 0 ); +void NifStream( Color3 const & val, ostream& out, unsigned int version = 0 ); //Color4 -void NifStream( Color4 & val, istream& in, uint version = 0 ); -void NifStream( Color4 const & val, ostream& out, uint version = 0 ); +void NifStream( Color4 & val, istream& in, unsigned int version = 0 ); +void NifStream( Color4 const & val, ostream& out, unsigned int version = 0 ); //Quaternion -void NifStream( Quaternion & val, istream& in, uint version = 0 ); -void NifStream( Quaternion const & val, ostream& out, uint version = 0 ); +void NifStream( Quaternion & val, istream& in, unsigned int version = 0 ); +void NifStream( Quaternion const & val, ostream& out, unsigned int version = 0 ); //HeaderString -void NifStream( HeaderString & val, istream& in, uint & version ); //Sets the passed in version varible -void NifStream( HeaderString const & val, ostream& out, uint version = 0 ); +void NifStream( HeaderString & val, istream& in, unsigned int & version ); //Sets the passed in version varible +void NifStream( HeaderString const & val, ostream& out, unsigned int version = 0 ); ostream & operator<<( ostream & out, HeaderString const & val ); //LineString -void NifStream( LineString & val, istream& in, uint version ); -void NifStream( LineString const & val, ostream& out, uint version = 0 ); +void NifStream( LineString & val, istream& in, unsigned int version ); +void NifStream( LineString const & val, ostream& out, unsigned int version = 0 ); ostream & operator<<( ostream & out, LineString const & val ); //ShortString -void NifStream( ShortString & val, istream& in, uint version = 0 ); -void NifStream( ShortString const & val, ostream& out, uint version = 0 ); +void NifStream( ShortString & val, istream& in, unsigned int version = 0 ); +void NifStream( ShortString const & val, ostream& out, unsigned int version = 0 ); ostream & operator<<( ostream & out, ShortString const & val ); //--Templates--// -void NifStream( Key<Quaternion> & key, istream& file, uint version, KeyType type ); -void NifStream( Key<Quaternion> const & key, ostream& file, uint version, KeyType type ); +void NifStream( Key<Quaternion> & key, istream& file, unsigned int version, KeyType type ); +void NifStream( Key<Quaternion> const & key, ostream& file, unsigned int version, KeyType type ); //Key<T> template <class T> -void NifStream( Key<T> & key, istream& file, uint version, KeyType type ) { +void NifStream( Key<T> & key, istream& file, unsigned int version, KeyType type ) { key.time = ReadFloat( file ); //If key type is not 1, 2, or 3, throw an exception @@ -382,12 +382,12 @@ void NifStream( Key<T> & key, istream& file, uint version, KeyType type ) { } template <class T> -void NifStream( Key<T> & key, istream & file, uint version, int type ) { +void NifStream( Key<T> & key, istream & file, unsigned int version, int type ) { NifStream( key, file, version, (KeyType)type ); } template <class T> -void NifStream( Key<T> const & key, ostream& file, uint version, KeyType type ) { +void NifStream( Key<T> const & key, ostream& file, unsigned int version, KeyType type ) { WriteFloat( key.time, file ); //If key type is not 1, 2, or 3, throw an exception @@ -411,13 +411,13 @@ void NifStream( Key<T> const & key, ostream& file, uint version, KeyType type ) } template <class T> -void NifStream( Key<T> const & key, ostream & file, uint version, int type ) { +void NifStream( Key<T> const & key, ostream & file, unsigned int version, int type ) { NifStream( key, file, version, (KeyType)type ); } //The HexString function creates a formatted hex display of the given data for use in printing //a debug string for information that is not understood -string HexString( const byte * src, uint len ); +string HexString( const byte * src, unsigned int len ); //Byte ostream & operator<<( ostream & out, byte const & val ); diff --git a/include/gen/BoundingBox.h b/include/gen/BoundingBox.h index f750dfc36d1bb6b6b896aadada9e7d328058bd69..2aedce9f08b9b83fd8ed5ce706ee581aeef970f7 100644 --- a/include/gen/BoundingBox.h +++ b/include/gen/BoundingBox.h @@ -24,7 +24,7 @@ struct NIFLIB_API BoundingBox { /*! * Usually 1. */ - uint unknownInt; + unsigned int unknownInt; /*! * Translation vector. */ diff --git a/include/gen/ByteArray.h b/include/gen/ByteArray.h index 3efc1cd9352a2b307b8d452f82b4a86eec6e8af6..94d0a0b8f9ff70620e5693a0b55f1c17109b46dc 100644 --- a/include/gen/ByteArray.h +++ b/include/gen/ByteArray.h @@ -24,7 +24,7 @@ struct NIFLIB_API ByteArray { /*! * The number of bytes in this array */ - mutable uint dataSize; + mutable unsigned int dataSize; /*! * The bytes which make up the array */ diff --git a/include/gen/ControllerLink.h b/include/gen/ControllerLink.h index 79b60a35aa9a35494a5a9b40b1267e689dabab1d..99ff39c2a7e67772a770124dec5cbd516d3ad7d6 100644 --- a/include/gen/ControllerLink.h +++ b/include/gen/ControllerLink.h @@ -50,7 +50,7 @@ struct NIFLIB_API ControllerLink { /*! * Unknown. */ - ushort unknownShort0; + unsigned short unknownShort0; /*! * 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 @@ -70,7 +70,7 @@ struct NIFLIB_API ControllerLink { * Offset in the string palette where the name of the controlled node * (NiNode, NiTriShape, ...) starts. */ - uint nodeNameOffset; + unsigned int nodeNameOffset; /*! * Name of the property (NiMaterialProperty, ...), if this controller * controls a property. @@ -80,7 +80,7 @@ struct NIFLIB_API ControllerLink { * Offset in the string palette where the property (NiMaterialProperty, * ...) starts, if this controller controls a property. Otherwise, -1. */ - uint propertyTypeOffset; + unsigned int propertyTypeOffset; /*! * Probably the object type name of the controller in the NIF file that * is child of the controlled object. @@ -94,7 +94,7 @@ struct NIFLIB_API ControllerLink { * controller in the NIF file that is child of the controlled object, via * its type name. */ - uint controllerTypeOffset; + unsigned int controllerTypeOffset; /*! * Some variable string (such as 'SELF_ILLUM', '0-0-TT_TRANSLATE_U', * 'tongue_out', etc.). @@ -105,7 +105,7 @@ struct NIFLIB_API ControllerLink { * as 'SELF_ILLUM', '0-0-TT_TRANSLATE_U', 'tongue_out', etc.). Usually, * -1. */ - uint variableOffset1; + unsigned int variableOffset1; /*! * Another variable string, apparently used for particle system * controllers. @@ -116,7 +116,7 @@ struct NIFLIB_API ControllerLink { * only 'EmitterActive' and 'BirthRate' have been observed in official * files, used for particle system controllers). Usually, -1. */ - uint variableOffset2; + unsigned int variableOffset2; }; } diff --git a/include/gen/Footer.h b/include/gen/Footer.h index ed3e1356adf9816f10bc227a65000548f5d6056e..7a234b85bcfe8d0143aed0fddc67adf557174741 100644 --- a/include/gen/Footer.h +++ b/include/gen/Footer.h @@ -29,7 +29,7 @@ struct NIFLIB_API Footer { /*! * The number of root references. */ - mutable uint numRoots; + mutable unsigned int numRoots; /*! * List of root NIF objects. If there is a camera, for 1st person view, * then this NIF object is referred to as well in this list, even if it @@ -37,8 +37,8 @@ struct NIFLIB_API Footer { * Bip Head node). */ vector<Ref<NiObject > > roots; - void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string asString( bool verbose = false ) const; }; diff --git a/include/gen/FurniturePosition.h b/include/gen/FurniturePosition.h index d1a4b28c957e9da6cebfa25cf1a7da356dd56c2d..0b7b0db180b75548318dc1f98ff3b6ce0bb64134 100644 --- a/include/gen/FurniturePosition.h +++ b/include/gen/FurniturePosition.h @@ -28,7 +28,7 @@ struct NIFLIB_API FurniturePosition { /*! * Furniture marker orientation. */ - ushort orientation; + unsigned short orientation; /*! * Refers to a furnituremarkerxx.nif file. Always seems to be the same as * Position Ref 2. diff --git a/include/gen/Header.h b/include/gen/Header.h index 06198ec5ab86446123014cb275c67270b9748a1c..efe36b960c343dfc6204ea87973d92ae805399d1 100644 --- a/include/gen/Header.h +++ b/include/gen/Header.h @@ -37,7 +37,7 @@ struct NIFLIB_API Header { * 0x04020002, 0x04020100, 0x04020200, 0x0A000100, 0x0A010000, * 0x0A020000, 0x14000004, ... */ - uint version; + unsigned int version; /*! * Determines the endian-ness of the data. 1 = little endian * (default) 0 = big endian @@ -47,16 +47,16 @@ struct NIFLIB_API Header { * An extra version number, for companies that decide to modify the file * format. */ - uint userVersion; + unsigned int userVersion; /*! * Number of file objects. */ - mutable uint numBlocks; + mutable unsigned int numBlocks; /*! * This also appears to be the extra user version number and must be set * in some circumstances. */ - uint userVersion2; + unsigned int userVersion2; /*! * Could be the name of the creator of the NIF file? */ @@ -73,7 +73,7 @@ struct NIFLIB_API Header { /*! * Number of object types in this NIF file. */ - mutable ushort numBlockTypes; + mutable unsigned short numBlockTypes; /*! * List of all object types used in this NIF file. */ @@ -83,11 +83,11 @@ struct NIFLIB_API Header { * type object_types[object_type_index[0]], the second of * object_types[object_type_index[1]], etc. */ - vector<ushort > blockTypeIndex; + vector<unsigned short > blockTypeIndex; /*! * Unknown. */ - uint unknownInt2; + unsigned int unknownInt2; void Read( istream& in ); void Write( ostream& out ) const; string asString( bool verbose = false ) const; diff --git a/include/gen/KeyGroup.h b/include/gen/KeyGroup.h index ff67b940550877df4f50d39bcb5d4f33c39342a4..a0a8c6f95b9010e3d9d177bad4803229f1fce0e4 100644 --- a/include/gen/KeyGroup.h +++ b/include/gen/KeyGroup.h @@ -18,7 +18,7 @@ struct NIFLIB_API KeyGroup { /*! * Number of keys in the array. */ - mutable uint numKeys; + mutable unsigned int numKeys; /*! * The key type. */ diff --git a/include/gen/MatchGroup.h b/include/gen/MatchGroup.h index 3f8f585baf71f5d57a461bc0dd6f1f2a8eb589e8..da8a73e023545e7a04008a71d63ecbb1e5ed714c 100644 --- a/include/gen/MatchGroup.h +++ b/include/gen/MatchGroup.h @@ -24,11 +24,11 @@ struct NIFLIB_API MatchGroup { /*! * Number of vertices in this group. */ - mutable ushort numVertices; + mutable unsigned short numVertices; /*! * The vertex indices. */ - vector<ushort > vertexIndices; + vector<unsigned short > vertexIndices; }; } diff --git a/include/gen/MipMap.h b/include/gen/MipMap.h index 63363f0068d6276be6a0fe9ca9931afdb73526f4..16def67d688f7bb7c85e1521ec5b4dab2d848d50 100644 --- a/include/gen/MipMap.h +++ b/include/gen/MipMap.h @@ -24,15 +24,15 @@ struct NIFLIB_API MipMap { /*! * Width of the mipmap image. */ - uint width; + unsigned int width; /*! * Height of the mipmap image. */ - uint height; + unsigned int height; /*! * Offset into the pixel data array where this mipmap starts. */ - uint offset; + unsigned int offset; }; } diff --git a/include/gen/Morph.h b/include/gen/Morph.h index e9436fbb320b2660d91096d0540c4e21d9975702..0baad836ad6ec9ee6dfaaf3d286aed87dca0ca34 100644 --- a/include/gen/Morph.h +++ b/include/gen/Morph.h @@ -28,7 +28,7 @@ struct NIFLIB_API Morph { /*! * The number of morph keys that follow. */ - mutable uint numKeys; + mutable unsigned int numKeys; /*! * Unlike most objects, the presense of this value is not conditional on * there being keys. @@ -41,7 +41,7 @@ struct NIFLIB_API Morph { /*! * Unknown. */ - uint unknownInt; + unsigned int unknownInt; /*! * Morph vectors. */ diff --git a/include/gen/NodeGroup.h b/include/gen/NodeGroup.h index 986f0d8d0a9f252c6c92a5df776702ec58c53345..fae58840b8a57c532f7a545a8e2bc3693b60032d 100644 --- a/include/gen/NodeGroup.h +++ b/include/gen/NodeGroup.h @@ -26,7 +26,7 @@ struct NIFLIB_API NodeGroup { /*! * Number of node references that follow. */ - mutable uint numNodes; + mutable unsigned int numNodes; /*! * The list of NiNode references. */ diff --git a/include/gen/OblivionColFilter.h b/include/gen/OblivionColFilter.h index 0a3a5dfe2361370b2c957dc42b13ef6bfa95066c..ba253f7867df69ac973533a289084b9e89bcc258 100644 --- a/include/gen/OblivionColFilter.h +++ b/include/gen/OblivionColFilter.h @@ -35,7 +35,7 @@ struct NIFLIB_API OblivionColFilter { /*! * Unknown. */ - ushort unknownShort; + unsigned short unknownShort; }; } diff --git a/include/gen/OblivionSubShape.h b/include/gen/OblivionSubShape.h index e5ae6261e62073d21ea9d3ef90f252d1287de49f..17743e20f0b8442fb8c3d9a144a42667e17c08a9 100644 --- a/include/gen/OblivionSubShape.h +++ b/include/gen/OblivionSubShape.h @@ -35,11 +35,11 @@ struct NIFLIB_API OblivionSubShape { /*! * Unknown. */ - ushort unknownShort; + unsigned short unknownShort; /*! * Seems to be the number of vertices that form this sub shape. */ - uint vertexCount___; + unsigned int vertexCount___; /*! * The material of the subshape. */ diff --git a/include/gen/Particle.h b/include/gen/Particle.h index a7cbc94205374476f6a49e2845977e5f0acec1c2..328b1006ace6aa51dc099fe166448a56f0ed4712 100644 --- a/include/gen/Particle.h +++ b/include/gen/Particle.h @@ -44,11 +44,11 @@ struct NIFLIB_API Particle { /*! * Unknown short (=0) */ - ushort unknownShort; + unsigned short unknownShort; /*! * Particle/vertex index matches array index */ - ushort vertexId; + unsigned short vertexId; }; } diff --git a/include/gen/RotationKeyArray.h b/include/gen/RotationKeyArray.h index fca73750ce739221d953e97d95271f8c0d2b3c97..d432bc6806e18e7c42fe28172fbb5723b33db685 100644 --- a/include/gen/RotationKeyArray.h +++ b/include/gen/RotationKeyArray.h @@ -17,7 +17,7 @@ struct NIFLIB_API RotationKeyArray { /*! * Number of keys. */ - mutable uint numKeys; + mutable unsigned int numKeys; /*! * Key type (1, 2, 3, or 4). */ diff --git a/include/gen/ShaderTexDesc.h b/include/gen/ShaderTexDesc.h index e82c54a93b6932e59355231642149f48fb0a7a2c..fc2f0acd337b509ecb3374c9bd60658deae62606 100644 --- a/include/gen/ShaderTexDesc.h +++ b/include/gen/ShaderTexDesc.h @@ -34,7 +34,7 @@ struct NIFLIB_API ShaderTexDesc { /*! * Unknown. */ - uint unknownInt; + unsigned int unknownInt; }; } diff --git a/include/gen/SkinData.h b/include/gen/SkinData.h index 8f38868fa4b28132485bca9092497f49122d2ec1..85b47d0e5a358eb53c288064135831263a8a1af2 100644 --- a/include/gen/SkinData.h +++ b/include/gen/SkinData.h @@ -49,7 +49,7 @@ struct NIFLIB_API SkinData { /*! * Number of weighted vertices. */ - mutable ushort numVertices; + mutable unsigned short numVertices; /*! * The vertex weights. */ diff --git a/include/gen/SkinPartition.h b/include/gen/SkinPartition.h index aabf7fb777d0f26e7121d9fda6ce460d449f36e2..e4c17e35baf0dd4521773027cb979e181587924a 100644 --- a/include/gen/SkinPartition.h +++ b/include/gen/SkinPartition.h @@ -25,27 +25,27 @@ struct NIFLIB_API SkinPartition { /*! * Number of vertices in this submesh. */ - mutable ushort numVertices; + mutable unsigned short numVertices; /*! * Number of triangles in this submesh. */ - mutable ushort numTriangles; + mutable unsigned short numTriangles; /*! * Number of bones influencing this submesh. */ - mutable ushort numBones; + mutable unsigned short numBones; /*! * Number of strips in this submesh (zero if not stripped). */ - mutable ushort numStrips; + mutable unsigned short numStrips; /*! * Number of weight coefficients per vertex. */ - mutable ushort numWeightsPerVertex; + mutable unsigned short numWeightsPerVertex; /*! * List of bones. */ - vector<ushort > bones; + vector<unsigned short > bones; /*! * Do we have a vertex map? */ @@ -54,7 +54,7 @@ struct NIFLIB_API SkinPartition { * Maps the weight/influence lists in this submesh to the vertices in the * shape being skinned. */ - vector<ushort > vertexMap; + vector<unsigned short > vertexMap; /*! * Do we have vertex weights? */ @@ -66,7 +66,7 @@ struct NIFLIB_API SkinPartition { /*! * The strip lengths. */ - mutable vector<ushort > stripLengths; + mutable vector<unsigned short > stripLengths; /*! * Do we have strip data? */ @@ -74,7 +74,7 @@ struct NIFLIB_API SkinPartition { /*! * The strips. */ - vector< vector<ushort > > strips; + vector< vector<unsigned short > > strips; /*! * The triangles. */ diff --git a/include/gen/SkinShapeGroup.h b/include/gen/SkinShapeGroup.h index 7ecac0c6e718870920febfe4916d47504707787d..66b630d9c55091844b9298919da58d35734cea86 100644 --- a/include/gen/SkinShapeGroup.h +++ b/include/gen/SkinShapeGroup.h @@ -26,7 +26,7 @@ struct NIFLIB_API SkinShapeGroup { /*! * Counts unknown. */ - mutable uint numLinkPairs; + mutable unsigned int numLinkPairs; /*! * First link is a NiTriShape object. Second link is a * NiSkinInstance object. diff --git a/include/gen/SkinWeight.h b/include/gen/SkinWeight.h index df5e4387b604e926384b70a7bea10eead32cd5c7..d3669a7c424a4f33357679cccc3f9bd6da242089 100644 --- a/include/gen/SkinWeight.h +++ b/include/gen/SkinWeight.h @@ -24,7 +24,7 @@ struct NIFLIB_API SkinWeight { /*! * The vertex index, in the mesh. */ - ushort index; + unsigned short index; /*! * The vertex weight - between 0.0 and 1.0 */ diff --git a/include/gen/StringPalette.h b/include/gen/StringPalette.h index ffe5c6a2de52ed924635567b28081b09a4091743..676f593b001c11873c2af8e70405db5c84abfd7f 100644 --- a/include/gen/StringPalette.h +++ b/include/gen/StringPalette.h @@ -28,7 +28,7 @@ struct NIFLIB_API StringPalette { /*! * Length of the palette string is repeated here. */ - uint length; + unsigned int length; }; } diff --git a/include/gen/TexDesc.h b/include/gen/TexDesc.h index 0d359d95262f56c3518e56d67f35bd6c4bbfa423..47f39a0c0f538a2289b69395d849bc7e34a43b25 100644 --- a/include/gen/TexDesc.h +++ b/include/gen/TexDesc.h @@ -41,19 +41,19 @@ struct NIFLIB_API TexDesc { * The texture coordinate set in NiGeometryData that this texture slot * will use. */ - uint uvSet; + unsigned int uvSet; /*! * 0? */ - ushort ps2L; + unsigned short ps2L; /*! * 0xFFB5? */ - ushort ps2K; + unsigned short ps2K; /*! * Unknown, 0 or 0x0101? */ - ushort unknown1; + unsigned short unknown1; /*! * Determines whether or not the texture's coordinates are transformed. */ @@ -73,7 +73,7 @@ struct NIFLIB_API TexDesc { /*! * The texture transform type? Doesn't seem to do anything. */ - uint transformType_; + unsigned int transformType_; /*! * The offset from the origin? */ diff --git a/include/gen/enums_intl.h b/include/gen/enums_intl.h index 50ac344d27547cdeac7f0e38ee81471f00409552..05f36dfa7e6403b13463318f8c35e3e8800847b1 100644 --- a/include/gen/enums_intl.h +++ b/include/gen/enums_intl.h @@ -13,134 +13,134 @@ namespace Niflib { //---ForceType---// -void NifStream( ForceType & val, istream& in, uint version = 0 ); -void NifStream( ForceType const & val, ostream& out, uint version = 0 ); +void NifStream( ForceType & val, istream& in, unsigned int version = 0 ); +void NifStream( ForceType const & val, ostream& out, unsigned int version = 0 ); //---HavokMaterial---// -void NifStream( HavokMaterial & val, istream& in, uint version = 0 ); -void NifStream( HavokMaterial const & val, ostream& out, uint version = 0 ); +void NifStream( HavokMaterial & val, istream& in, unsigned int version = 0 ); +void NifStream( HavokMaterial const & val, ostream& out, unsigned int version = 0 ); //---CompareMode---// -void NifStream( CompareMode & val, istream& in, uint version = 0 ); -void NifStream( CompareMode const & val, ostream& out, uint version = 0 ); +void NifStream( CompareMode & val, istream& in, unsigned int version = 0 ); +void NifStream( CompareMode const & val, ostream& out, unsigned int version = 0 ); //---TexFilterMode---// -void NifStream( TexFilterMode & val, istream& in, uint version = 0 ); -void NifStream( TexFilterMode const & val, ostream& out, uint version = 0 ); +void NifStream( TexFilterMode & val, istream& in, unsigned int version = 0 ); +void NifStream( TexFilterMode const & val, ostream& out, unsigned int version = 0 ); //---LightMode---// -void NifStream( LightMode & val, istream& in, uint version = 0 ); -void NifStream( LightMode const & val, ostream& out, uint version = 0 ); +void NifStream( LightMode & val, istream& in, unsigned int version = 0 ); +void NifStream( LightMode const & val, ostream& out, unsigned int version = 0 ); //---MipMapFormat---// -void NifStream( MipMapFormat & val, istream& in, uint version = 0 ); -void NifStream( MipMapFormat const & val, ostream& out, uint version = 0 ); +void NifStream( MipMapFormat & val, istream& in, unsigned int version = 0 ); +void NifStream( MipMapFormat const & val, ostream& out, unsigned int version = 0 ); //---StencilAction---// -void NifStream( StencilAction & val, istream& in, uint version = 0 ); -void NifStream( StencilAction const & val, ostream& out, uint version = 0 ); +void NifStream( StencilAction & val, istream& in, unsigned int version = 0 ); +void NifStream( StencilAction const & val, ostream& out, unsigned int version = 0 ); //---OblivionLayer---// -void NifStream( OblivionLayer & val, istream& in, uint version = 0 ); -void NifStream( OblivionLayer const & val, ostream& out, uint version = 0 ); +void NifStream( OblivionLayer & val, istream& in, unsigned int version = 0 ); +void NifStream( OblivionLayer const & val, ostream& out, unsigned int version = 0 ); //---FaceDrawMode---// -void NifStream( FaceDrawMode & val, istream& in, uint version = 0 ); -void NifStream( FaceDrawMode const & val, ostream& out, uint version = 0 ); +void NifStream( FaceDrawMode & val, istream& in, unsigned int version = 0 ); +void NifStream( FaceDrawMode const & val, ostream& out, unsigned int version = 0 ); //---AlphaFormat---// -void NifStream( AlphaFormat & val, istream& in, uint version = 0 ); -void NifStream( AlphaFormat const & val, ostream& out, uint version = 0 ); +void NifStream( AlphaFormat & val, istream& in, unsigned int version = 0 ); +void NifStream( AlphaFormat const & val, ostream& out, unsigned int version = 0 ); //---KeyType---// -void NifStream( KeyType & val, istream& in, uint version = 0 ); -void NifStream( KeyType const & val, ostream& out, uint version = 0 ); +void NifStream( KeyType & val, istream& in, unsigned int version = 0 ); +void NifStream( KeyType const & val, ostream& out, unsigned int version = 0 ); //---VertMode---// -void NifStream( VertMode & val, istream& in, uint version = 0 ); -void NifStream( VertMode const & val, ostream& out, uint version = 0 ); +void NifStream( VertMode & val, istream& in, unsigned int version = 0 ); +void NifStream( VertMode const & val, ostream& out, unsigned int version = 0 ); //---ApplyMode---// -void NifStream( ApplyMode & val, istream& in, uint version = 0 ); -void NifStream( ApplyMode const & val, ostream& out, uint version = 0 ); +void NifStream( ApplyMode & val, istream& in, unsigned int version = 0 ); +void NifStream( ApplyMode const & val, ostream& out, unsigned int version = 0 ); //---MotionSystem---// -void NifStream( MotionSystem & val, istream& in, uint version = 0 ); -void NifStream( MotionSystem const & val, ostream& out, uint version = 0 ); +void NifStream( MotionSystem & val, istream& in, unsigned int version = 0 ); +void NifStream( MotionSystem const & val, ostream& out, unsigned int version = 0 ); //---BillboardMode---// -void NifStream( BillboardMode & val, istream& in, uint version = 0 ); -void NifStream( BillboardMode const & val, ostream& out, uint version = 0 ); +void NifStream( BillboardMode & val, istream& in, unsigned int version = 0 ); +void NifStream( BillboardMode const & val, ostream& out, unsigned int version = 0 ); //---TexType---// -void NifStream( TexType & val, istream& in, uint version = 0 ); -void NifStream( TexType const & val, ostream& out, uint version = 0 ); +void NifStream( TexType & val, istream& in, unsigned int version = 0 ); +void NifStream( TexType const & val, ostream& out, unsigned int version = 0 ); //---PixelLayout---// -void NifStream( PixelLayout & val, istream& in, uint version = 0 ); -void NifStream( PixelLayout const & val, ostream& out, uint version = 0 ); +void NifStream( PixelLayout & val, istream& in, unsigned int version = 0 ); +void NifStream( PixelLayout const & val, ostream& out, unsigned int version = 0 ); //---TexClampMode---// -void NifStream( TexClampMode & val, istream& in, uint version = 0 ); -void NifStream( TexClampMode const & val, ostream& out, uint version = 0 ); +void NifStream( TexClampMode & val, istream& in, unsigned int version = 0 ); +void NifStream( TexClampMode const & val, ostream& out, unsigned int version = 0 ); //---MotionQuality---// -void NifStream( MotionQuality & val, istream& in, uint version = 0 ); -void NifStream( MotionQuality const & val, ostream& out, uint version = 0 ); +void NifStream( MotionQuality & val, istream& in, unsigned int version = 0 ); +void NifStream( MotionQuality const & val, ostream& out, unsigned int version = 0 ); //---PixelFormat---// -void NifStream( PixelFormat & val, istream& in, uint version = 0 ); -void NifStream( PixelFormat const & val, ostream& out, uint version = 0 ); +void NifStream( PixelFormat & val, istream& in, unsigned int version = 0 ); +void NifStream( PixelFormat const & val, ostream& out, unsigned int version = 0 ); //---CycleType---// -void NifStream( CycleType & val, istream& in, uint version = 0 ); -void NifStream( CycleType const & val, ostream& out, uint version = 0 ); +void NifStream( CycleType & val, istream& in, unsigned int version = 0 ); +void NifStream( CycleType const & val, ostream& out, unsigned int version = 0 ); //---FieldType---// -void NifStream( FieldType & val, istream& in, uint version = 0 ); -void NifStream( FieldType const & val, ostream& out, uint version = 0 ); +void NifStream( FieldType & val, istream& in, unsigned int version = 0 ); +void NifStream( FieldType const & val, ostream& out, unsigned int version = 0 ); } #endif diff --git a/include/gen/hkTriangle.h b/include/gen/hkTriangle.h index d1b71956f09747ecc58f6039cb5bfd09fbe1da4a..0fa549e21ad0830d80e0eafc5e9f4116edf567de 100644 --- a/include/gen/hkTriangle.h +++ b/include/gen/hkTriangle.h @@ -28,7 +28,7 @@ struct NIFLIB_API hkTriangle { /*! * Another short, doesn't look like a vertex index. */ - ushort unknownShort; + unsigned short unknownShort; /*! * This is the triangle's normal. */ diff --git a/include/gen/obj_defines.h b/include/gen/obj_defines.h index 47517345a07e6b9f646b75959fb1dd31401af2a3..e3f9dc8cc070548440ae2782263e3aa021e73d52 100644 --- a/include/gen/obj_defines.h +++ b/include/gen/obj_defines.h @@ -20,9 +20,9 @@ NiParticleSystemController * controller; \ #define BHK_SERIALIZABLE_MEMBERS \ #define ABHK_CONSTRAINT_MEMBERS \ -mutable uint numBodies; \ +mutable unsigned int numBodies; \ vector<bhkShape * > bodies; \ -uint priority; \ +unsigned int priority; \ #define ABHK_RAGDOLL_CONSTRAINT_MEMBERS \ Float4 pivotA; \ @@ -53,11 +53,11 @@ HavokMaterial material; \ Ref<bhkShape > shape; \ OblivionLayer layer; \ byte colFilter; \ -ushort unknownShort; \ +unsigned short unknownShort; \ #define NI_COLLISION_OBJECT_MEMBERS \ NiAVObject * parent; \ -ushort unknownShort; \ +unsigned short unknownShort; \ Ref<NiObject > body; \ #define NI_EXTRA_DATA_MEMBERS \ @@ -67,8 +67,8 @@ Ref<NiExtraData > nextExtraData; \ #define NI_INTERPOLATOR_MEMBERS \ #define NI_BLEND_INTERPOLATOR_MEMBERS \ -ushort unknownShort; \ -uint unknownInt; \ +unsigned short unknownShort; \ +unsigned int unknownInt; \ #define NI_B_SPLINE_INTERPOLATOR_MEMBERS \ float startTime; \ @@ -79,17 +79,17 @@ Ref<NiBSplineBasisData > basisData; \ #define NI_OBJECT_N_E_T_MEMBERS \ string name; \ Ref<NiExtraData > extraData; \ -mutable uint numExtraDataList; \ +mutable unsigned int numExtraDataList; \ vector<Ref<NiExtraData > > extraDataList; \ Ref<NiTimeController > controller; \ #define NI_A_V_OBJECT_MEMBERS \ -ushort flags; \ +unsigned short flags; \ Vector3 translation; \ Matrix33 rotation; \ float scale; \ Vector3 velocity; \ -mutable uint numProperties; \ +mutable unsigned int numProperties; \ vector<Ref<NiProperty > > properties; \ bool hasBoundingBox; \ BoundingBox boundingBox; \ @@ -98,8 +98,8 @@ Ref<NiCollisionObject > collisionObject; \ #define NI_DYNAMIC_EFFECT_MEMBERS \ bool switchState; \ -mutable uint numAffectedNodes; \ -vector<uint > affectedNodeListPointers; \ +mutable unsigned int numAffectedNodes; \ +vector<unsigned int > affectedNodeListPointers; \ vector<Ref<NiAVObject > > affectedNodes; \ #define NI_LIGHT_MEMBERS \ @@ -112,7 +112,7 @@ Color3 specularColor; \ #define NI_P_SYS_MODIFIER_MEMBERS \ string name; \ -uint order; \ +unsigned int order; \ NiParticleSystem * target; \ bool active; \ @@ -134,7 +134,7 @@ NiNode * emitterObject; \ #define NI_TIME_CONTROLLER_MEMBERS \ Ref<NiTimeController > nextController; \ -ushort flags; \ +unsigned short flags; \ float frequency; \ float phase; \ float startTime; \ @@ -142,9 +142,9 @@ float stopTime; \ NiObjectNET * target; \ #define A_BONE_L_O_D_CONTROLLER_MEMBERS \ -uint unknownInt1; \ -mutable uint numNodeGroups; \ -uint numNodeGroups2; \ +unsigned int unknownInt1; \ +mutable unsigned int numNodeGroups; \ +unsigned int numNodeGroups2; \ vector<NodeGroup > nodeGroups; \ #define NI_SINGLE_INTERPOLATOR_CONTROLLER_MEMBERS \ @@ -164,8 +164,8 @@ Ref<NiObject > unknownLink; \ #define NI_GEOMETRY_DATA_MEMBERS \ string name; \ -mutable ushort numVertices; \ -ushort unknownShort1; \ +mutable unsigned short numVertices; \ +unsigned short unknownShort1; \ bool hasVertices; \ vector<Vector3 > vertices; \ mutable byte numUvSets2; \ @@ -178,19 +178,19 @@ Vector3 center; \ float radius; \ bool hasVertexColors; \ vector<Color4 > vertexColors; \ -mutable ushort numUvSets; \ +mutable unsigned short numUvSets; \ bool hasUv; \ vector< vector<TexCoord > > uvSets; \ -ushort unknownShort2; \ +unsigned short unknownShort2; \ Ref<NiObject > unknownLink; \ #define NI_TRI_BASED_GEOM_DATA_MEMBERS \ -ushort numTriangles; \ +unsigned short numTriangles; \ #define A_P_SYS_DATA_MEMBERS \ bool hasUnknownFloats1; \ vector<float > unknownFloats1; \ -ushort unknownShort3; \ +unsigned short unknownShort3; \ bool hasUnknownFloats2; \ vector<float > unknownFloats2; \ byte hasUnknownFloats3; \ @@ -201,23 +201,23 @@ float unknownFloat1; \ float unknownFloat2; \ #define BHK_BLEND_CONTROLLER_MEMBERS \ -uint unknownInt; \ +unsigned int unknownInt; \ #define BHK_BOX_SHAPE_MEMBERS \ float unknownFloat1; \ -ushort unknownShort1; \ -ushort unknownShort2; \ -ushort unknownShort3; \ -ushort unknownShort4; \ +unsigned short unknownShort1; \ +unsigned short unknownShort2; \ +unsigned short unknownShort3; \ +unsigned short unknownShort4; \ Vector3 dimensions; \ float min_Size; \ #define BHK_CAPSULE_SHAPE_MEMBERS \ float radius; \ -ushort unknownShort1; \ -ushort unknownShort2; \ -ushort unknownShort3; \ -ushort unknownShort4; \ +unsigned short unknownShort1; \ +unsigned short unknownShort2; \ +unsigned short unknownShort3; \ +unsigned short unknownShort4; \ Vector3 firstPoint; \ float radius1; \ Vector3 secondPoint; \ @@ -227,9 +227,9 @@ float radius2; \ #define BHK_CONVEX_VERTICES_SHAPE_MEMBERS \ array<7,float > unknownFloats1; \ -mutable uint numVertices; \ +mutable unsigned int numVertices; \ vector<Float4 > vertices; \ -mutable uint numNormals; \ +mutable unsigned int numNormals; \ vector<Float4 > normals; \ #define BHK_HINGE_CONSTRAINT_MEMBERS \ @@ -239,19 +239,19 @@ array< 5, array<4,float > > unknownFloats; \ LimitedHingeDescriptor limitedHinge; \ #define BHK_LIST_SHAPE_MEMBERS \ -mutable uint numSubShapes; \ +mutable unsigned int numSubShapes; \ vector<Ref<bhkShape > > subShapes; \ HavokMaterial material; \ array<6,float > unknownFloats; \ -mutable uint numUnknownInts; \ -vector<uint > unknownInts; \ +mutable unsigned int numUnknownInts; \ +vector<unsigned int > unknownInts; \ #define BHK_MALLEABLE_CONSTRAINT_MEMBERS \ -uint type; \ -uint unknownInt2; \ +unsigned int type; \ +unsigned int unknownInt2; \ Ref<NiObject > unknownLink1; \ Ref<NiObject > unknownLink2; \ -uint unknownInt3; \ +unsigned int unknownInt3; \ RagDollDescriptor ragdoll; \ LimitedHingeDescriptor limitedHinge; \ float tau; \ @@ -262,7 +262,7 @@ Ref<bhkShape > shape; \ HavokMaterial material; \ array<8,byte > unknownBytes1; \ float unknownFloat; \ -mutable uint numUnknownBytes2; \ +mutable unsigned int numUnknownBytes2; \ vector<byte > unknownBytes2; \ Vector3 unknownVector; \ float unknownFloat2; \ @@ -271,23 +271,23 @@ float unknownFloat2; \ float unknownFloat1; \ float unknownFloat2; \ float unknownFloat3; \ -mutable uint numSpheres; \ +mutable unsigned int numSpheres; \ vector<Sphere > spheres; \ #define BHK_NI_TRI_STRIPS_SHAPE_MEMBERS \ float unknownFloat1; \ -uint unknownInt1; \ -array<4,uint > unknownInts1; \ -uint unknownInt2; \ +unsigned int unknownInt1; \ +array<4,unsigned int > unknownInts1; \ +unsigned int unknownInt2; \ Vector3 scale; \ -uint unknownInt3; \ -mutable uint numStripsData; \ +unsigned int unknownInt3; \ +mutable unsigned int numStripsData; \ vector<Ref<NiTriStripsData > > stripsData; \ -mutable uint numDataLayers; \ +mutable unsigned int numDataLayers; \ vector<OblivionColFilter > dataLayers; \ #define BHK_PACKED_NI_TRI_STRIPS_SHAPE_MEMBERS \ -mutable ushort numSubShapes; \ +mutable unsigned short numSubShapes; \ vector<OblivionSubShape > subShapes; \ array<9,float > unknownFloats; \ float scale; \ @@ -302,10 +302,10 @@ array<3,float > unknownFloats2; \ #define BHK_RIGID_BODY_MEMBERS \ array<5,float > unknown5Floats; \ -array<4,ushort > unknown4Shorts; \ +array<4,unsigned short > unknown4Shorts; \ OblivionLayer layerCopy; \ byte colFilterCopy; \ -array<7,ushort > unknown7Shorts; \ +array<7,unsigned short > unknown7Shorts; \ Vector3 translation; \ float unknownFloat00; \ QuaternionXYZW rotation; \ @@ -328,10 +328,10 @@ MotionSystem motionSystem; \ byte unknownByte1; \ byte unknownByte2; \ MotionQuality qualityType; \ -uint unknownInt6; \ -uint unknownInt7; \ -uint unknownInt8; \ -mutable uint numConstraints; \ +unsigned int unknownInt6; \ +unsigned int unknownInt7; \ +unsigned int unknownInt8; \ +mutable unsigned int numConstraints; \ vector<Ref<AbhkConstraint > > constraints; \ #define BHK_RIGID_BODY_T_MEMBERS \ @@ -363,7 +363,7 @@ Vector3 center; \ Vector3 dimensions; \ #define B_S_FURNITURE_MARKER_MEMBERS \ -mutable uint numPositions; \ +mutable unsigned int numPositions; \ vector<FurniturePosition > positions; \ #define B_S_PARENT_VELOCITY_MODIFIER_MEMBERS \ @@ -372,28 +372,28 @@ float unknownFloat; \ #define B_S_P_SYS_ARRAY_EMITTER_MEMBERS \ #define B_S_X_FLAGS_MEMBERS \ -uint flags; \ +unsigned int flags; \ #define HK_PACKED_NI_TRI_STRIPS_DATA_MEMBERS \ -mutable uint numTriangles; \ +mutable unsigned int numTriangles; \ vector<hkTriangle > triangles; \ -mutable uint numVertices; \ +mutable unsigned int numVertices; \ vector<Vector3 > vertices; \ #define NI_ALPHA_CONTROLLER_MEMBERS \ Ref<NiFloatData > data; \ #define NI_ALPHA_PROPERTY_MEMBERS \ -ushort flags; \ +unsigned short flags; \ byte threshold; \ #define NI_AMBIENT_LIGHT_MEMBERS \ #define NI_AUTO_NORMAL_PARTICLES_DATA_MEMBERS \ -ushort numParticles; \ +unsigned short numParticles; \ float size; \ -ushort numActive; \ -ushort unknownShort; \ +unsigned short numActive; \ +unsigned short unknownShort; \ bool hasSizes; \ vector<float > sizes; \ @@ -412,9 +412,9 @@ Vector3 pointValue; \ #define NI_BLEND_TRANSFORM_INTERPOLATOR_MEMBERS \ #define NI_BONE_L_O_D_CONTROLLER_MEMBERS \ -mutable uint numShapeGroups; \ +mutable unsigned int numShapeGroups; \ vector<SkinShapeGroup > shapeGroups1; \ -mutable uint numShapeGroups2; \ +mutable unsigned int numShapeGroups2; \ vector<Ref<NiTriShape > > shapeGroups2; \ #define NI_BOOL_DATA_MEMBERS \ @@ -434,7 +434,7 @@ Ref<NiBoolData > data; \ #define NI_B_S_BONE_L_O_D_CONTROLLER_MEMBERS \ #define NI_B_SPLINE_BASIS_DATA_MEMBERS \ -uint numControlPt; \ +unsigned int numControlPt; \ #define NI_B_SPLINE_COMP_FLOAT_INTERPOLATOR_MEMBERS \ array<4,float > unknownFloats; \ @@ -446,9 +446,9 @@ array<6,float > unknownFloats; \ Vector3 translation; \ Quaternion rotation; \ float scale; \ -uint translateOffset; \ -uint rotateOffset; \ -uint scaleOffset; \ +unsigned int translateOffset; \ +unsigned int rotateOffset; \ +unsigned int scaleOffset; \ float translateBias; \ float translateMultiplier; \ float rotationBias; \ @@ -457,12 +457,12 @@ float scaleBias; \ float scaleMultiplier; \ #define NI_B_SPLINE_DATA_MEMBERS \ -uint unknownInt; \ -mutable uint count; \ +unsigned int unknownInt; \ +mutable unsigned int count; \ vector<short > controlPoints; \ #define NI_CAMERA_MEMBERS \ -ushort unknownShort; \ +unsigned short unknownShort; \ float frustumLeft; \ float frustumRight; \ float frustumTop; \ @@ -476,15 +476,15 @@ float viewportTop; \ float viewportBottom; \ float lodAdjust; \ Ref<NiObject > unknownLink_; \ -uint unknownInt; \ -uint unknownInt2; \ +unsigned int unknownInt; \ +unsigned int unknownInt2; \ #define NI_COLLISION_DATA_MEMBERS \ NiNode * targetNode; \ -uint unknownInt1; \ -uint unknownInt2; \ +unsigned int unknownInt1; \ +unsigned int unknownInt2; \ byte unknownByte; \ -uint collisionType; \ +unsigned int collisionType; \ Vector3 unknownVector; \ array<8,float > unknownFloat1; \ array<15,float > unknownFloat2; \ @@ -497,7 +497,7 @@ Color4 data; \ #define NI_CONTROLLER_MANAGER_MEMBERS \ bool cumulative; \ -mutable uint numControllerSequences; \ +mutable unsigned int numControllerSequences; \ vector<Ref<NiControllerSequence > > controllerSequences; \ Ref<NiDefaultAVObjectPalette > objectPalette; \ @@ -505,12 +505,12 @@ Ref<NiDefaultAVObjectPalette > objectPalette; \ string name; \ string textKeysName; \ Ref<NiTextKeyExtraData > textKeys; \ -mutable uint numControlledBlocks; \ -uint unknownInt1; \ +mutable unsigned int numControlledBlocks; \ +unsigned int unknownInt1; \ vector<ControllerLink > controlledBlocks; \ float weight; \ CycleType cycleType; \ -uint unknownInt0; \ +unsigned int unknownInt0; \ float frequency; \ float startTime; \ float stopTime; \ @@ -521,20 +521,20 @@ string targetName; \ Ref<NiStringPalette > stringPalette; \ #define NI_DEFAULT_A_V_OBJECT_PALETTE_MEMBERS \ -uint unknownInt; \ -mutable uint numObjs; \ +unsigned int unknownInt; \ +mutable unsigned int numObjs; \ vector<AVObject > objs; \ #define NI_DIRECTIONAL_LIGHT_MEMBERS \ #define NI_DITHER_PROPERTY_MEMBERS \ -ushort flags; \ +unsigned short flags; \ #define NI_FLIP_CONTROLLER_MEMBERS \ -uint textureSlot; \ -uint unknownInt2; \ +unsigned int textureSlot; \ +unsigned int unknownInt2; \ float delta; \ -mutable uint numSources; \ +mutable unsigned int numSources; \ vector<Ref<NiSourceTexture > > sources; \ #define NI_FLOAT_DATA_MEMBERS \ @@ -552,23 +552,23 @@ float floatValue; \ Ref<NiFloatData > data; \ #define NI_FLOATS_EXTRA_DATA_MEMBERS \ -mutable uint numFloats; \ +mutable unsigned int numFloats; \ vector<float > data; \ #define NI_FOG_PROPERTY_MEMBERS \ -ushort flags; \ +unsigned short flags; \ float fogDepth; \ Color3 fogColor; \ #define NI_GEOM_MORPHER_CONTROLLER_MEMBERS \ -ushort unknown; \ +unsigned short unknown; \ byte unknown2; \ Ref<NiMorphData > data; \ byte unknownByte; \ -mutable uint numInterpolators; \ +mutable unsigned int numInterpolators; \ vector<Ref<NiInterpolator > > interpolators; \ -mutable uint numUnknownInts; \ -vector<uint > unknownInts; \ +mutable unsigned int numUnknownInts; \ +vector<unsigned int > unknownInts; \ #define NI_GRAVITY_MEMBERS \ float unknownFloat1; \ @@ -578,11 +578,11 @@ Vector3 position; \ Vector3 direction; \ #define NI_INTEGER_EXTRA_DATA_MEMBERS \ -uint integerData; \ +unsigned int integerData; \ #define NI_INTEGERS_EXTRA_DATA_MEMBERS \ -mutable uint numIntegers; \ -vector<uint > data; \ +mutable unsigned int numIntegers; \ +vector<unsigned int > data; \ #define NI_KEYFRAME_CONTROLLER_MEMBERS \ Ref<NiKeyframeData > data; \ @@ -591,7 +591,7 @@ Ref<NiKeyframeData > data; \ Ref<NiKeyframeData > data2; \ #define NI_KEYFRAME_DATA_MEMBERS \ -mutable uint numRotationKeys; \ +mutable unsigned int numRotationKeys; \ KeyType rotationType; \ vector<Key<Quaternion > > quaternionKeys; \ float unknownFloat; \ @@ -600,7 +600,7 @@ KeyGroup<Vector3 > translations; \ KeyGroup<float > scales; \ #define NI_LIGHT_COLOR_CONTROLLER_MEMBERS \ -ushort unknownShort; \ +unsigned short unknownShort; \ Ref<NiPosData > data; \ Ref<NiPoint3Interpolator > interpolator; \ @@ -608,11 +608,11 @@ Ref<NiPoint3Interpolator > interpolator; \ Ref<NiInterpolator > unknownLink; \ #define NI_LOOK_AT_CONTROLLER_MEMBERS \ -ushort unknown1; \ +unsigned short unknown1; \ Ref<NiNode > lookAtNode; \ #define NI_LOOK_AT_INTERPOLATOR_MEMBERS \ -ushort unknownShort; \ +unsigned short unknownShort; \ Ref<NiNode > lookAt; \ float unknownFloat; \ Vector3 translation; \ @@ -623,11 +623,11 @@ Ref<NiFloatInterpolator > unknownLink2; \ Ref<NiFloatInterpolator > unknownLink3; \ #define NI_MATERIAL_COLOR_CONTROLLER_MEMBERS \ -ushort targetColor; \ +unsigned short targetColor; \ Ref<NiPosData > data; \ #define NI_MATERIAL_PROPERTY_MEMBERS \ -ushort flags; \ +unsigned short flags; \ Color3 ambientColor; \ Color3 diffuseColor; \ Color3 specularColor; \ @@ -639,32 +639,32 @@ float alpha; \ byte unknownByte11; \ vector< array<10,float > > unknownFloats4; \ vector< array<12,float > > unknownFloats5; \ -uint unknownInt1; \ +unsigned int unknownInt1; \ Ref<NiObject > modifier; \ byte unknownByte2; \ -mutable uint numUnknownLinks; \ +mutable unsigned int numUnknownLinks; \ vector<Ref<NiObject > > unknownLinks; \ -ushort unknownShort4; \ -uint unknownInt2; \ +unsigned short unknownShort4; \ +unsigned int unknownInt2; \ byte unknownByte12; \ -uint unknownInt3; \ -uint unknownInt4; \ +unsigned int unknownInt3; \ +unsigned int unknownInt4; \ Ref<NiNode > unknownLink2; \ #define NI_MORPH_DATA_MEMBERS \ -mutable uint numMorphs; \ -uint numVertices; \ +mutable unsigned int numMorphs; \ +unsigned int numVertices; \ byte unknownByte; \ vector<Morph > morphs; \ #define NI_MULTI_TARGET_TRANSFORM_CONTROLLER_MEMBERS \ -mutable ushort numExtraTargets; \ +mutable unsigned short numExtraTargets; \ vector<NiNode * > extraTargets; \ #define NI_NODE_MEMBERS \ -mutable uint numChildren; \ +mutable unsigned int numChildren; \ vector<Ref<NiAVObject > > children; \ -mutable uint numEffects; \ +mutable unsigned int numEffects; \ vector<Ref<NiDynamicEffect > > effects; \ #define AVOID_NODE_MEMBERS \ @@ -676,10 +676,10 @@ array<292,byte > unknown292Bytes; \ #define FX_BUTTON_MEMBERS \ #define FX_RADIO_BUTTON_MEMBERS \ -uint unknownInt1; \ -uint unknownInt2; \ -uint unknownInt3; \ -mutable uint numButtons; \ +unsigned int unknownInt1; \ +unsigned int unknownInt2; \ +unsigned int unknownInt3; \ +mutable unsigned int numButtons; \ vector<FxRadioButton * > buttons; \ #define NI_BILLBOARD_NODE_MEMBERS \ @@ -692,14 +692,14 @@ BillboardMode billboardMode; \ #define NI_L_O_D_NODE_MEMBERS \ array<4,byte > unknown4Bytes; \ Vector3 lodCenter; \ -mutable uint numLodLevels; \ +mutable unsigned int numLodLevels; \ vector<LODRange > lodLevels; \ -ushort unknownShort; \ +unsigned short unknownShort; \ Ref<NiLODData > lodLevelData; \ #define NI_PALETTE_MEMBERS \ byte unknownByte; \ -uint numEntries_; \ +unsigned int numEntries_; \ array< 256, array<4,byte > > palette; \ #define NI_PARTICLE_BOMB_MEMBERS \ @@ -707,8 +707,8 @@ float unknownFloat1; \ float unknownFloat2; \ float unknownFloat3; \ float unknownFloat4; \ -uint unknownInt1; \ -uint unknownInt2; \ +unsigned int unknownInt1; \ +unsigned int unknownInt2; \ float unknownFloat5; \ float unknownFloat6; \ float unknownFloat7; \ @@ -724,7 +724,7 @@ float grow; \ float fade; \ #define NI_PARTICLE_MESH_MODIFIER_MEMBERS \ -mutable uint numParticleMeshes; \ +mutable unsigned int numParticleMeshes; \ vector<Ref<NiAVObject > > particleMeshes; \ #define NI_PARTICLE_ROTATION_MEMBERS \ @@ -741,7 +741,7 @@ float unknownFloat4; \ #define NI_PARTICLE_MESHES_MEMBERS \ #define NI_PARTICLES_DATA_MEMBERS \ -ushort numActive; \ +unsigned short numActive; \ bool hasUnknownFloats; \ vector<float > unknownFloats; \ bool hasRotations; \ @@ -752,7 +752,7 @@ Ref<NiAVObject > unknownLink2; \ #define NI_PARTICLE_SYSTEM_MEMBERS \ bool unknownBool; \ -mutable uint numModifiers; \ +mutable unsigned int numModifiers; \ vector<Ref<NiPSysModifier > > modifiers; \ #define NI_MESH_PARTICLE_SYSTEM_MEMBERS \ @@ -778,16 +778,16 @@ byte unknownByte; \ float emitRate; \ float lifetime; \ float lifetimeRandom; \ -ushort emitFlags; \ +unsigned short emitFlags; \ Vector3 startRandom; \ NiObject * emitter; \ -ushort unknownShort2_; \ +unsigned short unknownShort2_; \ float unknownFloat13_; \ -uint unknownInt1_; \ -uint unknownInt2_; \ -ushort unknownShort3_; \ -mutable ushort numParticles; \ -ushort numValid; \ +unsigned int unknownInt1_; \ +unsigned int unknownInt2_; \ +unsigned short unknownShort3_; \ +mutable unsigned short numParticles; \ +unsigned short numValid; \ vector<Particle > particles; \ Ref<NiObject > unknownLink; \ Ref<AParticleModifier > particleExtra; \ @@ -797,43 +797,43 @@ byte trailer; \ #define NI_B_S_P_ARRAY_CONTROLLER_MEMBERS \ #define NI_PATH_CONTROLLER_MEMBERS \ -ushort unknownShort2; \ -uint unknownInt1; \ -uint unknownInt2; \ -uint unknownInt3; \ -ushort unknownShort; \ +unsigned short unknownShort2; \ +unsigned int unknownInt1; \ +unsigned int unknownInt2; \ +unsigned int unknownInt3; \ +unsigned short unknownShort; \ Ref<NiPosData > posData; \ Ref<NiFloatData > floatData; \ #define NI_PATH_INTERPOLATOR_MEMBERS \ float unknownFloat1; \ float unknownFloat2; \ -ushort unknownShort2; \ +unsigned short unknownShort2; \ Ref<NiPosData > posData; \ Ref<NiFloatData > floatData; \ #define NI_PIXEL_DATA_MEMBERS \ PixelFormat pixelFormat; \ -uint redMask; \ -uint greenMask; \ -uint blueMask; \ -uint alphaMask; \ -uint bitsPerPixel; \ +unsigned int redMask; \ +unsigned int greenMask; \ +unsigned int blueMask; \ +unsigned int alphaMask; \ +unsigned int bitsPerPixel; \ array<8,byte > unknown8Bytes; \ -uint unknownInt; \ +unsigned int unknownInt; \ array<54,byte > unknown54Bytes; \ Ref<NiPalette > palette; \ -mutable uint numMipmaps; \ -uint bytesPerPixel; \ +mutable unsigned int numMipmaps; \ +unsigned int bytesPerPixel; \ vector<MipMap > mipmaps; \ ByteArray pixelData; \ -uint unknownInt2; \ +unsigned int unknownInt2; \ #define NI_PLANAR_COLLIDER_MEMBERS \ -ushort unknownShort; \ +unsigned short unknownShort; \ float unknownFloat1; \ float unknownFloat2; \ -ushort unknownShort2; \ +unsigned short unknownShort2; \ float unknownFloat3; \ float unknownFloat4; \ float unknownFloat5; \ @@ -867,12 +867,12 @@ Ref<NiPSysSpawnModifier > spawnModifier; \ #define NI_P_SYS_BOMB_MODIFIER_MEMBERS \ NiNode * unknownLink; \ -array<2,uint > unknownInts1; \ +array<2,unsigned int > unknownInts1; \ array<3,float > unknownFloats; \ -array<2,uint > unknownInts2; \ +array<2,unsigned int > unknownInts2; \ #define NI_P_SYS_BOUND_UPDATE_MODIFIER_MEMBERS \ -ushort updateSkip; \ +unsigned short updateSkip; \ #define NI_P_SYS_BOX_EMITTER_MEMBERS \ float width; \ @@ -897,7 +897,7 @@ vector< array<28,byte > > unknownBytesAlt; \ byte unknownByte3; \ bool unknownBool2; \ vector< array<4,byte > > unknownBytes2; \ -uint unknownInt1; \ +unsigned int unknownInt1; \ #define NI_P_SYS_DRAG_MODIFIER_MEMBERS \ NiObject * parent; \ @@ -912,7 +912,7 @@ Ref<NiInterpolator > visibilityInterpolator; \ #define NI_P_SYS_EMITTER_CTLR_DATA_MEMBERS \ KeyGroup<float > floatKeys_; \ -mutable uint numVisibilityKeys_; \ +mutable unsigned int numVisibilityKeys_; \ vector<Key<byte > > visibilityKeys_; \ #define NI_P_SYS_EMITTER_DECLINATION_CTLR_MEMBERS \ @@ -941,23 +941,23 @@ Ref<NiFloatData > unknownLink; \ #define NI_P_SYS_GROW_FADE_MODIFIER_MEMBERS \ float growTime; \ -ushort growGeneration; \ +unsigned short growGeneration; \ float fadeTime; \ -ushort fadeGeneration; \ +unsigned short fadeGeneration; \ #define NI_P_SYS_MESH_EMITTER_MEMBERS \ -mutable uint numEmitterMeshes; \ +mutable unsigned int numEmitterMeshes; \ vector<Ref<NiTriBasedGeom > > emitterMeshes; \ -uint initialVelocityType; \ -uint emissionType; \ +unsigned int initialVelocityType; \ +unsigned int emissionType; \ Vector3 emissionAxis; \ #define NI_P_SYS_MESH_UPDATE_MODIFIER_MEMBERS \ -mutable uint numMeshes; \ +mutable unsigned int numMeshes; \ vector<Ref<NiNode > > meshes; \ #define NI_P_SYS_MODIFIER_ACTIVE_CTLR_MEMBERS \ -uint unknownInt; \ +unsigned int unknownInt; \ #define NI_P_SYS_PLANAR_COLLIDER_MEMBERS \ float bounce; \ @@ -986,10 +986,10 @@ bool randomInitialAxis; \ Vector3 initialAxis; \ #define NI_P_SYS_SPAWN_MODIFIER_MEMBERS \ -ushort numSpawnGenerations; \ +unsigned short numSpawnGenerations; \ float percentageSpawned; \ -ushort minNumToSpawn; \ -ushort maxNumToSpawn; \ +unsigned short minNumToSpawn; \ +unsigned short maxNumToSpawn; \ float spawnSpeedChaos; \ float spawnDirChaos; \ float lifeSpan; \ @@ -1004,7 +1004,7 @@ float radius; \ #define NI_RANGE_L_O_D_DATA_MEMBERS \ Vector3 lodCenter; \ -mutable uint numLodLevels; \ +mutable unsigned int numLodLevels; \ vector<LODRange > lodLevels; \ #define NI_SCREEN_L_O_D_DATA_MEMBERS \ @@ -1012,7 +1012,7 @@ Vector3 boundCenter; \ float boundRadius; \ Vector3 worldCenter; \ float worldRadius; \ -mutable uint proportionCount; \ +mutable unsigned int proportionCount; \ vector<float > proportionLevels; \ #define NI_ROTATING_PARTICLES_MEMBERS \ @@ -1022,13 +1022,13 @@ vector<float > proportionLevels; \ #define NI_SEQUENCE_STREAM_HELPER_MEMBERS \ #define NI_SHADE_PROPERTY_MEMBERS \ -ushort flags; \ +unsigned short flags; \ #define NI_SKIN_DATA_MEMBERS \ Matrix33 rotation; \ Vector3 translation; \ float scale; \ -mutable uint numBones; \ +mutable unsigned int numBones; \ Ref<NiSkinPartition > skinPartition; \ byte unknownByte; \ vector<SkinData > boneList; \ @@ -1037,13 +1037,13 @@ vector<SkinData > boneList; \ Ref<NiSkinData > data; \ Ref<NiSkinPartition > skinPartition; \ NiNode * skeletonRoot; \ -mutable uint numBones; \ +mutable unsigned int numBones; \ vector<NiNode * > bones; \ #define NI_CLOD_SKIN_INSTANCE_MEMBERS \ #define NI_SKIN_PARTITION_MEMBERS \ -mutable uint numSkinPartitionBlocks; \ +mutable unsigned int numSkinPartitionBlocks; \ vector<SkinPartition > skinPartitionBlocks; \ #define NI_SOURCE_TEXTURE_MEMBERS \ @@ -1059,13 +1059,13 @@ AlphaFormat alphaFormat; \ byte unknownByte2; \ #define NI_SPECULAR_PROPERTY_MEMBERS \ -ushort flags; \ +unsigned short flags; \ #define NI_SPHERICAL_COLLIDER_MEMBERS \ float unknownFloat1; \ -ushort unknownShort1; \ +unsigned short unknownShort1; \ float unknownFloat2; \ -ushort unknownShort2; \ +unsigned short unknownShort2; \ float unknownFloat3; \ float unknownFloat4; \ float unknownFloat5; \ @@ -1075,30 +1075,30 @@ float cutoffAngle; \ float exponent; \ #define NI_STENCIL_PROPERTY_MEMBERS \ -ushort flags; \ +unsigned short flags; \ byte stencilEnabled; \ CompareMode stencilFunction; \ -uint stencilRef; \ -uint stencilMask; \ +unsigned int stencilRef; \ +unsigned int stencilMask; \ StencilAction failAction; \ StencilAction zFailAction; \ StencilAction passAction; \ FaceDrawMode drawMode; \ #define NI_STRING_EXTRA_DATA_MEMBERS \ -uint bytesRemaining; \ +unsigned int bytesRemaining; \ string stringData; \ #define NI_STRING_PALETTE_MEMBERS \ StringPalette palette; \ #define NI_STRINGS_EXTRA_DATA_MEMBERS \ -mutable uint numStrings; \ +mutable unsigned int numStrings; \ vector<string > data; \ #define NI_TEXT_KEY_EXTRA_DATA_MEMBERS \ -uint unknownInt1; \ -mutable uint numTextKeys; \ +unsigned int unknownInt1; \ +mutable unsigned int numTextKeys; \ vector<Key<string > > textKeys; \ #define NI_TEXTURE_EFFECT_MEMBERS \ @@ -1106,20 +1106,20 @@ Matrix33 modelProjectionMatrix; \ Vector3 modelProjectionTransform; \ TexFilterMode textureFiltering; \ TexClampMode textureClamping; \ -uint textureType; \ -uint coordinateGenerationType; \ +unsigned int textureType; \ +unsigned int coordinateGenerationType; \ Ref<NiSourceTexture > sourceTexture; \ byte clippingPlane; \ Vector3 unknownVector; \ float unknownFloat; \ -ushort ps2L; \ -ushort ps2K; \ -ushort unknownShort; \ +unsigned short ps2L; \ +unsigned short ps2K; \ +unsigned short unknownShort; \ #define NI_TEXTURE_TRANSFORM_CONTROLLER_MEMBERS \ byte unknown2; \ TexType textureSlot; \ -uint operation; \ +unsigned int operation; \ Ref<NiFloatData > data; \ #define NI_TEXTURE_MODE_PROPERTY_MEMBERS \ @@ -1131,13 +1131,13 @@ string file; \ array<4,short > unknown4Shorts; \ #define NI_TEXTURE_PROPERTY_MEMBERS \ -ushort flags; \ +unsigned short flags; \ Ref<NiImage > image; \ #define NI_TEXTURING_PROPERTY_MEMBERS \ -ushort flags; \ +unsigned short flags; \ ApplyMode applyMode; \ -uint textureCount; \ +unsigned int textureCount; \ bool hasBaseTexture; \ TexDesc baseTexture; \ bool hasDarkTexture; \ @@ -1161,7 +1161,7 @@ bool hasDecal2Texture; \ TexDesc decal2Texture; \ bool hasDecal3Texture; \ TexDesc decal3Texture; \ -mutable uint numShaderTextures; \ +mutable unsigned int numShaderTextures; \ vector<ShaderTexDesc > shaderTextures; \ #define NI_TRANSFORM_CONTROLLER_MEMBERS \ @@ -1178,35 +1178,35 @@ Ref<NiTransformData > data; \ #define NI_TRI_SHAPE_MEMBERS \ #define NI_TRI_SHAPE_DATA_MEMBERS \ -uint numTrianglePoints; \ +unsigned int numTrianglePoints; \ bool hasTriangles; \ vector<Triangle > triangles; \ -mutable ushort numMatchGroups; \ +mutable unsigned short numMatchGroups; \ vector<MatchGroup > matchGroups; \ #define NI_TRI_STRIPS_MEMBERS \ #define NI_TRI_STRIPS_DATA_MEMBERS \ -mutable ushort numStrips; \ -mutable vector<ushort > stripLengths; \ +mutable unsigned short numStrips; \ +mutable vector<unsigned short > stripLengths; \ bool hasPoints; \ -vector< vector<ushort > > points; \ +vector< vector<unsigned short > > points; \ #define NI_CLOD_MEMBERS \ #define NI_CLOD_DATA_MEMBERS \ -ushort unknownShorts; \ -mutable ushort unknownCount1; \ -mutable ushort unknownCount2; \ -mutable ushort unknownCount3; \ +unsigned short unknownShorts; \ +mutable unsigned short unknownCount1; \ +mutable unsigned short unknownCount2; \ +mutable unsigned short unknownCount3; \ float unknownFloat; \ -ushort unknownShort; \ -vector< array<6,ushort > > unknownClodShorts1; \ -vector<ushort > unknownClodShorts2; \ -vector< array<6,ushort > > unknownClodShorts3; \ +unsigned short unknownShort; \ +vector< array<6,unsigned short > > unknownClodShorts1; \ +vector<unsigned short > unknownClodShorts2; \ +vector< array<6,unsigned short > > unknownClodShorts3; \ #define NI_U_V_CONTROLLER_MEMBERS \ -ushort unknownShort; \ +unsigned short unknownShort; \ Ref<NiUVData > data; \ #define NI_U_V_DATA_MEMBERS \ @@ -1217,27 +1217,27 @@ Vector3 vectorData; \ float unknownFloat; \ #define NI_VERTEX_COLOR_PROPERTY_MEMBERS \ -ushort flags; \ +unsigned short flags; \ VertMode vertexMode; \ LightMode lightingMode; \ #define NI_VERT_WEIGHTS_EXTRA_DATA_MEMBERS \ -uint numBytes; \ -mutable ushort numVertices; \ +unsigned int numBytes; \ +mutable unsigned short numVertices; \ vector<float > weight; \ #define NI_VIS_CONTROLLER_MEMBERS \ Ref<NiVisData > data; \ #define NI_VIS_DATA_MEMBERS \ -mutable uint numVisKeys; \ +mutable unsigned int numVisKeys; \ vector<Key<byte > > visKeys; \ #define NI_WIREFRAME_PROPERTY_MEMBERS \ -ushort flags; \ +unsigned short flags; \ #define NI_Z_BUFFER_PROPERTY_MEMBERS \ -ushort flags; \ +unsigned short flags; \ CompareMode function; \ #define ROOT_COLLISION_NODE_MEMBERS \ @@ -1485,7 +1485,7 @@ CompareMode function; \ #define BHK_SERIALIZABLE_CONSTRUCT #define ABHK_CONSTRAINT_PARENT bhkSerializable -#define ABHK_CONSTRAINT_CONSTRUCT : numBodies((uint)0), priority((uint)1) +#define ABHK_CONSTRAINT_CONSTRUCT : numBodies((unsigned int)0), priority((unsigned int)1) #define ABHK_RAGDOLL_CONSTRAINT_PARENT AbhkConstraint @@ -1508,11 +1508,11 @@ CompareMode function; \ #define BHK_WORLD_OBJECT_CONSTRUCT #define BHK_ENTITY_PARENT bhkWorldObject -#define BHK_ENTITY_CONSTRUCT : shape(NULL), layer((OblivionLayer)1), colFilter((byte)0), unknownShort((ushort)0) +#define BHK_ENTITY_CONSTRUCT : shape(NULL), layer((OblivionLayer)1), colFilter((byte)0), unknownShort((unsigned short)0) #define NI_COLLISION_OBJECT_PARENT NiObject -#define NI_COLLISION_OBJECT_CONSTRUCT : parent(NULL), unknownShort((ushort)1), body(NULL) +#define NI_COLLISION_OBJECT_CONSTRUCT : parent(NULL), unknownShort((unsigned short)1), body(NULL) #define NI_EXTRA_DATA_PARENT NiObject @@ -1523,7 +1523,7 @@ CompareMode function; \ #define NI_INTERPOLATOR_CONSTRUCT #define NI_BLEND_INTERPOLATOR_PARENT NiInterpolator -#define NI_BLEND_INTERPOLATOR_CONSTRUCT : unknownShort((ushort)0), unknownInt((uint)0) +#define NI_BLEND_INTERPOLATOR_CONSTRUCT : unknownShort((unsigned short)0), unknownInt((unsigned int)0) #define NI_B_SPLINE_INTERPOLATOR_PARENT NiInterpolator @@ -1531,15 +1531,15 @@ CompareMode function; \ #define NI_OBJECT_N_E_T_PARENT NiObject -#define NI_OBJECT_N_E_T_CONSTRUCT : extraData(NULL), numExtraDataList((uint)0), controller(NULL) +#define NI_OBJECT_N_E_T_CONSTRUCT : extraData(NULL), numExtraDataList((unsigned int)0), controller(NULL) #define NI_A_V_OBJECT_PARENT NiObjectNET -#define NI_A_V_OBJECT_CONSTRUCT : flags((ushort)0), scale(1.0f), numProperties((uint)0), hasBoundingBox(false), collisionData(NULL), collisionObject(NULL) +#define NI_A_V_OBJECT_CONSTRUCT : flags((unsigned short)0), scale(1.0f), numProperties((unsigned int)0), hasBoundingBox(false), collisionData(NULL), collisionObject(NULL) #define NI_DYNAMIC_EFFECT_PARENT NiAVObject -#define NI_DYNAMIC_EFFECT_CONSTRUCT : switchState(false), numAffectedNodes((uint)0) +#define NI_DYNAMIC_EFFECT_CONSTRUCT : switchState(false), numAffectedNodes((unsigned int)0) #define NI_LIGHT_PARENT NiDynamicEffect @@ -1550,7 +1550,7 @@ CompareMode function; \ #define NI_PROPERTY_CONSTRUCT #define NI_P_SYS_MODIFIER_PARENT NiObject -#define NI_P_SYS_MODIFIER_CONSTRUCT : order((uint)0), target(NULL), active(false) +#define NI_P_SYS_MODIFIER_CONSTRUCT : order((unsigned int)0), target(NULL), active(false) #define NI_P_SYS_EMITTER_PARENT NiPSysModifier @@ -1562,11 +1562,11 @@ CompareMode function; \ #define NI_TIME_CONTROLLER_PARENT NiObject -#define NI_TIME_CONTROLLER_CONSTRUCT : nextController(NULL), flags((ushort)0), frequency(0.0f), phase(0.0f), startTime(0.0f), stopTime(0.0f), target(NULL) +#define NI_TIME_CONTROLLER_CONSTRUCT : nextController(NULL), flags((unsigned short)0), frequency(0.0f), phase(0.0f), startTime(0.0f), stopTime(0.0f), target(NULL) #define A_BONE_L_O_D_CONTROLLER_PARENT NiTimeController -#define A_BONE_L_O_D_CONTROLLER_CONSTRUCT : unknownInt1((uint)0), numNodeGroups((uint)0), numNodeGroups2((uint)0) +#define A_BONE_L_O_D_CONTROLLER_CONSTRUCT : unknownInt1((unsigned int)0), numNodeGroups((unsigned int)0), numNodeGroups2((unsigned int)0) #define NI_SINGLE_INTERPOLATOR_CONTROLLER_PARENT NiTimeController @@ -1584,15 +1584,15 @@ CompareMode function; \ #define NI_TRI_BASED_GEOM_CONSTRUCT #define NI_GEOMETRY_DATA_PARENT NiObject -#define NI_GEOMETRY_DATA_CONSTRUCT : numVertices((ushort)0), unknownShort1((ushort)0), hasVertices(false), numUvSets2((byte)0), unknownByte((byte)0), hasNormals(false), radius(0.0f), hasVertexColors(false), numUvSets((ushort)0), hasUv(false), unknownShort2((ushort)0), unknownLink(NULL) +#define NI_GEOMETRY_DATA_CONSTRUCT : numVertices((unsigned short)0), unknownShort1((unsigned short)0), hasVertices(false), numUvSets2((byte)0), unknownByte((byte)0), hasNormals(false), radius(0.0f), hasVertexColors(false), numUvSets((unsigned short)0), hasUv(false), unknownShort2((unsigned short)0), unknownLink(NULL) #define NI_TRI_BASED_GEOM_DATA_PARENT NiGeometryData -#define NI_TRI_BASED_GEOM_DATA_CONSTRUCT : numTriangles((ushort)0) +#define NI_TRI_BASED_GEOM_DATA_CONSTRUCT : numTriangles((unsigned short)0) #define A_P_SYS_DATA_PARENT NiGeometryData -#define A_P_SYS_DATA_CONSTRUCT : hasUnknownFloats1(false), unknownShort3((ushort)0), hasUnknownFloats2(false), hasUnknownFloats3((byte)0) +#define A_P_SYS_DATA_CONSTRUCT : hasUnknownFloats1(false), unknownShort3((unsigned short)0), hasUnknownFloats2(false), hasUnknownFloats3((byte)0) #define BHK_BLEND_COLLISION_OBJECT_PARENT NiCollisionObject @@ -1600,22 +1600,22 @@ CompareMode function; \ #define BHK_BLEND_CONTROLLER_PARENT NiTimeController -#define BHK_BLEND_CONTROLLER_CONSTRUCT : unknownInt((uint)0) +#define BHK_BLEND_CONTROLLER_CONSTRUCT : unknownInt((unsigned int)0) #define BHK_BOX_SHAPE_PARENT bhkConvexShape -#define BHK_BOX_SHAPE_CONSTRUCT : unknownFloat1(0.0f), unknownShort1((ushort)0), unknownShort2((ushort)0), unknownShort3((ushort)0), unknownShort4((ushort)0), min_Size(0.0f) +#define BHK_BOX_SHAPE_CONSTRUCT : unknownFloat1(0.0f), unknownShort1((unsigned short)0), unknownShort2((unsigned short)0), unknownShort3((unsigned short)0), unknownShort4((unsigned short)0), min_Size(0.0f) #define BHK_CAPSULE_SHAPE_PARENT bhkConvexShape -#define BHK_CAPSULE_SHAPE_CONSTRUCT : radius(0.0f), unknownShort1((ushort)0), unknownShort2((ushort)0), unknownShort3((ushort)0), unknownShort4((ushort)0), radius1(0.0f), radius2(0.0f) +#define BHK_CAPSULE_SHAPE_CONSTRUCT : radius(0.0f), unknownShort1((unsigned short)0), unknownShort2((unsigned short)0), unknownShort3((unsigned short)0), unknownShort4((unsigned short)0), radius1(0.0f), radius2(0.0f) #define BHK_COLLISION_OBJECT_PARENT NiCollisionObject #define BHK_COLLISION_OBJECT_CONSTRUCT #define BHK_CONVEX_VERTICES_SHAPE_PARENT bhkSphereRepShape -#define BHK_CONVEX_VERTICES_SHAPE_CONSTRUCT : numVertices((uint)0), numNormals((uint)0) +#define BHK_CONVEX_VERTICES_SHAPE_CONSTRUCT : numVertices((unsigned int)0), numNormals((unsigned int)0) #define BHK_HINGE_CONSTRAINT_PARENT AbhkConstraint @@ -1625,27 +1625,27 @@ CompareMode function; \ #define BHK_LIMITED_HINGE_CONSTRAINT_CONSTRUCT #define BHK_LIST_SHAPE_PARENT AbhkShapeCollection -#define BHK_LIST_SHAPE_CONSTRUCT : numSubShapes((uint)0), numUnknownInts((uint)0) +#define BHK_LIST_SHAPE_CONSTRUCT : numSubShapes((unsigned int)0), numUnknownInts((unsigned int)0) #define BHK_MALLEABLE_CONSTRAINT_PARENT AbhkConstraint -#define BHK_MALLEABLE_CONSTRAINT_CONSTRUCT : type((uint)0), unknownInt2((uint)0), unknownLink1(NULL), unknownLink2(NULL), unknownInt3((uint)0), tau(0.0f), damping(0.0f) +#define BHK_MALLEABLE_CONSTRAINT_CONSTRUCT : type((unsigned int)0), unknownInt2((unsigned int)0), unknownLink1(NULL), unknownLink2(NULL), unknownInt3((unsigned int)0), tau(0.0f), damping(0.0f) #define BHK_MOPP_BV_TREE_SHAPE_PARENT bhkShape -#define BHK_MOPP_BV_TREE_SHAPE_CONSTRUCT : shape(NULL), unknownFloat(0.0f), numUnknownBytes2((uint)0), unknownFloat2(0.0f) +#define BHK_MOPP_BV_TREE_SHAPE_CONSTRUCT : shape(NULL), unknownFloat(0.0f), numUnknownBytes2((unsigned int)0), unknownFloat2(0.0f) #define BHK_MULTI_SPHERE_SHAPE_PARENT bhkSphereRepShape -#define BHK_MULTI_SPHERE_SHAPE_CONSTRUCT : unknownFloat1(0.0f), unknownFloat2(0.0f), unknownFloat3(0.0f), numSpheres((uint)0) +#define BHK_MULTI_SPHERE_SHAPE_CONSTRUCT : unknownFloat1(0.0f), unknownFloat2(0.0f), unknownFloat3(0.0f), numSpheres((unsigned int)0) #define BHK_NI_TRI_STRIPS_SHAPE_PARENT bhkSphereRepShape -#define BHK_NI_TRI_STRIPS_SHAPE_CONSTRUCT : unknownFloat1(0.1f), unknownInt1((uint)0x004ABE60), unknownInt2((uint)1), scale(1.0f, 1.0f, 1.0f), unknownInt3((uint)0), numStripsData((uint)0), numDataLayers((uint)0) +#define BHK_NI_TRI_STRIPS_SHAPE_CONSTRUCT : unknownFloat1(0.1f), unknownInt1((unsigned int)0x004ABE60), unknownInt2((unsigned int)1), scale(1.0f, 1.0f, 1.0f), unknownInt3((unsigned int)0), numStripsData((unsigned int)0), numDataLayers((unsigned int)0) #define BHK_PACKED_NI_TRI_STRIPS_SHAPE_PARENT AbhkShapeCollection -#define BHK_PACKED_NI_TRI_STRIPS_SHAPE_CONSTRUCT : numSubShapes((ushort)0), scale(1.0f), data(NULL) +#define BHK_PACKED_NI_TRI_STRIPS_SHAPE_CONSTRUCT : numSubShapes((unsigned short)0), scale(1.0f), data(NULL) #define BHK_PRISMATIC_CONSTRAINT_PARENT AbhkConstraint @@ -1655,7 +1655,7 @@ CompareMode function; \ #define BHK_RAGDOLL_CONSTRAINT_CONSTRUCT #define BHK_RIGID_BODY_PARENT bhkEntity -#define BHK_RIGID_BODY_CONSTRUCT : layerCopy((OblivionLayer)1), colFilterCopy((byte)0), unknownFloat00(0.0f), unknownFloat01(0.0f), unknownFloat02(0.0f), unknownFloat03(0.0f), mass(0.0f), linearDamping(0.1f), angularDamping(0.1f), friction(0.3f), restitution(0.3f), maxLinearVelocity(250.0f), maxAngularVelocity(31.415926535f), penetrationDepth(0.15f), motionSystem((MotionSystem)7), unknownByte1((byte)1), unknownByte2((byte)1), qualityType((MotionQuality)1), unknownInt6((uint)0), unknownInt7((uint)0), unknownInt8((uint)0), numConstraints((uint)0) +#define BHK_RIGID_BODY_CONSTRUCT : layerCopy((OblivionLayer)1), colFilterCopy((byte)0), unknownFloat00(0.0f), unknownFloat01(0.0f), unknownFloat02(0.0f), unknownFloat03(0.0f), mass(0.0f), linearDamping(0.1f), angularDamping(0.1f), friction(0.3f), restitution(0.3f), maxLinearVelocity(250.0f), maxAngularVelocity(31.415926535f), penetrationDepth(0.15f), motionSystem((MotionSystem)7), unknownByte1((byte)1), unknownByte2((byte)1), qualityType((MotionQuality)1), unknownInt6((unsigned int)0), unknownInt7((unsigned int)0), unknownInt8((unsigned int)0), numConstraints((unsigned int)0) #define BHK_RIGID_BODY_T_PARENT bhkRigidBody @@ -1687,7 +1687,7 @@ CompareMode function; \ #define B_S_BOUND_CONSTRUCT #define B_S_FURNITURE_MARKER_PARENT NiExtraData -#define B_S_FURNITURE_MARKER_CONSTRUCT : numPositions((uint)0) +#define B_S_FURNITURE_MARKER_CONSTRUCT : numPositions((unsigned int)0) #define B_S_PARENT_VELOCITY_MODIFIER_PARENT NiPSysModifier @@ -1698,11 +1698,11 @@ CompareMode function; \ #define B_S_P_SYS_ARRAY_EMITTER_CONSTRUCT #define B_S_X_FLAGS_PARENT NiExtraData -#define B_S_X_FLAGS_CONSTRUCT : flags((uint)0) +#define B_S_X_FLAGS_CONSTRUCT : flags((unsigned int)0) #define HK_PACKED_NI_TRI_STRIPS_DATA_PARENT AbhkShapeCollection -#define HK_PACKED_NI_TRI_STRIPS_DATA_CONSTRUCT : numTriangles((uint)0), numVertices((uint)0) +#define HK_PACKED_NI_TRI_STRIPS_DATA_CONSTRUCT : numTriangles((unsigned int)0), numVertices((unsigned int)0) #define NI_ALPHA_CONTROLLER_PARENT NiSingleInterpolatorController @@ -1710,14 +1710,14 @@ CompareMode function; \ #define NI_ALPHA_PROPERTY_PARENT NiProperty -#define NI_ALPHA_PROPERTY_CONSTRUCT : flags((ushort)237), threshold((byte)0) +#define NI_ALPHA_PROPERTY_CONSTRUCT : flags((unsigned short)237), threshold((byte)0) #define NI_AMBIENT_LIGHT_PARENT NiLight #define NI_AMBIENT_LIGHT_CONSTRUCT #define NI_AUTO_NORMAL_PARTICLES_DATA_PARENT NiGeometryData -#define NI_AUTO_NORMAL_PARTICLES_DATA_CONSTRUCT : numParticles((ushort)0), size(0.0f), numActive((ushort)0), unknownShort((ushort)0), hasSizes(false) +#define NI_AUTO_NORMAL_PARTICLES_DATA_CONSTRUCT : numParticles((unsigned short)0), size(0.0f), numActive((unsigned short)0), unknownShort((unsigned short)0), hasSizes(false) #define NI_BINARY_EXTRA_DATA_PARENT NiExtraData @@ -1738,7 +1738,7 @@ CompareMode function; \ #define NI_BLEND_TRANSFORM_INTERPOLATOR_CONSTRUCT #define NI_BONE_L_O_D_CONTROLLER_PARENT ABoneLODController -#define NI_BONE_L_O_D_CONTROLLER_CONSTRUCT : numShapeGroups((uint)0), numShapeGroups2((uint)0) +#define NI_BONE_L_O_D_CONTROLLER_CONSTRUCT : numShapeGroups((unsigned int)0), numShapeGroups2((unsigned int)0) #define NI_BOOL_DATA_PARENT AKeyedData @@ -1760,7 +1760,7 @@ CompareMode function; \ #define NI_B_S_BONE_L_O_D_CONTROLLER_CONSTRUCT #define NI_B_SPLINE_BASIS_DATA_PARENT NiObject -#define NI_B_SPLINE_BASIS_DATA_CONSTRUCT : numControlPt((uint)0) +#define NI_B_SPLINE_BASIS_DATA_CONSTRUCT : numControlPt((unsigned int)0) #define NI_B_SPLINE_COMP_FLOAT_INTERPOLATOR_PARENT NiBSplineInterpolator @@ -1770,19 +1770,19 @@ CompareMode function; \ #define NI_B_SPLINE_COMP_POINT3_INTERPOLATOR_CONSTRUCT #define NI_B_SPLINE_COMP_TRANSFORM_INTERPOLATOR_PARENT NiBSplineInterpolator -#define NI_B_SPLINE_COMP_TRANSFORM_INTERPOLATOR_CONSTRUCT : scale(0.0f), translateOffset((uint)0), rotateOffset((uint)0), scaleOffset((uint)0), translateBias(0.0f), translateMultiplier(0.0f), rotationBias(0.0f), rotationMultiplier(0.0f), scaleBias(0.0f), scaleMultiplier(0.0f) +#define NI_B_SPLINE_COMP_TRANSFORM_INTERPOLATOR_CONSTRUCT : scale(0.0f), translateOffset((unsigned int)0), rotateOffset((unsigned int)0), scaleOffset((unsigned int)0), translateBias(0.0f), translateMultiplier(0.0f), rotationBias(0.0f), rotationMultiplier(0.0f), scaleBias(0.0f), scaleMultiplier(0.0f) #define NI_B_SPLINE_DATA_PARENT NiObject -#define NI_B_SPLINE_DATA_CONSTRUCT : unknownInt((uint)0), count((uint)0) +#define NI_B_SPLINE_DATA_CONSTRUCT : unknownInt((unsigned int)0), count((unsigned int)0) #define NI_CAMERA_PARENT NiAVObject -#define NI_CAMERA_CONSTRUCT : unknownShort((ushort)0), frustumLeft(0.0f), frustumRight(0.0f), frustumTop(0.0f), frustumBottom(0.0f), frustumNear(0.0f), frustumFar(0.0f), useOrthographicProjection(false), viewportLeft(0.0f), viewportRight(0.0f), viewportTop(0.0f), viewportBottom(0.0f), lodAdjust(0.0f), unknownLink_(NULL), unknownInt((uint)0), unknownInt2((uint)0) +#define NI_CAMERA_CONSTRUCT : unknownShort((unsigned short)0), frustumLeft(0.0f), frustumRight(0.0f), frustumTop(0.0f), frustumBottom(0.0f), frustumNear(0.0f), frustumFar(0.0f), useOrthographicProjection(false), viewportLeft(0.0f), viewportRight(0.0f), viewportTop(0.0f), viewportBottom(0.0f), lodAdjust(0.0f), unknownLink_(NULL), unknownInt((unsigned int)0), unknownInt2((unsigned int)0) #define NI_COLLISION_DATA_PARENT NiObject -#define NI_COLLISION_DATA_CONSTRUCT : targetNode(NULL), unknownInt1((uint)0), unknownInt2((uint)0), unknownByte((byte)0), collisionType((uint)0) +#define NI_COLLISION_DATA_CONSTRUCT : targetNode(NULL), unknownInt1((unsigned int)0), unknownInt2((unsigned int)0), unknownByte((byte)0), collisionType((unsigned int)0) #define NI_COLOR_DATA_PARENT AKeyedData @@ -1792,26 +1792,26 @@ CompareMode function; \ #define NI_COLOR_EXTRA_DATA_CONSTRUCT #define NI_CONTROLLER_MANAGER_PARENT NiTimeController -#define NI_CONTROLLER_MANAGER_CONSTRUCT : cumulative(false), numControllerSequences((uint)0), objectPalette(NULL) +#define NI_CONTROLLER_MANAGER_CONSTRUCT : cumulative(false), numControllerSequences((unsigned int)0), objectPalette(NULL) #define NI_CONTROLLER_SEQUENCE_PARENT NiObject -#define NI_CONTROLLER_SEQUENCE_CONSTRUCT : textKeys(NULL), numControlledBlocks((uint)0), unknownInt1((uint)0), weight(1.0f), unknownInt0((uint)0), frequency(0.0f), startTime(0.0f), stopTime(0.0f), unknownFloat2(0.0f), unknownByte((byte)0), manager(NULL), stringPalette(NULL) +#define NI_CONTROLLER_SEQUENCE_CONSTRUCT : textKeys(NULL), numControlledBlocks((unsigned int)0), unknownInt1((unsigned int)0), weight(1.0f), unknownInt0((unsigned int)0), frequency(0.0f), startTime(0.0f), stopTime(0.0f), unknownFloat2(0.0f), unknownByte((byte)0), manager(NULL), stringPalette(NULL) #define NI_DEFAULT_A_V_OBJECT_PALETTE_PARENT NiObject -#define NI_DEFAULT_A_V_OBJECT_PALETTE_CONSTRUCT : unknownInt((uint)0), numObjs((uint)0) +#define NI_DEFAULT_A_V_OBJECT_PALETTE_CONSTRUCT : unknownInt((unsigned int)0), numObjs((unsigned int)0) #define NI_DIRECTIONAL_LIGHT_PARENT NiLight #define NI_DIRECTIONAL_LIGHT_CONSTRUCT #define NI_DITHER_PROPERTY_PARENT NiProperty -#define NI_DITHER_PROPERTY_CONSTRUCT : flags((ushort)0) +#define NI_DITHER_PROPERTY_CONSTRUCT : flags((unsigned short)0) #define NI_FLIP_CONTROLLER_PARENT NiSingleInterpolatorController -#define NI_FLIP_CONTROLLER_CONSTRUCT : textureSlot((uint)0), unknownInt2((uint)0), delta(0.0f), numSources((uint)0) +#define NI_FLIP_CONTROLLER_CONSTRUCT : textureSlot((unsigned int)0), unknownInt2((unsigned int)0), delta(0.0f), numSources((unsigned int)0) #define NI_FLOAT_DATA_PARENT AKeyedData @@ -1830,15 +1830,15 @@ CompareMode function; \ #define NI_FLOATS_EXTRA_DATA_PARENT NiExtraData -#define NI_FLOATS_EXTRA_DATA_CONSTRUCT : numFloats((uint)0) +#define NI_FLOATS_EXTRA_DATA_CONSTRUCT : numFloats((unsigned int)0) #define NI_FOG_PROPERTY_PARENT NiProperty -#define NI_FOG_PROPERTY_CONSTRUCT : flags((ushort)0), fogDepth(0.0f) +#define NI_FOG_PROPERTY_CONSTRUCT : flags((unsigned short)0), fogDepth(0.0f) #define NI_GEOM_MORPHER_CONTROLLER_PARENT NiTimeController -#define NI_GEOM_MORPHER_CONTROLLER_CONSTRUCT : unknown((ushort)0), unknown2((byte)0), data(NULL), unknownByte((byte)0), numInterpolators((uint)0), numUnknownInts((uint)0) +#define NI_GEOM_MORPHER_CONTROLLER_CONSTRUCT : unknown((unsigned short)0), unknown2((byte)0), data(NULL), unknownByte((byte)0), numInterpolators((unsigned int)0), numUnknownInts((unsigned int)0) #define NI_GRAVITY_PARENT AParticleModifier @@ -1846,11 +1846,11 @@ CompareMode function; \ #define NI_INTEGER_EXTRA_DATA_PARENT NiExtraData -#define NI_INTEGER_EXTRA_DATA_CONSTRUCT : integerData((uint)0) +#define NI_INTEGER_EXTRA_DATA_CONSTRUCT : integerData((unsigned int)0) #define NI_INTEGERS_EXTRA_DATA_PARENT NiExtraData -#define NI_INTEGERS_EXTRA_DATA_CONSTRUCT : numIntegers((uint)0) +#define NI_INTEGERS_EXTRA_DATA_CONSTRUCT : numIntegers((unsigned int)0) #define NI_KEYFRAME_CONTROLLER_PARENT NiTimeController @@ -1862,11 +1862,11 @@ CompareMode function; \ #define NI_KEYFRAME_DATA_PARENT AKeyedData -#define NI_KEYFRAME_DATA_CONSTRUCT : numRotationKeys((uint)0), rotationType((KeyType)0), unknownFloat(0.0f) +#define NI_KEYFRAME_DATA_CONSTRUCT : numRotationKeys((unsigned int)0), rotationType((KeyType)0), unknownFloat(0.0f) #define NI_LIGHT_COLOR_CONTROLLER_PARENT NiTimeController -#define NI_LIGHT_COLOR_CONTROLLER_CONSTRUCT : unknownShort((ushort)0), data(NULL), interpolator(NULL) +#define NI_LIGHT_COLOR_CONTROLLER_CONSTRUCT : unknownShort((unsigned short)0), data(NULL), interpolator(NULL) #define NI_LIGHT_DIMMER_CONTROLLER_PARENT NiTimeController @@ -1874,35 +1874,35 @@ CompareMode function; \ #define NI_LOOK_AT_CONTROLLER_PARENT NiTimeController -#define NI_LOOK_AT_CONTROLLER_CONSTRUCT : unknown1((ushort)0), lookAtNode(NULL) +#define NI_LOOK_AT_CONTROLLER_CONSTRUCT : unknown1((unsigned short)0), lookAtNode(NULL) #define NI_LOOK_AT_INTERPOLATOR_PARENT NiInterpolator -#define NI_LOOK_AT_INTERPOLATOR_CONSTRUCT : unknownShort((ushort)0), lookAt(NULL), unknownFloat(0.0f), scale(0.0f), unknownLink1(NULL), unknownLink2(NULL), unknownLink3(NULL) +#define NI_LOOK_AT_INTERPOLATOR_CONSTRUCT : unknownShort((unsigned short)0), lookAt(NULL), unknownFloat(0.0f), scale(0.0f), unknownLink1(NULL), unknownLink2(NULL), unknownLink3(NULL) #define NI_MATERIAL_COLOR_CONTROLLER_PARENT NiSingleInterpolatorController -#define NI_MATERIAL_COLOR_CONTROLLER_CONSTRUCT : targetColor((ushort)0), data(NULL) +#define NI_MATERIAL_COLOR_CONTROLLER_CONSTRUCT : targetColor((unsigned short)0), data(NULL) #define NI_MATERIAL_PROPERTY_PARENT NiProperty -#define NI_MATERIAL_PROPERTY_CONSTRUCT : flags((ushort)0), glossiness(0.0f), alpha(0.0f) +#define NI_MATERIAL_PROPERTY_CONSTRUCT : flags((unsigned short)0), glossiness(0.0f), alpha(0.0f) #define NI_MESH_P_SYS_DATA_PARENT APSysData -#define NI_MESH_P_SYS_DATA_CONSTRUCT : unknownByte11((byte)0), unknownInt1((uint)0), modifier(NULL), unknownByte2((byte)0), numUnknownLinks((uint)0), unknownShort4((ushort)0), unknownInt2((uint)0), unknownByte12((byte)0), unknownInt3((uint)0), unknownInt4((uint)0), unknownLink2(NULL) +#define NI_MESH_P_SYS_DATA_CONSTRUCT : unknownByte11((byte)0), unknownInt1((unsigned int)0), modifier(NULL), unknownByte2((byte)0), numUnknownLinks((unsigned int)0), unknownShort4((unsigned short)0), unknownInt2((unsigned int)0), unknownByte12((byte)0), unknownInt3((unsigned int)0), unknownInt4((unsigned int)0), unknownLink2(NULL) #define NI_MORPH_DATA_PARENT NiObject -#define NI_MORPH_DATA_CONSTRUCT : numMorphs((uint)0), numVertices((uint)0), unknownByte((byte)0) +#define NI_MORPH_DATA_CONSTRUCT : numMorphs((unsigned int)0), numVertices((unsigned int)0), unknownByte((byte)0) #define NI_MULTI_TARGET_TRANSFORM_CONTROLLER_PARENT NiTimeController -#define NI_MULTI_TARGET_TRANSFORM_CONTROLLER_CONSTRUCT : numExtraTargets((ushort)0) +#define NI_MULTI_TARGET_TRANSFORM_CONTROLLER_CONSTRUCT : numExtraTargets((unsigned short)0) #define NI_NODE_PARENT NiAVObject -#define NI_NODE_CONSTRUCT : numChildren((uint)0), numEffects((uint)0) +#define NI_NODE_CONSTRUCT : numChildren((unsigned int)0), numEffects((unsigned int)0) #define AVOID_NODE_PARENT NiNode @@ -1916,7 +1916,7 @@ CompareMode function; \ #define FX_BUTTON_CONSTRUCT #define FX_RADIO_BUTTON_PARENT FxWidget -#define FX_RADIO_BUTTON_CONSTRUCT : unknownInt1((uint)0), unknownInt2((uint)0), unknownInt3((uint)0), numButtons((uint)0) +#define FX_RADIO_BUTTON_CONSTRUCT : unknownInt1((unsigned int)0), unknownInt2((unsigned int)0), unknownInt3((unsigned int)0), numButtons((unsigned int)0) #define NI_BILLBOARD_NODE_PARENT NiNode @@ -1929,15 +1929,15 @@ CompareMode function; \ #define NI_B_S_PARTICLE_NODE_CONSTRUCT #define NI_L_O_D_NODE_PARENT NiNode -#define NI_L_O_D_NODE_CONSTRUCT : numLodLevels((uint)0), unknownShort((ushort)0), lodLevelData(NULL) +#define NI_L_O_D_NODE_CONSTRUCT : numLodLevels((unsigned int)0), unknownShort((unsigned short)0), lodLevelData(NULL) #define NI_PALETTE_PARENT NiObject -#define NI_PALETTE_CONSTRUCT : unknownByte((byte)0), numEntries_((uint)0) +#define NI_PALETTE_CONSTRUCT : unknownByte((byte)0), numEntries_((unsigned int)0) #define NI_PARTICLE_BOMB_PARENT AParticleModifier -#define NI_PARTICLE_BOMB_CONSTRUCT : unknownFloat1(0.0f), unknownFloat2(0.0f), unknownFloat3(0.0f), unknownFloat4(0.0f), unknownInt1((uint)0), unknownInt2((uint)0), unknownFloat5(0.0f), unknownFloat6(0.0f), unknownFloat7(0.0f), unknownFloat8(0.0f), unknownFloat9(0.0f), unknownFloat10(0.0f) +#define NI_PARTICLE_BOMB_CONSTRUCT : unknownFloat1(0.0f), unknownFloat2(0.0f), unknownFloat3(0.0f), unknownFloat4(0.0f), unknownInt1((unsigned int)0), unknownInt2((unsigned int)0), unknownFloat5(0.0f), unknownFloat6(0.0f), unknownFloat7(0.0f), unknownFloat8(0.0f), unknownFloat9(0.0f), unknownFloat10(0.0f) #define NI_PARTICLE_COLOR_MODIFIER_PARENT AParticleModifier @@ -1949,7 +1949,7 @@ CompareMode function; \ #define NI_PARTICLE_MESH_MODIFIER_PARENT AParticleModifier -#define NI_PARTICLE_MESH_MODIFIER_CONSTRUCT : numParticleMeshes((uint)0) +#define NI_PARTICLE_MESH_MODIFIER_CONSTRUCT : numParticleMeshes((unsigned int)0) #define NI_PARTICLE_ROTATION_PARENT AParticleModifier @@ -1966,7 +1966,7 @@ CompareMode function; \ #define NI_PARTICLE_MESHES_CONSTRUCT #define NI_PARTICLES_DATA_PARENT NiAutoNormalParticlesData -#define NI_PARTICLES_DATA_CONSTRUCT : numActive((ushort)0), hasUnknownFloats(false), hasRotations(false) +#define NI_PARTICLES_DATA_CONSTRUCT : numActive((unsigned short)0), hasUnknownFloats(false), hasRotations(false) #define NI_PARTICLE_MESHES_DATA_PARENT NiParticlesData @@ -1974,33 +1974,33 @@ CompareMode function; \ #define NI_PARTICLE_SYSTEM_PARENT NiParticles -#define NI_PARTICLE_SYSTEM_CONSTRUCT : unknownBool(false), numModifiers((uint)0) +#define NI_PARTICLE_SYSTEM_CONSTRUCT : unknownBool(false), numModifiers((unsigned int)0) #define NI_MESH_PARTICLE_SYSTEM_PARENT NiParticleSystem #define NI_MESH_PARTICLE_SYSTEM_CONSTRUCT #define NI_PARTICLE_SYSTEM_CONTROLLER_PARENT NiTimeController -#define NI_PARTICLE_SYSTEM_CONTROLLER_CONSTRUCT : speed(0.0f), speedRandom(0.0f), verticalDirection(0.0f), verticalAngle(0.0f), horizontalDirection(0.0f), horizontalAngle(0.0f), unknownFloat5(0.0f), unknownFloat6(0.0f), unknownFloat7(0.0f), unknownFloat8(0.0f), unknownFloat9(0.0f), unknownFloat10(0.0f), unknownFloat11(0.0f), size(0.0f), emitStartTime(0.0f), emitStopTime(0.0f), unknownByte((byte)0), emitRate(0.0f), lifetime(0.0f), lifetimeRandom(0.0f), emitFlags((ushort)0), emitter(NULL), unknownShort2_((ushort)0), unknownFloat13_(0.0f), unknownInt1_((uint)0), unknownInt2_((uint)0), unknownShort3_((ushort)0), numParticles((ushort)0), numValid((ushort)0), unknownLink(NULL), particleExtra(NULL), unknownLink2(NULL), trailer((byte)0) +#define NI_PARTICLE_SYSTEM_CONTROLLER_CONSTRUCT : speed(0.0f), speedRandom(0.0f), verticalDirection(0.0f), verticalAngle(0.0f), horizontalDirection(0.0f), horizontalAngle(0.0f), unknownFloat5(0.0f), unknownFloat6(0.0f), unknownFloat7(0.0f), unknownFloat8(0.0f), unknownFloat9(0.0f), unknownFloat10(0.0f), unknownFloat11(0.0f), size(0.0f), emitStartTime(0.0f), emitStopTime(0.0f), unknownByte((byte)0), emitRate(0.0f), lifetime(0.0f), lifetimeRandom(0.0f), emitFlags((unsigned short)0), emitter(NULL), unknownShort2_((unsigned short)0), unknownFloat13_(0.0f), unknownInt1_((unsigned int)0), unknownInt2_((unsigned int)0), unknownShort3_((unsigned short)0), numParticles((unsigned short)0), numValid((unsigned short)0), unknownLink(NULL), particleExtra(NULL), unknownLink2(NULL), trailer((byte)0) #define NI_B_S_P_ARRAY_CONTROLLER_PARENT NiParticleSystemController #define NI_B_S_P_ARRAY_CONTROLLER_CONSTRUCT #define NI_PATH_CONTROLLER_PARENT NiTimeController -#define NI_PATH_CONTROLLER_CONSTRUCT : unknownShort2((ushort)0), unknownInt1((uint)0), unknownInt2((uint)0), unknownInt3((uint)0), unknownShort((ushort)0), posData(NULL), floatData(NULL) +#define NI_PATH_CONTROLLER_CONSTRUCT : unknownShort2((unsigned short)0), unknownInt1((unsigned int)0), unknownInt2((unsigned int)0), unknownInt3((unsigned int)0), unknownShort((unsigned short)0), posData(NULL), floatData(NULL) #define NI_PATH_INTERPOLATOR_PARENT NiBlendInterpolator -#define NI_PATH_INTERPOLATOR_CONSTRUCT : unknownFloat1(0.0f), unknownFloat2(0.0f), unknownShort2((ushort)0), posData(NULL), floatData(NULL) +#define NI_PATH_INTERPOLATOR_CONSTRUCT : unknownFloat1(0.0f), unknownFloat2(0.0f), unknownShort2((unsigned short)0), posData(NULL), floatData(NULL) #define NI_PIXEL_DATA_PARENT NiObject -#define NI_PIXEL_DATA_CONSTRUCT : redMask((uint)0), greenMask((uint)0), blueMask((uint)0), alphaMask((uint)0), bitsPerPixel((uint)0), unknownInt((uint)0), palette(NULL), numMipmaps((uint)0), bytesPerPixel((uint)0), unknownInt2((uint)0) +#define NI_PIXEL_DATA_CONSTRUCT : redMask((unsigned int)0), greenMask((unsigned int)0), blueMask((unsigned int)0), alphaMask((unsigned int)0), bitsPerPixel((unsigned int)0), unknownInt((unsigned int)0), palette(NULL), numMipmaps((unsigned int)0), bytesPerPixel((unsigned int)0), unknownInt2((unsigned int)0) #define NI_PLANAR_COLLIDER_PARENT AParticleModifier -#define NI_PLANAR_COLLIDER_CONSTRUCT : unknownShort((ushort)0), unknownFloat1(0.0f), unknownFloat2(0.0f), unknownShort2((ushort)0), unknownFloat3(0.0f), unknownFloat4(0.0f), unknownFloat5(0.0f), unknownFloat6(0.0f), unknownFloat7(0.0f), unknownFloat8(0.0f), unknownFloat9(0.0f), unknownFloat10(0.0f), unknownFloat11(0.0f), unknownFloat12(0.0f), unknownFloat13(0.0f), unknownFloat14(0.0f), unknownFloat15(0.0f), unknownFloat16(0.0f) +#define NI_PLANAR_COLLIDER_CONSTRUCT : unknownShort((unsigned short)0), unknownFloat1(0.0f), unknownFloat2(0.0f), unknownShort2((unsigned short)0), unknownFloat3(0.0f), unknownFloat4(0.0f), unknownFloat5(0.0f), unknownFloat6(0.0f), unknownFloat7(0.0f), unknownFloat8(0.0f), unknownFloat9(0.0f), unknownFloat10(0.0f), unknownFloat11(0.0f), unknownFloat12(0.0f), unknownFloat13(0.0f), unknownFloat14(0.0f), unknownFloat15(0.0f), unknownFloat16(0.0f) #define NI_POINT3_INTERPOLATOR_PARENT NiInterpolator @@ -2023,7 +2023,7 @@ CompareMode function; \ #define NI_P_SYS_BOUND_UPDATE_MODIFIER_PARENT NiPSysModifier -#define NI_P_SYS_BOUND_UPDATE_MODIFIER_CONSTRUCT : updateSkip((ushort)0) +#define NI_P_SYS_BOUND_UPDATE_MODIFIER_CONSTRUCT : updateSkip((unsigned short)0) #define NI_P_SYS_BOX_EMITTER_PARENT NiPSysVolumeEmitter @@ -2043,7 +2043,7 @@ CompareMode function; \ #define NI_P_SYS_DATA_PARENT APSysData -#define NI_P_SYS_DATA_CONSTRUCT : unknownBool1(false), unknownByte3((byte)0), unknownBool2(false), unknownInt1((uint)0) +#define NI_P_SYS_DATA_CONSTRUCT : unknownBool1(false), unknownByte3((byte)0), unknownBool2(false), unknownInt1((unsigned int)0) #define NI_P_SYS_DRAG_MODIFIER_PARENT NiPSysModifier @@ -2055,7 +2055,7 @@ CompareMode function; \ #define NI_P_SYS_EMITTER_CTLR_DATA_PARENT NiObject -#define NI_P_SYS_EMITTER_CTLR_DATA_CONSTRUCT : numVisibilityKeys_((uint)0) +#define NI_P_SYS_EMITTER_CTLR_DATA_CONSTRUCT : numVisibilityKeys_((unsigned int)0) #define NI_P_SYS_EMITTER_DECLINATION_CTLR_PARENT APSysCtlr @@ -2084,19 +2084,19 @@ CompareMode function; \ #define NI_P_SYS_GROW_FADE_MODIFIER_PARENT NiPSysModifier -#define NI_P_SYS_GROW_FADE_MODIFIER_CONSTRUCT : growTime(0.0f), growGeneration((ushort)0), fadeTime(0.0f), fadeGeneration((ushort)0) +#define NI_P_SYS_GROW_FADE_MODIFIER_CONSTRUCT : growTime(0.0f), growGeneration((unsigned short)0), fadeTime(0.0f), fadeGeneration((unsigned short)0) #define NI_P_SYS_MESH_EMITTER_PARENT NiPSysEmitter -#define NI_P_SYS_MESH_EMITTER_CONSTRUCT : numEmitterMeshes((uint)0), initialVelocityType((uint)0), emissionType((uint)0) +#define NI_P_SYS_MESH_EMITTER_CONSTRUCT : numEmitterMeshes((unsigned int)0), initialVelocityType((unsigned int)0), emissionType((unsigned int)0) #define NI_P_SYS_MESH_UPDATE_MODIFIER_PARENT NiPSysModifier -#define NI_P_SYS_MESH_UPDATE_MODIFIER_CONSTRUCT : numMeshes((uint)0) +#define NI_P_SYS_MESH_UPDATE_MODIFIER_CONSTRUCT : numMeshes((unsigned int)0) #define NI_P_SYS_MODIFIER_ACTIVE_CTLR_PARENT APSysCtlr -#define NI_P_SYS_MODIFIER_ACTIVE_CTLR_CONSTRUCT : unknownInt((uint)0) +#define NI_P_SYS_MODIFIER_ACTIVE_CTLR_CONSTRUCT : unknownInt((unsigned int)0) #define NI_P_SYS_PLANAR_COLLIDER_PARENT NiObject @@ -2114,7 +2114,7 @@ CompareMode function; \ #define NI_P_SYS_SPAWN_MODIFIER_PARENT NiPSysModifier -#define NI_P_SYS_SPAWN_MODIFIER_CONSTRUCT : numSpawnGenerations((ushort)0), percentageSpawned(0.0f), minNumToSpawn((ushort)0), maxNumToSpawn((ushort)0), spawnSpeedChaos(0.0f), spawnDirChaos(0.0f), lifeSpan(0.0f), lifeSpanVariation(0.0f) +#define NI_P_SYS_SPAWN_MODIFIER_CONSTRUCT : numSpawnGenerations((unsigned short)0), percentageSpawned(0.0f), minNumToSpawn((unsigned short)0), maxNumToSpawn((unsigned short)0), spawnSpeedChaos(0.0f), spawnDirChaos(0.0f), lifeSpan(0.0f), lifeSpanVariation(0.0f) #define NI_P_SYS_SPHERE_EMITTER_PARENT NiPSysVolumeEmitter @@ -2128,11 +2128,11 @@ CompareMode function; \ #define NI_L_O_D_DATA_CONSTRUCT #define NI_RANGE_L_O_D_DATA_PARENT NiLODData -#define NI_RANGE_L_O_D_DATA_CONSTRUCT : numLodLevels((uint)0) +#define NI_RANGE_L_O_D_DATA_CONSTRUCT : numLodLevels((unsigned int)0) #define NI_SCREEN_L_O_D_DATA_PARENT NiLODData -#define NI_SCREEN_L_O_D_DATA_CONSTRUCT : boundRadius(0.0f), worldRadius(0.0f), proportionCount((uint)0) +#define NI_SCREEN_L_O_D_DATA_CONSTRUCT : boundRadius(0.0f), worldRadius(0.0f), proportionCount((unsigned int)0) #define NI_ROTATING_PARTICLES_PARENT NiParticles @@ -2145,22 +2145,22 @@ CompareMode function; \ #define NI_SEQUENCE_STREAM_HELPER_CONSTRUCT #define NI_SHADE_PROPERTY_PARENT NiProperty -#define NI_SHADE_PROPERTY_CONSTRUCT : flags((ushort)0) +#define NI_SHADE_PROPERTY_CONSTRUCT : flags((unsigned short)0) #define NI_SKIN_DATA_PARENT NiObject -#define NI_SKIN_DATA_CONSTRUCT : scale(0.0f), numBones((uint)0), skinPartition(NULL), unknownByte((byte)1) +#define NI_SKIN_DATA_CONSTRUCT : scale(0.0f), numBones((unsigned int)0), skinPartition(NULL), unknownByte((byte)1) #define NI_SKIN_INSTANCE_PARENT NiObject -#define NI_SKIN_INSTANCE_CONSTRUCT : data(NULL), skinPartition(NULL), skeletonRoot(NULL), numBones((uint)0) +#define NI_SKIN_INSTANCE_CONSTRUCT : data(NULL), skinPartition(NULL), skeletonRoot(NULL), numBones((unsigned int)0) #define NI_CLOD_SKIN_INSTANCE_PARENT NiSkinInstance #define NI_CLOD_SKIN_INSTANCE_CONSTRUCT #define NI_SKIN_PARTITION_PARENT NiObject -#define NI_SKIN_PARTITION_CONSTRUCT : numSkinPartitionBlocks((uint)0) +#define NI_SKIN_PARTITION_CONSTRUCT : numSkinPartitionBlocks((unsigned int)0) #define NI_SOURCE_TEXTURE_PARENT NiObjectNET @@ -2168,11 +2168,11 @@ CompareMode function; \ #define NI_SPECULAR_PROPERTY_PARENT NiProperty -#define NI_SPECULAR_PROPERTY_CONSTRUCT : flags((ushort)0) +#define NI_SPECULAR_PROPERTY_CONSTRUCT : flags((unsigned short)0) #define NI_SPHERICAL_COLLIDER_PARENT AParticleModifier -#define NI_SPHERICAL_COLLIDER_CONSTRUCT : unknownFloat1(0.0f), unknownShort1((ushort)0), unknownFloat2(0.0f), unknownShort2((ushort)0), unknownFloat3(0.0f), unknownFloat4(0.0f), unknownFloat5(0.0f) +#define NI_SPHERICAL_COLLIDER_CONSTRUCT : unknownFloat1(0.0f), unknownShort1((unsigned short)0), unknownFloat2(0.0f), unknownShort2((unsigned short)0), unknownFloat3(0.0f), unknownFloat4(0.0f), unknownFloat5(0.0f) #define NI_SPOT_LIGHT_PARENT NiPointLight @@ -2180,30 +2180,30 @@ CompareMode function; \ #define NI_STENCIL_PROPERTY_PARENT NiProperty -#define NI_STENCIL_PROPERTY_CONSTRUCT : flags((ushort)0), stencilEnabled((byte)0), stencilRef((uint)0), stencilMask((uint)4294967295) +#define NI_STENCIL_PROPERTY_CONSTRUCT : flags((unsigned short)0), stencilEnabled((byte)0), stencilRef((unsigned int)0), stencilMask((unsigned int)4294967295) #define NI_STRING_EXTRA_DATA_PARENT NiExtraData -#define NI_STRING_EXTRA_DATA_CONSTRUCT : bytesRemaining((uint)0) +#define NI_STRING_EXTRA_DATA_CONSTRUCT : bytesRemaining((unsigned int)0) #define NI_STRING_PALETTE_PARENT NiObject #define NI_STRING_PALETTE_CONSTRUCT #define NI_STRINGS_EXTRA_DATA_PARENT NiExtraData -#define NI_STRINGS_EXTRA_DATA_CONSTRUCT : numStrings((uint)0) +#define NI_STRINGS_EXTRA_DATA_CONSTRUCT : numStrings((unsigned int)0) #define NI_TEXT_KEY_EXTRA_DATA_PARENT NiExtraData -#define NI_TEXT_KEY_EXTRA_DATA_CONSTRUCT : unknownInt1((uint)0), numTextKeys((uint)0) +#define NI_TEXT_KEY_EXTRA_DATA_CONSTRUCT : unknownInt1((unsigned int)0), numTextKeys((unsigned int)0) #define NI_TEXTURE_EFFECT_PARENT NiDynamicEffect -#define NI_TEXTURE_EFFECT_CONSTRUCT : textureType((uint)0), coordinateGenerationType((uint)0), sourceTexture(NULL), clippingPlane((byte)0), unknownFloat(0.0f), ps2L((ushort)0), ps2K((ushort)0), unknownShort((ushort)0) +#define NI_TEXTURE_EFFECT_CONSTRUCT : textureType((unsigned int)0), coordinateGenerationType((unsigned int)0), sourceTexture(NULL), clippingPlane((byte)0), unknownFloat(0.0f), ps2L((unsigned short)0), ps2K((unsigned short)0), unknownShort((unsigned short)0) #define NI_TEXTURE_TRANSFORM_CONTROLLER_PARENT NiSingleInterpolatorController -#define NI_TEXTURE_TRANSFORM_CONTROLLER_CONSTRUCT : unknown2((byte)0), operation((uint)0), data(NULL) +#define NI_TEXTURE_TRANSFORM_CONTROLLER_CONSTRUCT : unknown2((byte)0), operation((unsigned int)0), data(NULL) #define NI_TEXTURE_MODE_PROPERTY_PARENT NiProperty @@ -2214,11 +2214,11 @@ CompareMode function; \ #define NI_TEXTURE_PROPERTY_PARENT NiProperty -#define NI_TEXTURE_PROPERTY_CONSTRUCT : flags((ushort)0), image(NULL) +#define NI_TEXTURE_PROPERTY_CONSTRUCT : flags((unsigned short)0), image(NULL) #define NI_TEXTURING_PROPERTY_PARENT NiProperty -#define NI_TEXTURING_PROPERTY_CONSTRUCT : flags((ushort)0), applyMode((ApplyMode)2), textureCount((uint)7), hasBaseTexture(false), hasDarkTexture(false), hasDetailTexture(false), hasGlossTexture(false), hasGlowTexture(false), hasBumpMapTexture(false), bumpMapLumaScale(0.0f), bumpMapLumaOffset(0.0f), hasDecal0Texture(false), hasDecal1Texture(false), hasDecal2Texture(false), hasDecal3Texture(false), numShaderTextures((uint)0) +#define NI_TEXTURING_PROPERTY_CONSTRUCT : flags((unsigned short)0), applyMode((ApplyMode)2), textureCount((unsigned int)7), hasBaseTexture(false), hasDarkTexture(false), hasDetailTexture(false), hasGlossTexture(false), hasGlowTexture(false), hasBumpMapTexture(false), bumpMapLumaScale(0.0f), bumpMapLumaOffset(0.0f), hasDecal0Texture(false), hasDecal1Texture(false), hasDecal2Texture(false), hasDecal3Texture(false), numShaderTextures((unsigned int)0) #define NI_TRANSFORM_CONTROLLER_PARENT NiSingleInterpolatorController @@ -2235,25 +2235,25 @@ CompareMode function; \ #define NI_TRI_SHAPE_CONSTRUCT #define NI_TRI_SHAPE_DATA_PARENT NiTriBasedGeomData -#define NI_TRI_SHAPE_DATA_CONSTRUCT : numTrianglePoints((uint)0), hasTriangles(false), numMatchGroups((ushort)0) +#define NI_TRI_SHAPE_DATA_CONSTRUCT : numTrianglePoints((unsigned int)0), hasTriangles(false), numMatchGroups((unsigned short)0) #define NI_TRI_STRIPS_PARENT NiTriBasedGeom #define NI_TRI_STRIPS_CONSTRUCT #define NI_TRI_STRIPS_DATA_PARENT NiTriBasedGeomData -#define NI_TRI_STRIPS_DATA_CONSTRUCT : numStrips((ushort)0), hasPoints(false) +#define NI_TRI_STRIPS_DATA_CONSTRUCT : numStrips((unsigned short)0), hasPoints(false) #define NI_CLOD_PARENT NiTriBasedGeom #define NI_CLOD_CONSTRUCT #define NI_CLOD_DATA_PARENT NiTriBasedGeomData -#define NI_CLOD_DATA_CONSTRUCT : unknownShorts((ushort)0), unknownCount1((ushort)0), unknownCount2((ushort)0), unknownCount3((ushort)0), unknownFloat(0.0f), unknownShort((ushort)0) +#define NI_CLOD_DATA_CONSTRUCT : unknownShorts((unsigned short)0), unknownCount1((unsigned short)0), unknownCount2((unsigned short)0), unknownCount3((unsigned short)0), unknownFloat(0.0f), unknownShort((unsigned short)0) #define NI_U_V_CONTROLLER_PARENT NiTimeController -#define NI_U_V_CONTROLLER_CONSTRUCT : unknownShort((ushort)0), data(NULL) +#define NI_U_V_CONTROLLER_CONSTRUCT : unknownShort((unsigned short)0), data(NULL) #define NI_U_V_DATA_PARENT NiObject @@ -2264,11 +2264,11 @@ CompareMode function; \ #define NI_VERTEX_COLOR_PROPERTY_PARENT NiProperty -#define NI_VERTEX_COLOR_PROPERTY_CONSTRUCT : flags((ushort)0) +#define NI_VERTEX_COLOR_PROPERTY_CONSTRUCT : flags((unsigned short)0) #define NI_VERT_WEIGHTS_EXTRA_DATA_PARENT NiExtraData -#define NI_VERT_WEIGHTS_EXTRA_DATA_CONSTRUCT : numBytes((uint)0), numVertices((ushort)0) +#define NI_VERT_WEIGHTS_EXTRA_DATA_CONSTRUCT : numBytes((unsigned int)0), numVertices((unsigned short)0) #define NI_VIS_CONTROLLER_PARENT NiSingleInterpolatorController @@ -2276,15 +2276,15 @@ CompareMode function; \ #define NI_VIS_DATA_PARENT AKeyedData -#define NI_VIS_DATA_CONSTRUCT : numVisKeys((uint)0) +#define NI_VIS_DATA_CONSTRUCT : numVisKeys((unsigned int)0) #define NI_WIREFRAME_PROPERTY_PARENT NiProperty -#define NI_WIREFRAME_PROPERTY_CONSTRUCT : flags((ushort)0) +#define NI_WIREFRAME_PROPERTY_CONSTRUCT : flags((unsigned short)0) #define NI_Z_BUFFER_PROPERTY_PARENT NiProperty -#define NI_Z_BUFFER_PROPERTY_CONSTRUCT : flags((ushort)3), function((CompareMode)3) +#define NI_Z_BUFFER_PROPERTY_CONSTRUCT : flags((unsigned short)3), function((CompareMode)3) #define ROOT_COLLISION_NODE_PARENT NiNode diff --git a/include/nif_basic_types.h b/include/nif_basic_types.h index c597d2a0cefd9a6e2694abd080e8f1b72b165457..946b625bfa2140b75c18994cdf310137309712bc 100644 --- a/include/nif_basic_types.h +++ b/include/nif_basic_types.h @@ -22,10 +22,9 @@ struct LineString { }; //--Non-mathematical Basic Types--// - +#ifndef byte typedef unsigned char byte; -typedef unsigned short ushort; -typedef unsigned int uint; +#endif //TODO: This is temporary to make it compile. Should eventually be adjusted to display 1's and 0's insted of as an int. typedef unsigned short Flags; diff --git a/include/obj/ABoneLODController.h b/include/obj/ABoneLODController.h index 799a6c9c3f64ab8e4a4c02b2178c2be9bed02846..c44270099b45a58a1c9fdae0547ea7c47fb08557 100644 --- a/include/obj/ABoneLODController.h +++ b/include/obj/ABoneLODController.h @@ -29,10 +29,10 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; @@ -75,10 +75,10 @@ public: protected: A_BONE_L_O_D_CONTROLLER_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/AKeyedData.h b/include/obj/AKeyedData.h index 5feaa316b82c3120f3a1be58893419bdf97d9728..31206deebef963f1910cf8e9bf4ad774d5c0241d 100644 --- a/include/obj/AKeyedData.h +++ b/include/obj/AKeyedData.h @@ -25,20 +25,20 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; protected: A_KEYED_DATA_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/APSysCtlr.h b/include/obj/APSysCtlr.h index e2fb371e38b4bd801055504cb47c9b35b77e3b77..5cda253e48894ecd578eae66a714b25e7ad9b769 100644 --- a/include/obj/APSysCtlr.h +++ b/include/obj/APSysCtlr.h @@ -26,10 +26,10 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; @@ -42,10 +42,10 @@ public: protected: A_P_SYS_CTLR_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/APSysData.h b/include/obj/APSysData.h index 16d8603ac52ca19f7fcd031954992c9e5a36fa80..f1c885f7cabcfbf8882f6b78183f87ba3d3d53d4 100644 --- a/include/obj/APSysData.h +++ b/include/obj/APSysData.h @@ -25,20 +25,20 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; protected: A_P_SYS_DATA_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/AParticleModifier.h b/include/obj/AParticleModifier.h index 28f2dfd9f7cc6d4c25a3c6829b1ac633f35d0304..00ccefddeabbeff5ceb9c3ed83fb117589da7fd5 100644 --- a/include/obj/AParticleModifier.h +++ b/include/obj/AParticleModifier.h @@ -31,20 +31,20 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; protected: A_PARTICLE_MODIFIER_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/AbhkConstraint.h b/include/obj/AbhkConstraint.h index 27abe57664aea443cb4203a7ab153660e65ad039..fb366c6afc0703a54fad0e960a9fb84ea955005b 100644 --- a/include/obj/AbhkConstraint.h +++ b/include/obj/AbhkConstraint.h @@ -28,20 +28,20 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; protected: ABHK_CONSTRAINT_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/AbhkRagdollConstraint.h b/include/obj/AbhkRagdollConstraint.h index b81732ff4c1d2555ad0b0a8892fd79cbd07ada5c..0478b9285f82f4156b525085094b061fb1cd0dfb 100644 --- a/include/obj/AbhkRagdollConstraint.h +++ b/include/obj/AbhkRagdollConstraint.h @@ -26,20 +26,20 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; protected: ABHK_RAGDOLL_CONSTRAINT_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/AbhkShapeCollection.h b/include/obj/AbhkShapeCollection.h index 16a16ed25d6bf096986b13532e6fa725eafce946..d4af9e850e967de69fe673ef4547855c9e57889d 100644 --- a/include/obj/AbhkShapeCollection.h +++ b/include/obj/AbhkShapeCollection.h @@ -26,20 +26,20 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; protected: ABHK_SHAPE_COLLECTION_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/AvoidNode.h b/include/obj/AvoidNode.h index cc6d9b3f0323736d8995991c0f1c1ac918a2e593..be54d05437662e42fe1362508f7f2e2b996acb64 100644 --- a/include/obj/AvoidNode.h +++ b/include/obj/AvoidNode.h @@ -25,20 +25,20 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; protected: AVOID_NODE_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/BSBound.h b/include/obj/BSBound.h index cc4a4198f1352cf0f4cdb0144199807097de5e40..f97e0ce3ed56d1dd79f5dde1e5778547d3f61fa7 100644 --- a/include/obj/BSBound.h +++ b/include/obj/BSBound.h @@ -26,10 +26,10 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; @@ -48,10 +48,10 @@ public: protected: B_S_BOUND_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/BSFurnitureMarker.h b/include/obj/BSFurnitureMarker.h index 0fe48bea350730b4398b1340c22dd98680308311..36d47fc6ca819ee5821367904432c7c5280e188e 100644 --- a/include/obj/BSFurnitureMarker.h +++ b/include/obj/BSFurnitureMarker.h @@ -29,10 +29,10 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; @@ -42,10 +42,10 @@ public: protected: B_S_FURNITURE_MARKER_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/BSKeyframeController.h b/include/obj/BSKeyframeController.h index d87a6681c6db0958a466fe913e9bd160809fa9aa..3b7bf96893de4cf8113907ab68599f111bca3c24 100644 --- a/include/obj/BSKeyframeController.h +++ b/include/obj/BSKeyframeController.h @@ -31,20 +31,20 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; protected: B_S_KEYFRAME_CONTROLLER_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/BSPSysArrayEmitter.h b/include/obj/BSPSysArrayEmitter.h index adb0ffd82f3f02526ce3b50f54b5454dfc5b19d0..364c61a5822b8b71405db0c0475d0e6a145f55d5 100644 --- a/include/obj/BSPSysArrayEmitter.h +++ b/include/obj/BSPSysArrayEmitter.h @@ -25,20 +25,20 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; protected: B_S_P_SYS_ARRAY_EMITTER_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/BSParentVelocityModifier.h b/include/obj/BSParentVelocityModifier.h index ceaf24da12d812de7b3d1397649b4d01922d68b2..a796e5e7e4b7675d531f26a8a6f65f70494ecc63 100644 --- a/include/obj/BSParentVelocityModifier.h +++ b/include/obj/BSParentVelocityModifier.h @@ -25,20 +25,20 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; protected: B_S_PARENT_VELOCITY_MODIFIER_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/BSXFlags.h b/include/obj/BSXFlags.h index af4263c085bd4655f99159f12cd6d620c772af7e..146eb8b23e28ac3e758950cc8237f4efb344d4af 100644 --- a/include/obj/BSXFlags.h +++ b/include/obj/BSXFlags.h @@ -25,26 +25,26 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; /*! * The flags. */ - uint GetFlags() const; - void SetFlags( uint value ); + unsigned int GetFlags() const; + void SetFlags( unsigned int value ); protected: B_S_X_FLAGS_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/FxButton.h b/include/obj/FxButton.h index bed9f189b42269de1763976c36d2764b670ec44f..b1e5327eefabd03d8376ad7e947da37b8e1731d9 100644 --- a/include/obj/FxButton.h +++ b/include/obj/FxButton.h @@ -25,20 +25,20 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; protected: FX_BUTTON_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/FxRadioButton.h b/include/obj/FxRadioButton.h index a81ae8ac3fdc5c6cecde7c7b126d1de116155f5e..2c9e8669ced671148419e82454da5606a0acf1f9 100644 --- a/include/obj/FxRadioButton.h +++ b/include/obj/FxRadioButton.h @@ -31,20 +31,20 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; protected: FX_RADIO_BUTTON_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/FxWidget.h b/include/obj/FxWidget.h index d695edba29f3b719a47351a5144725deafeeea03..a8b5716d69ca4d51f373fb64e2d5da0e3b2f9335 100644 --- a/include/obj/FxWidget.h +++ b/include/obj/FxWidget.h @@ -25,20 +25,20 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; protected: FX_WIDGET_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/NiAVObject.h b/include/obj/NiAVObject.h index 5177e553435acf6655103c84506b992f5a9c2f0a..1c07f2f15f4703a4e0c2eefd7a18da705f5e3dea 100644 --- a/include/obj/NiAVObject.h +++ b/include/obj/NiAVObject.h @@ -35,10 +35,10 @@ private: static const Type TYPE; public: virtual const Type & GetType() const { return TYPE; }; - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; //TODO: What to do with newer files that have a link for a bounding box? Wrap this in a function and translate? @@ -79,8 +79,8 @@ public: vector< Ref<NiProperty> > GetProperties() const; Ref<NiProperty> GetPropertyByType( const Type & compare_to ); - ushort GetFlags() const; - void SetFlags( ushort n ); + unsigned short GetFlags() const; + void SetFlags( unsigned short n ); Matrix33 GetLocalRotation() const; void SetLocalRotation( const Matrix33 & n ); @@ -125,10 +125,10 @@ protected: NiNode * parent; NI_A_V_OBJECT_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/NiAlphaController.h b/include/obj/NiAlphaController.h index 218254883364a5df9413b92f2f85505a041f881f..3d66d2609ad99370666d2f0cecce6d84af612add 100644 --- a/include/obj/NiAlphaController.h +++ b/include/obj/NiAlphaController.h @@ -31,20 +31,20 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; protected: NI_ALPHA_CONTROLLER_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/NiAlphaProperty.h b/include/obj/NiAlphaProperty.h index 5b21c7db097959bfbe93c4d2db6fb278d40731bf..1c0231c9ed74e174b360c0862a0ca8133adf5b55 100644 --- a/include/obj/NiAlphaProperty.h +++ b/include/obj/NiAlphaProperty.h @@ -25,10 +25,10 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; @@ -77,18 +77,18 @@ public: bool GetAlphaSort() const; void SetAlphaSort(bool value); - ushort GetFlags() const; - void SetFlags( ushort n ); + unsigned short GetFlags() const; + void SetFlags( unsigned short n ); byte GetAlphaTestThreshold() const; void SetAlphaTestThreshold( byte n ); protected: NI_ALPHA_PROPERTY_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/NiAmbientLight.h b/include/obj/NiAmbientLight.h index 6b1518bc92e8dad545f67a1e41b8c22c1f4db107..a18057765ac344861d15ca59f0e1c8b05145417d 100644 --- a/include/obj/NiAmbientLight.h +++ b/include/obj/NiAmbientLight.h @@ -26,20 +26,20 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; protected: NI_AMBIENT_LIGHT_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/NiAutoNormalParticles.h b/include/obj/NiAutoNormalParticles.h index d4112f6541161c79efb3a8739e6b458c5d6cafae..dea2f1323ed60f42d0d443e3bd58db1269a0b869 100644 --- a/include/obj/NiAutoNormalParticles.h +++ b/include/obj/NiAutoNormalParticles.h @@ -25,20 +25,20 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; protected: NI_AUTO_NORMAL_PARTICLES_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/NiAutoNormalParticlesData.h b/include/obj/NiAutoNormalParticlesData.h index e837e977910ca19f9cae096fab2b1ad3327ad357..4d90119ea5c37b28f3d03af56618fcee43d523a9 100644 --- a/include/obj/NiAutoNormalParticlesData.h +++ b/include/obj/NiAutoNormalParticlesData.h @@ -27,20 +27,20 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; protected: NI_AUTO_NORMAL_PARTICLES_DATA_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/NiBSAnimationNode.h b/include/obj/NiBSAnimationNode.h index d1055560fb0254d484f51088d6a57fc692d197b3..cdd51f524f21557630477a880d9e11355d9489bf 100644 --- a/include/obj/NiBSAnimationNode.h +++ b/include/obj/NiBSAnimationNode.h @@ -26,20 +26,20 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; protected: NI_B_S_ANIMATION_NODE_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/NiBSBoneLODController.h b/include/obj/NiBSBoneLODController.h index 6918f1d7138ba89e5cb92103e767a01d21086414..5fb0f2fa56bf8b93402f7e0d2b419cddd8510ea8 100644 --- a/include/obj/NiBSBoneLODController.h +++ b/include/obj/NiBSBoneLODController.h @@ -25,20 +25,20 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; protected: NI_B_S_BONE_L_O_D_CONTROLLER_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/NiBSPArrayController.h b/include/obj/NiBSPArrayController.h index 3389bd451d655c33d045c07638dbe4c38bdeda93..2c63e051cfff7945dcd95d277688bed405576ea4 100644 --- a/include/obj/NiBSPArrayController.h +++ b/include/obj/NiBSPArrayController.h @@ -26,20 +26,20 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; protected: NI_B_S_P_ARRAY_CONTROLLER_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/NiBSParticleNode.h b/include/obj/NiBSParticleNode.h index 44af820946a9dec7f36d0a9a69c3b6228cf8438e..c104264a5d6bc868aa6949c1bde6803e1b71e0c0 100644 --- a/include/obj/NiBSParticleNode.h +++ b/include/obj/NiBSParticleNode.h @@ -25,20 +25,20 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; protected: NI_B_S_PARTICLE_NODE_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/NiBSplineBasisData.h b/include/obj/NiBSplineBasisData.h index c5dd93bacd3b08231fdc4b609e0944c36c51174e..665851ede758a7cb48e4992fc89786ce815ff8f7 100644 --- a/include/obj/NiBSplineBasisData.h +++ b/include/obj/NiBSplineBasisData.h @@ -25,26 +25,26 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; /*! * The number of control points (Usually number of frames for animation). */ - uint GetNumControlPt() const; - void SetNumControlPt( uint value ); + unsigned int GetNumControlPt() const; + void SetNumControlPt( unsigned int value ); protected: NI_B_SPLINE_BASIS_DATA_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/NiBSplineCompFloatInterpolator.h b/include/obj/NiBSplineCompFloatInterpolator.h index 35e1e3cc2efac058d25fc0d1a652324b17d5e401..6463b0b8afd43fdf8963cd255cf27cdd29267cf2 100644 --- a/include/obj/NiBSplineCompFloatInterpolator.h +++ b/include/obj/NiBSplineCompFloatInterpolator.h @@ -26,20 +26,20 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; protected: NI_B_SPLINE_COMP_FLOAT_INTERPOLATOR_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/NiBSplineCompPoint3Interpolator.h b/include/obj/NiBSplineCompPoint3Interpolator.h index de369e58858ff35a72592fa8e4d1724390b2b463..d3e46dffd38e66fc3100b0e50d96ec6d2eb0cab9 100644 --- a/include/obj/NiBSplineCompPoint3Interpolator.h +++ b/include/obj/NiBSplineCompPoint3Interpolator.h @@ -28,20 +28,20 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; protected: NI_B_SPLINE_COMP_POINT3_INTERPOLATOR_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/NiBSplineCompTransformInterpolator.h b/include/obj/NiBSplineCompTransformInterpolator.h index 6d7563d65ab76d0debdc3b015a7b18d3544bbc93..d255287ad613e1b2704d93d5d6687c9a551eed59 100644 --- a/include/obj/NiBSplineCompTransformInterpolator.h +++ b/include/obj/NiBSplineCompTransformInterpolator.h @@ -27,10 +27,10 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; @@ -132,10 +132,10 @@ public: protected: NI_B_SPLINE_COMP_TRANSFORM_INTERPOLATOR_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/NiBSplineData.h b/include/obj/NiBSplineData.h index 984b5538e2a34aaad9292880d144c46d7b1b4f41..b6032235320f1618a856fd93941f9d547725c12c 100644 --- a/include/obj/NiBSplineData.h +++ b/include/obj/NiBSplineData.h @@ -25,10 +25,10 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; @@ -45,10 +45,10 @@ public: protected: NI_B_SPLINE_DATA_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/NiBSplineInterpolator.h b/include/obj/NiBSplineInterpolator.h index ea8943574de847c75a8a712acbc21aef43981ec5..9c48b48ae339aa7473bf762aa2c2e0fbbfb13c28 100644 --- a/include/obj/NiBSplineInterpolator.h +++ b/include/obj/NiBSplineInterpolator.h @@ -29,10 +29,10 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; @@ -68,10 +68,10 @@ protected: protected: NI_B_SPLINE_INTERPOLATOR_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/NiBillboardNode.h b/include/obj/NiBillboardNode.h index 9c926eace4b4f805217870033547a0061fecafea..4eecb1f134661776e6c667828c27cab6b661d0f0 100644 --- a/include/obj/NiBillboardNode.h +++ b/include/obj/NiBillboardNode.h @@ -27,10 +27,10 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; @@ -44,10 +44,10 @@ public: protected: NI_BILLBOARD_NODE_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/NiBinaryExtraData.h b/include/obj/NiBinaryExtraData.h index bd964f96c1754fbf25b0a648363635bb2adb408c..3cfa1c3679130b230ee17dd693cd69a33371b02a 100644 --- a/include/obj/NiBinaryExtraData.h +++ b/include/obj/NiBinaryExtraData.h @@ -28,10 +28,10 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; @@ -41,10 +41,10 @@ public: protected: NI_BINARY_EXTRA_DATA_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/NiBlendBoolInterpolator.h b/include/obj/NiBlendBoolInterpolator.h index 97ebb00cd91b120d9e1866f486f2b16b34243be4..b3fb935e14e96b23f3480f2d71835730d09ee7c5 100644 --- a/include/obj/NiBlendBoolInterpolator.h +++ b/include/obj/NiBlendBoolInterpolator.h @@ -26,10 +26,10 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; @@ -42,10 +42,10 @@ public: protected: NI_BLEND_BOOL_INTERPOLATOR_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/NiBlendFloatInterpolator.h b/include/obj/NiBlendFloatInterpolator.h index d97892547f2aa8206434678ba29acdebc92ca4cd..8c777073d4b8b5808f60a0214abfe25ec75e0208 100644 --- a/include/obj/NiBlendFloatInterpolator.h +++ b/include/obj/NiBlendFloatInterpolator.h @@ -26,10 +26,10 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; @@ -42,10 +42,10 @@ public: protected: NI_BLEND_FLOAT_INTERPOLATOR_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/NiBlendInterpolator.h b/include/obj/NiBlendInterpolator.h index c86fe721a170e7c4cea5c0acb826c4c022127268..8a5e1fc89dd7898e95bc3edf864cade8a242432a 100644 --- a/include/obj/NiBlendInterpolator.h +++ b/include/obj/NiBlendInterpolator.h @@ -26,20 +26,20 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; protected: NI_BLEND_INTERPOLATOR_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/NiBlendPoint3Interpolator.h b/include/obj/NiBlendPoint3Interpolator.h index 1609e6497ccf345701e2508215c56c6138eacb8c..e2d9bf9efbe771190ac98b91e8d9966cab49fa8d 100644 --- a/include/obj/NiBlendPoint3Interpolator.h +++ b/include/obj/NiBlendPoint3Interpolator.h @@ -26,10 +26,10 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; @@ -42,10 +42,10 @@ public: protected: NI_BLEND_POINT3_INTERPOLATOR_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/NiBlendTransformInterpolator.h b/include/obj/NiBlendTransformInterpolator.h index d4d66189a350be5c212b1a7f8ab951a236c03611..b4a5ba8432b4efb003a98d8ccf86827eb5ad28ee 100644 --- a/include/obj/NiBlendTransformInterpolator.h +++ b/include/obj/NiBlendTransformInterpolator.h @@ -26,20 +26,20 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; protected: NI_BLEND_TRANSFORM_INTERPOLATOR_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/NiBoneLODController.h b/include/obj/NiBoneLODController.h index ffe1ebd2b9c0e89726eb5acd006668f92790e407..52a104c3c9b585126dc4178996b2565c485f6416 100644 --- a/include/obj/NiBoneLODController.h +++ b/include/obj/NiBoneLODController.h @@ -32,20 +32,20 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; protected: NI_BONE_L_O_D_CONTROLLER_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/NiBoolData.h b/include/obj/NiBoolData.h index 49e4dcb38d0bcac0c4dadc44da8ea0d47529f7e8..1c19f66533fa7053e8681fabd42e96448db89711 100644 --- a/include/obj/NiBoolData.h +++ b/include/obj/NiBoolData.h @@ -27,10 +27,10 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; @@ -61,10 +61,10 @@ public: protected: NI_BOOL_DATA_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/NiBoolInterpolator.h b/include/obj/NiBoolInterpolator.h index cbeb346f70e08498fda8815f0b000005f80bcab6..6b5670b48b86ec4e65f5512193e8ee51609b52f3 100644 --- a/include/obj/NiBoolInterpolator.h +++ b/include/obj/NiBoolInterpolator.h @@ -31,10 +31,10 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; @@ -53,10 +53,10 @@ public: protected: NI_BOOL_INTERPOLATOR_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/NiBoolTimelineInterpolator.h b/include/obj/NiBoolTimelineInterpolator.h index 9f6740ac5fc06fee63c1d2c95b507bce69dabdab..e1e15c0ba48ed09b61cfa9c850be698b25e0b638 100644 --- a/include/obj/NiBoolTimelineInterpolator.h +++ b/include/obj/NiBoolTimelineInterpolator.h @@ -31,10 +31,10 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; @@ -53,10 +53,10 @@ public: protected: NI_BOOL_TIMELINE_INTERPOLATOR_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/NiBooleanExtraData.h b/include/obj/NiBooleanExtraData.h index d24e10edcc8d7c94e867579eb11ddf76b5bdc641..c4f6568af6abef7af644f60bdc58aa0b974a9f6e 100644 --- a/include/obj/NiBooleanExtraData.h +++ b/include/obj/NiBooleanExtraData.h @@ -26,10 +26,10 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; @@ -39,10 +39,10 @@ public: protected: NI_BOOLEAN_EXTRA_DATA_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/NiCamera.h b/include/obj/NiCamera.h index b57915dc165856f49f3b8646f85f0265f69dac85..fb307a5065a4d00bc57173c65a38ac5c7d3fd33e 100644 --- a/include/obj/NiCamera.h +++ b/include/obj/NiCamera.h @@ -31,10 +31,10 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; @@ -114,10 +114,10 @@ public: protected: NI_CAMERA_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/NiClod.h b/include/obj/NiClod.h index 85220f39838e614fe08932311f979a50ef6eb7eb..f07cfcdcf0c706e393f540491b0d7796f830cbff 100644 --- a/include/obj/NiClod.h +++ b/include/obj/NiClod.h @@ -26,20 +26,20 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; protected: NI_CLOD_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/NiClodData.h b/include/obj/NiClodData.h index f5d875b7b0a1e8fcb54080ddb6deddeec7937886..5bf134b4fd5bff6991ebda7a17712ef2d366138b 100644 --- a/include/obj/NiClodData.h +++ b/include/obj/NiClodData.h @@ -26,20 +26,20 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; protected: NI_CLOD_DATA_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/NiClodSkinInstance.h b/include/obj/NiClodSkinInstance.h index a4dfb111e6e768b74e473a4fd4ac914a297c63d9..6128286115af2a2e12f2f4f176f45a4eb3307e06 100644 --- a/include/obj/NiClodSkinInstance.h +++ b/include/obj/NiClodSkinInstance.h @@ -27,20 +27,20 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; protected: NI_CLOD_SKIN_INSTANCE_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/NiCollisionData.h b/include/obj/NiCollisionData.h index 704fbdb7654d7986878306a8a04adb50aa7af4ad..090fc9b7b562279ed692c5312b3d3bc73034f68b 100644 --- a/include/obj/NiCollisionData.h +++ b/include/obj/NiCollisionData.h @@ -28,20 +28,20 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; protected: NI_COLLISION_DATA_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/NiCollisionObject.h b/include/obj/NiCollisionObject.h index f12bc21c8da6163ce4c7635db84ccd2771d9af07..03ef65ee5ae8f8a085e7cc0b5c8541eb30ecb6e6 100644 --- a/include/obj/NiCollisionObject.h +++ b/include/obj/NiCollisionObject.h @@ -32,10 +32,10 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; @@ -54,10 +54,10 @@ public: protected: NI_COLLISION_OBJECT_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/NiColorData.h b/include/obj/NiColorData.h index 27881e600555ef6d11227ff403a1ce9851bd65e8..9956d0dc5cbd407f0dd8b35c2a965b434a9c4601 100644 --- a/include/obj/NiColorData.h +++ b/include/obj/NiColorData.h @@ -27,10 +27,10 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; @@ -60,10 +60,10 @@ public: protected: NI_COLOR_DATA_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/NiColorExtraData.h b/include/obj/NiColorExtraData.h index 8d55df69f2e52239fb49033f236fdbde8d995a01..fb2952735719a686b0b2bc6b327ede073f375fd1 100644 --- a/include/obj/NiColorExtraData.h +++ b/include/obj/NiColorExtraData.h @@ -26,10 +26,10 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; @@ -39,10 +39,10 @@ public: protected: NI_COLOR_EXTRA_DATA_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/NiControllerManager.h b/include/obj/NiControllerManager.h index 374f14a9a08feeed59a73e7de02fa31bdf5df7d0..9b6c341794bb6c93a8cf792a469bd5cef482070c 100644 --- a/include/obj/NiControllerManager.h +++ b/include/obj/NiControllerManager.h @@ -32,10 +32,10 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; @@ -63,10 +63,10 @@ public: protected: NI_CONTROLLER_MANAGER_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/NiControllerSequence.h b/include/obj/NiControllerSequence.h index 4486bb5a2c802db4f2abd0240c1463da733da439..41f6e7654b21daa371ace70b828725bac612a660 100644 --- a/include/obj/NiControllerSequence.h +++ b/include/obj/NiControllerSequence.h @@ -35,10 +35,10 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; @@ -173,10 +173,10 @@ protected: NI_CONTROLLER_SEQUENCE_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/NiDefaultAVObjectPalette.h b/include/obj/NiDefaultAVObjectPalette.h index a49e078a52e463a0c63dac7a39eebfa2fd52d49c..ac4cd4d5153f3bc7fde9d0388f6b42b5871f9ffb 100644 --- a/include/obj/NiDefaultAVObjectPalette.h +++ b/include/obj/NiDefaultAVObjectPalette.h @@ -30,10 +30,10 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; @@ -46,10 +46,10 @@ public: protected: NI_DEFAULT_A_V_OBJECT_PALETTE_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/NiDirectionalLight.h b/include/obj/NiDirectionalLight.h index d05a2f859d394b17b65f15aaba8bfcaf9a1e3bdd..51462abc6c669430da9fa5993bb623a4ad31afca 100644 --- a/include/obj/NiDirectionalLight.h +++ b/include/obj/NiDirectionalLight.h @@ -26,20 +26,20 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; protected: NI_DIRECTIONAL_LIGHT_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/NiDitherProperty.h b/include/obj/NiDitherProperty.h index 2f9e2182c6e705e36bd46b3d9137c52fb3eec603..d9fe60fd0f0e8b7d8c10334601d59c7fab0174fb 100644 --- a/include/obj/NiDitherProperty.h +++ b/include/obj/NiDitherProperty.h @@ -26,23 +26,23 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; - ushort GetFlags() const; - void SetFlags( ushort n ); + unsigned short GetFlags() const; + void SetFlags( unsigned short n ); protected: NI_DITHER_PROPERTY_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/NiDynamicEffect.h b/include/obj/NiDynamicEffect.h index 02e51ded278ec784d7d24da3e9cba1186c077bfe..0f9bbec6a28d0e56878a2964c96fcf0a07b3f7cc 100644 --- a/include/obj/NiDynamicEffect.h +++ b/include/obj/NiDynamicEffect.h @@ -31,10 +31,10 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; @@ -57,15 +57,15 @@ public: * automagically updated by the engine during the load stage. */ vector<unsigned int> GetAffectedNodeListPointers() const; - void SetAffectedNodeListPointers( const vector<uint >& value ); + void SetAffectedNodeListPointers( const vector<unsigned int >& value ); protected: NI_DYNAMIC_EFFECT_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/NiExtraData.h b/include/obj/NiExtraData.h index 8728329488561dff9fdab0c3ae5a00d6ed2a9349..20a6492be91047b21be05bc082c8d030d3ba30df 100644 --- a/include/obj/NiExtraData.h +++ b/include/obj/NiExtraData.h @@ -28,10 +28,10 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; @@ -71,10 +71,10 @@ public: protected: NI_EXTRA_DATA_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/NiFlipController.h b/include/obj/NiFlipController.h index f790a709dad1a0c19bc44f78ec96619c2e6226d2..de80d209fbcd499bfd233f2577ff01f18c5982b8 100644 --- a/include/obj/NiFlipController.h +++ b/include/obj/NiFlipController.h @@ -31,20 +31,20 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; protected: NI_FLIP_CONTROLLER_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/NiFloatData.h b/include/obj/NiFloatData.h index 0939481a8f767c0d22e53964a15e3e3d6b7ba8ba..e1dab02fdc548d5463fce41716ccc4cd24a4ba35 100644 --- a/include/obj/NiFloatData.h +++ b/include/obj/NiFloatData.h @@ -27,10 +27,10 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; @@ -61,10 +61,10 @@ public: protected: NI_FLOAT_DATA_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/NiFloatExtraData.h b/include/obj/NiFloatExtraData.h index d8d7069af91d37b31e10e90bbe72007ed4e6ff9a..916fa7b544d32bc7c901b5010ceb1acc2f1b2bb6 100644 --- a/include/obj/NiFloatExtraData.h +++ b/include/obj/NiFloatExtraData.h @@ -26,10 +26,10 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; @@ -39,10 +39,10 @@ public: protected: NI_FLOAT_EXTRA_DATA_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/NiFloatExtraDataController.h b/include/obj/NiFloatExtraDataController.h index 6cae7ed8056c24bb9ed49768caf43c3675c6fbc7..47d3d8661b1b97eef4797215f81ea6309cfd5d52 100644 --- a/include/obj/NiFloatExtraDataController.h +++ b/include/obj/NiFloatExtraDataController.h @@ -31,10 +31,10 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; @@ -42,10 +42,10 @@ public: protected: NI_FLOAT_EXTRA_DATA_CONTROLLER_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/NiFloatInterpolator.h b/include/obj/NiFloatInterpolator.h index d7f845ed007c299c8f09ec8beb8b52bfca291b3d..f2556aeb80cdd1990932a4174bcb0fa754c847f1 100644 --- a/include/obj/NiFloatInterpolator.h +++ b/include/obj/NiFloatInterpolator.h @@ -31,10 +31,10 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; @@ -53,10 +53,10 @@ public: protected: NI_FLOAT_INTERPOLATOR_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/NiFloatsExtraData.h b/include/obj/NiFloatsExtraData.h index 2ce7f9c650f9bc7208ccc1f9c5d2f6fc3304c33f..06804047f9eff537e297f8d947efc65f0e84fda9 100644 --- a/include/obj/NiFloatsExtraData.h +++ b/include/obj/NiFloatsExtraData.h @@ -26,10 +26,10 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; @@ -39,10 +39,10 @@ public: protected: NI_FLOATS_EXTRA_DATA_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/NiFogProperty.h b/include/obj/NiFogProperty.h index 1cec51191db2a31753f5ea32ff68dc5274033d10..cc0519315881062e7c572e95c92e6eeea0ff490c 100644 --- a/include/obj/NiFogProperty.h +++ b/include/obj/NiFogProperty.h @@ -26,15 +26,15 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; - ushort GetFlags() const; - void SetFlags( ushort n ); + unsigned short GetFlags() const; + void SetFlags( unsigned short n ); float GetFogDepth() const; void SetFogDepth(float value); @@ -45,10 +45,10 @@ public: protected: NI_FOG_PROPERTY_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/NiGeomMorpherController.h b/include/obj/NiGeomMorpherController.h index 8348327b61f2a0e4566820130f55d5f11ab6caeb..6fabb805519ae498716cb1fdf93fa6820ab8f87e 100644 --- a/include/obj/NiGeomMorpherController.h +++ b/include/obj/NiGeomMorpherController.h @@ -32,10 +32,10 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; @@ -48,10 +48,10 @@ public: protected: NI_GEOM_MORPHER_CONTROLLER_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/NiGeometry.h b/include/obj/NiGeometry.h index 605193ef1f4e66ff748e62400aedb22276d06d22..918b8b786e043c67ac66928b9d79fe03ca52ed45 100644 --- a/include/obj/NiGeometry.h +++ b/include/obj/NiGeometry.h @@ -37,10 +37,10 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; @@ -58,7 +58,7 @@ public: * The version on this class calculates the center and radius of * each set of affected vertices automatically. */ - void SetBoneWeights( uint bone_index, const vector<SkinWeight> & n ); + void SetBoneWeights( unsigned int bone_index, const vector<SkinWeight> & n ); Ref<NiSkinInstance> GetSkinInstance() const; @@ -104,10 +104,10 @@ protected: list< Ref<NiNode> > ListAncestors( const Ref<NiNode> & leaf ) const; NI_GEOMETRY_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/NiGeometryData.h b/include/obj/NiGeometryData.h index 57e00fca2e0c391078eb4b25231f22c324287fcd..3c9cd9fe74cb5db107f213430fac765e30b28896 100644 --- a/include/obj/NiGeometryData.h +++ b/include/obj/NiGeometryData.h @@ -35,10 +35,10 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; @@ -137,10 +137,10 @@ public: protected: NI_GEOMETRY_DATA_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/NiGravity.h b/include/obj/NiGravity.h index 127f101eafd701bfabd5e26af34772177d8254f6..722daf5786519c2f07fe67c6ec6267c4c9555921 100644 --- a/include/obj/NiGravity.h +++ b/include/obj/NiGravity.h @@ -26,19 +26,19 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; protected: NI_GRAVITY_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/NiImage.h b/include/obj/NiImage.h index a969db3d9c8dfeac462bd1f30f9fdb68111bfc9b..e2f5997b538f1462d42d928b7606f2e1327bc299 100644 --- a/include/obj/NiImage.h +++ b/include/obj/NiImage.h @@ -26,20 +26,20 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; protected: NI_IMAGE_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/NiIntegerExtraData.h b/include/obj/NiIntegerExtraData.h index 446e88c21b7b9c0adda6e3ec77fda26de75aa8e0..c81eedde8b53a0c61ec7c750150b507ee231fcd8 100644 --- a/include/obj/NiIntegerExtraData.h +++ b/include/obj/NiIntegerExtraData.h @@ -26,23 +26,23 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; - uint GetData() const; - void SetData( uint n ); + unsigned int GetData() const; + void SetData( unsigned int n ); protected: NI_INTEGER_EXTRA_DATA_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/NiIntegersExtraData.h b/include/obj/NiIntegersExtraData.h index 0c17ce50e57ec3ffbd15bc6eda1cd815a546732e..c382ba3316db69203bb8033202e8b6c1c3604810 100644 --- a/include/obj/NiIntegersExtraData.h +++ b/include/obj/NiIntegersExtraData.h @@ -25,10 +25,10 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; @@ -36,15 +36,15 @@ public: * Integers. */ vector<unsigned int> GetData() const; - void SetData( const vector<uint >& value ); + void SetData( const vector<unsigned int >& value ); protected: NI_INTEGERS_EXTRA_DATA_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/NiInterpolator.h b/include/obj/NiInterpolator.h index 7c95bd1e7c5ecf76e355c73667a2925c5d7e68d9..3ec6674de24173bac642a78ce847bc21196c1acb 100644 --- a/include/obj/NiInterpolator.h +++ b/include/obj/NiInterpolator.h @@ -26,20 +26,20 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; protected: NI_INTERPOLATOR_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/NiKeyframeController.h b/include/obj/NiKeyframeController.h index 7024ddf727db39d93c776cb365c6ec3fc688fc9f..944664cd644207bfa2a7e59f5972788c2f4ae365 100644 --- a/include/obj/NiKeyframeController.h +++ b/include/obj/NiKeyframeController.h @@ -32,10 +32,10 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; @@ -45,10 +45,10 @@ public: protected: NI_KEYFRAME_CONTROLLER_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/NiKeyframeData.h b/include/obj/NiKeyframeData.h index 836b1c05e00b003717004c1a71f1652feadaa7fb..67d6ec89ecbb54cc3d98561e15995d232135d4ca 100644 --- a/include/obj/NiKeyframeData.h +++ b/include/obj/NiKeyframeData.h @@ -27,10 +27,10 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; @@ -188,10 +188,10 @@ protected: void UpdateRotationKeyCount(); NI_KEYFRAME_DATA_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/NiLODData.h b/include/obj/NiLODData.h index 0b18e2cdd08967e9d4aa3cecd70be4d9a2c9ae4d..5b30080f138175160ac316a7ef7a60e7dfc74710 100644 --- a/include/obj/NiLODData.h +++ b/include/obj/NiLODData.h @@ -26,20 +26,20 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; protected: NI_L_O_D_DATA_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/NiLODNode.h b/include/obj/NiLODNode.h index ecd3d3f41918de9ab912f6ffd4452967f2e5332b..10ba3fd60e6bf00a6db43243c2c4f55666cce714 100644 --- a/include/obj/NiLODNode.h +++ b/include/obj/NiLODNode.h @@ -34,10 +34,10 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; @@ -74,10 +74,10 @@ public: protected: NI_L_O_D_NODE_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/NiLight.h b/include/obj/NiLight.h index 7a56a991c73179f26e95be149ef06465b20f0530..205124e492bc357a1663495e5c96d680705f994b 100644 --- a/include/obj/NiLight.h +++ b/include/obj/NiLight.h @@ -26,10 +26,10 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; @@ -60,10 +60,10 @@ public: protected: NI_LIGHT_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/NiLightColorController.h b/include/obj/NiLightColorController.h index d8f30b9b459cdcea0a11da92e325955c63eff02f..1589bce2977f80f62957e8306c76da60349e0343 100644 --- a/include/obj/NiLightColorController.h +++ b/include/obj/NiLightColorController.h @@ -32,10 +32,10 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; @@ -54,10 +54,10 @@ public: protected: NI_LIGHT_COLOR_CONTROLLER_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/NiLightDimmerController.h b/include/obj/NiLightDimmerController.h index b125e99d50faf42565de088fb0de233c6a2a4eef..ecef0396f0a85aec0832c8e7fde147fcd5d3928d 100644 --- a/include/obj/NiLightDimmerController.h +++ b/include/obj/NiLightDimmerController.h @@ -31,20 +31,20 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; protected: NI_LIGHT_DIMMER_CONTROLLER_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/NiLookAtController.h b/include/obj/NiLookAtController.h index 184c4e04d261876854f1da50e2a1f57529f3d6a2..91abc1246d5a6e117d697b9f2246b8a073855f7d 100644 --- a/include/obj/NiLookAtController.h +++ b/include/obj/NiLookAtController.h @@ -32,20 +32,20 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; protected: NI_LOOK_AT_CONTROLLER_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/NiLookAtInterpolator.h b/include/obj/NiLookAtInterpolator.h index d3bd99db16b8b81f9c58f2cff45f8ff6adecbb56..4a6f52b762a2c52c20a8df70d95b617e73ec0678 100644 --- a/include/obj/NiLookAtInterpolator.h +++ b/include/obj/NiLookAtInterpolator.h @@ -33,10 +33,10 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; @@ -67,10 +67,10 @@ public: protected: NI_LOOK_AT_INTERPOLATOR_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/NiMaterialColorController.h b/include/obj/NiMaterialColorController.h index 51ed5568944f50f347e46a358314a44d6f9c3918..931be3c864878a1b4c627a46319a3b50be84a7ba 100644 --- a/include/obj/NiMaterialColorController.h +++ b/include/obj/NiMaterialColorController.h @@ -31,20 +31,20 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; protected: NI_MATERIAL_COLOR_CONTROLLER_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/NiMaterialProperty.h b/include/obj/NiMaterialProperty.h index 8ea38aad15cd3356b4ac2b53dd62acc58563b2bb..8d964b0f46b81bd173b8ad53302537ef8df895db 100644 --- a/include/obj/NiMaterialProperty.h +++ b/include/obj/NiMaterialProperty.h @@ -26,15 +26,15 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; - ushort GetFlags() const; - void SetFlags( ushort n ); + unsigned short GetFlags() const; + void SetFlags( unsigned short n ); float GetTransparency() const; void SetTransparency( float n ); @@ -58,10 +58,10 @@ public: protected: NI_MATERIAL_PROPERTY_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/NiMeshPSysData.h b/include/obj/NiMeshPSysData.h index f8dbf64e359892018764f6c8b6b5d4b98bfa2489..b25dd18192f33177cc398b6c0fe4d54c7cab2760 100644 --- a/include/obj/NiMeshPSysData.h +++ b/include/obj/NiMeshPSysData.h @@ -32,20 +32,20 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; protected: NI_MESH_P_SYS_DATA_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/NiMeshParticleSystem.h b/include/obj/NiMeshParticleSystem.h index 8be3adf3ac5dff8880e21608483cc93ddfed9718..cfa360149616c9a2c37da3e993d7963b506409e0 100644 --- a/include/obj/NiMeshParticleSystem.h +++ b/include/obj/NiMeshParticleSystem.h @@ -25,20 +25,20 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; protected: NI_MESH_PARTICLE_SYSTEM_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/NiMorphData.h b/include/obj/NiMorphData.h index 899b9cc443507af858cdee554776a21badb69bd7..5ab22fa57ff039bf5a1e3f20bdc18fcd0f6f4920 100644 --- a/include/obj/NiMorphData.h +++ b/include/obj/NiMorphData.h @@ -27,10 +27,10 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; @@ -102,10 +102,10 @@ public: protected: NI_MORPH_DATA_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/NiMultiTargetTransformController.h b/include/obj/NiMultiTargetTransformController.h index 04a4c7cb8ecbf7e5684bed1f2a08c89efd91479a..b548c415a30183a4fdb6870d42fa7f128189aadb 100644 --- a/include/obj/NiMultiTargetTransformController.h +++ b/include/obj/NiMultiTargetTransformController.h @@ -29,10 +29,10 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; @@ -45,10 +45,10 @@ public: protected: NI_MULTI_TARGET_TRANSFORM_CONTROLLER_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/NiNode.h b/include/obj/NiNode.h index dcecf31427cb93a5eedb396534f30aded7f3f238..900bb1a12034082895513ed5a985f244da7d6907 100644 --- a/include/obj/NiNode.h +++ b/include/obj/NiNode.h @@ -34,10 +34,10 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; @@ -106,10 +106,10 @@ protected: list<NiSkinInstance*> skins; NI_NODE_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/NiObject.h b/include/obj/NiObject.h index b612bd8d0902b2d53a2cdde24ed3175855343bf1..d0cca61b302ff65873e5588464690dea0a6a7105 100644 --- a/include/obj/NiObject.h +++ b/include/obj/NiObject.h @@ -63,9 +63,9 @@ public: NIFLIB_API bool IsDerivedType( const NiObject * objct ) const; //Streaming Functions - NIFLIB_HIDDEN virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) {} - NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const {} - NIFLIB_HIDDEN virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) {} + NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) {} + NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const {} + NIFLIB_HIDDEN virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) {} //Reference Counting NIFLIB_API void AddRef() const; //Should not be called directly @@ -145,10 +145,10 @@ private: list<NiObject*> _cross_refs; static unsigned int objectsInMemory; private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/NiObjectNET.h b/include/obj/NiObjectNET.h index 853b20356863032fe586a8058a14e92b36d5cae9..69752c18399b99158209d8c92a893aa9a455113e 100644 --- a/include/obj/NiObjectNET.h +++ b/include/obj/NiObjectNET.h @@ -33,10 +33,10 @@ private: static const Type TYPE; public: virtual const Type & GetType() const { return TYPE; }; - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; string GetName(); @@ -49,7 +49,7 @@ public: void AddExtraData( NiExtraData * obj, unsigned version = VER_10_0_1_0 ); void RemoveExtraData( NiExtraData * obj ); - void ShiftExtraData( uint version = VER_10_0_1_0 ); + void ShiftExtraData( unsigned int version = VER_10_0_1_0 ); void ClearExtraData(); list< Ref<NiExtraData> > GetExtraData() const; @@ -62,10 +62,10 @@ public: private: NI_OBJECT_N_E_T_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/NiPSysAgeDeathModifier.h b/include/obj/NiPSysAgeDeathModifier.h index 3a120e7b70a604f9a59e017552e099df83d4e008..ef7b1b63aae04fb83b9540cf2813443113d20f5b 100644 --- a/include/obj/NiPSysAgeDeathModifier.h +++ b/include/obj/NiPSysAgeDeathModifier.h @@ -31,20 +31,20 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; protected: NI_P_SYS_AGE_DEATH_MODIFIER_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/NiPSysBombModifier.h b/include/obj/NiPSysBombModifier.h index dcf79940357650f2bfe97d1c8b2692bdf2855242..b389dfef6b65820ab4761a3a569b0d1ec1ae5fc9 100644 --- a/include/obj/NiPSysBombModifier.h +++ b/include/obj/NiPSysBombModifier.h @@ -28,20 +28,20 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; protected: NI_P_SYS_BOMB_MODIFIER_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/NiPSysBoundUpdateModifier.h b/include/obj/NiPSysBoundUpdateModifier.h index 269f5f9f107404bf360dcc7c99584c51af683d06..c246ac45956d1283a91fdb941146acadb0da32b3 100644 --- a/include/obj/NiPSysBoundUpdateModifier.h +++ b/include/obj/NiPSysBoundUpdateModifier.h @@ -26,20 +26,20 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; protected: NI_P_SYS_BOUND_UPDATE_MODIFIER_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/NiPSysBoxEmitter.h b/include/obj/NiPSysBoxEmitter.h index 5a116f59137f6e28047faad38a4681de13a5d3e4..95ed39f73637d4cd908dae197cf3cfbb9c17aa66 100644 --- a/include/obj/NiPSysBoxEmitter.h +++ b/include/obj/NiPSysBoxEmitter.h @@ -26,20 +26,20 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; protected: NI_P_SYS_BOX_EMITTER_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/NiPSysColliderManager.h b/include/obj/NiPSysColliderManager.h index ff5ec67651f59e7606a35e4012c83b6859ae92da..5222716d833d75d6b1ded4c290fe8047e750de1a 100644 --- a/include/obj/NiPSysColliderManager.h +++ b/include/obj/NiPSysColliderManager.h @@ -31,20 +31,20 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; protected: NI_P_SYS_COLLIDER_MANAGER_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/NiPSysColorModifier.h b/include/obj/NiPSysColorModifier.h index 59ab82be5401d98b469da22590f8a5447590cc13..10ef1003088ef446c73259d6061e0baee07b853f 100644 --- a/include/obj/NiPSysColorModifier.h +++ b/include/obj/NiPSysColorModifier.h @@ -31,20 +31,20 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; protected: NI_P_SYS_COLOR_MODIFIER_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/NiPSysCylinderEmitter.h b/include/obj/NiPSysCylinderEmitter.h index ec7da42643d130f4487047c8693d270fb074612f..4d64741ccf6354695c711bb328d9409e115d39d6 100644 --- a/include/obj/NiPSysCylinderEmitter.h +++ b/include/obj/NiPSysCylinderEmitter.h @@ -26,20 +26,20 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; protected: NI_P_SYS_CYLINDER_EMITTER_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/NiPSysData.h b/include/obj/NiPSysData.h index 76d4c205644a0899e5715d16cd0164348e5cc154..5f343cacb0c49d510964e3d30895a3375099e73f 100644 --- a/include/obj/NiPSysData.h +++ b/include/obj/NiPSysData.h @@ -25,20 +25,20 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; protected: NI_P_SYS_DATA_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/NiPSysDragModifier.h b/include/obj/NiPSysDragModifier.h index ee14ff43941a7d9020fc4fc6d7afe63f6e55ed8c..fbb6bd6d04e90d0a317220b926d5e116bbb2b679 100644 --- a/include/obj/NiPSysDragModifier.h +++ b/include/obj/NiPSysDragModifier.h @@ -28,20 +28,20 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; protected: NI_P_SYS_DRAG_MODIFIER_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/NiPSysEmitter.h b/include/obj/NiPSysEmitter.h index 6d57d65c301074b9c476bcea041e780937787cf6..ceff085cb384c0699c92f9ede24f1df3dbccbe92 100644 --- a/include/obj/NiPSysEmitter.h +++ b/include/obj/NiPSysEmitter.h @@ -26,20 +26,20 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; protected: NI_P_SYS_EMITTER_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/NiPSysEmitterCtlr.h b/include/obj/NiPSysEmitterCtlr.h index 5fc35a91a7c76120c7cf839b6d0a7ef1e15f9170..61f59f69d0cca6f0c443c5146e6c8003ed16c5f1 100644 --- a/include/obj/NiPSysEmitterCtlr.h +++ b/include/obj/NiPSysEmitterCtlr.h @@ -32,10 +32,10 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; @@ -54,10 +54,10 @@ public: protected: NI_P_SYS_EMITTER_CTLR_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/NiPSysEmitterCtlrData.h b/include/obj/NiPSysEmitterCtlrData.h index 47605acda5934c5e661c29aa15ad0b96d4460a37..5f8540bb3188be5ec2176a1314b54439acf378c4 100644 --- a/include/obj/NiPSysEmitterCtlrData.h +++ b/include/obj/NiPSysEmitterCtlrData.h @@ -29,10 +29,10 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; @@ -51,10 +51,10 @@ public: protected: NI_P_SYS_EMITTER_CTLR_DATA_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/NiPSysEmitterDeclinationCtlr.h b/include/obj/NiPSysEmitterDeclinationCtlr.h index dfb647206e49182a1c3850d04b0f23c514a40295..62253759f1e7786ade12feeb1deb878534f295cb 100644 --- a/include/obj/NiPSysEmitterDeclinationCtlr.h +++ b/include/obj/NiPSysEmitterDeclinationCtlr.h @@ -26,20 +26,20 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; protected: NI_P_SYS_EMITTER_DECLINATION_CTLR_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/NiPSysEmitterDeclinationVarCtlr.h b/include/obj/NiPSysEmitterDeclinationVarCtlr.h index af0e61c453450ed5e03c3a74c86fd13ce51e0943..e0d7f522f4b2580e0b036431d51f3cab263e8767 100644 --- a/include/obj/NiPSysEmitterDeclinationVarCtlr.h +++ b/include/obj/NiPSysEmitterDeclinationVarCtlr.h @@ -26,20 +26,20 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; protected: NI_P_SYS_EMITTER_DECLINATION_VAR_CTLR_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/NiPSysEmitterInitialRadiusCtlr.h b/include/obj/NiPSysEmitterInitialRadiusCtlr.h index 492e381c9c5be95a7e0e496f6a53593d823192c1..c23b40036b6414efef2f03e6e6470a630f0c306c 100644 --- a/include/obj/NiPSysEmitterInitialRadiusCtlr.h +++ b/include/obj/NiPSysEmitterInitialRadiusCtlr.h @@ -26,20 +26,20 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; protected: NI_P_SYS_EMITTER_INITIAL_RADIUS_CTLR_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/NiPSysEmitterLifeSpanCtlr.h b/include/obj/NiPSysEmitterLifeSpanCtlr.h index af3250940831bd7f2b318edf8592332b8ab7828c..bab1c9f5dee46eacdbc28b2368aa5ad8f80b9cdb 100644 --- a/include/obj/NiPSysEmitterLifeSpanCtlr.h +++ b/include/obj/NiPSysEmitterLifeSpanCtlr.h @@ -29,20 +29,20 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; protected: NI_P_SYS_EMITTER_LIFE_SPAN_CTLR_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/NiPSysEmitterSpeedCtlr.h b/include/obj/NiPSysEmitterSpeedCtlr.h index ce55e947915ce46d1931f48fb05a7702ec7dabea..94632327a7885577fb18a7afed4fcfc9517e620b 100644 --- a/include/obj/NiPSysEmitterSpeedCtlr.h +++ b/include/obj/NiPSysEmitterSpeedCtlr.h @@ -28,20 +28,20 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; protected: NI_P_SYS_EMITTER_SPEED_CTLR_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/NiPSysGravityModifier.h b/include/obj/NiPSysGravityModifier.h index 9ac523c65bb46e65131546653b0fa78c38f2b08a..ea14dfabef78ee827419e5e8b432767e46cae83b 100644 --- a/include/obj/NiPSysGravityModifier.h +++ b/include/obj/NiPSysGravityModifier.h @@ -28,20 +28,20 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; protected: NI_P_SYS_GRAVITY_MODIFIER_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/NiPSysGravityStrengthCtlr.h b/include/obj/NiPSysGravityStrengthCtlr.h index 59dda036bb9f7dc94e9963ab9e351249d9aa1087..db523090950bf3c4f8f3b2937e2b15fc6744839f 100644 --- a/include/obj/NiPSysGravityStrengthCtlr.h +++ b/include/obj/NiPSysGravityStrengthCtlr.h @@ -28,20 +28,20 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; protected: NI_P_SYS_GRAVITY_STRENGTH_CTLR_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/NiPSysGrowFadeModifier.h b/include/obj/NiPSysGrowFadeModifier.h index 0cdf9dedc357acee892bf893b8052aee37d5c1ec..66b9f0c5b0baa99b388d18f95ed537e061bba26d 100644 --- a/include/obj/NiPSysGrowFadeModifier.h +++ b/include/obj/NiPSysGrowFadeModifier.h @@ -26,20 +26,20 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; protected: NI_P_SYS_GROW_FADE_MODIFIER_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/NiPSysMeshEmitter.h b/include/obj/NiPSysMeshEmitter.h index e1dbc4c4fd5337d560f609b05486d7cf1ec9bdbf..3592bc3957b6f256af595626eeb0905b3db80975 100644 --- a/include/obj/NiPSysMeshEmitter.h +++ b/include/obj/NiPSysMeshEmitter.h @@ -31,20 +31,20 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; protected: NI_P_SYS_MESH_EMITTER_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/NiPSysMeshUpdateModifier.h b/include/obj/NiPSysMeshUpdateModifier.h index 9969cc827355fb68ef4caa0c01732cf849b76702..78186cb95a00ee1ddd5686afe4e141e4402f1d37 100644 --- a/include/obj/NiPSysMeshUpdateModifier.h +++ b/include/obj/NiPSysMeshUpdateModifier.h @@ -31,20 +31,20 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; protected: NI_P_SYS_MESH_UPDATE_MODIFIER_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/NiPSysModifier.h b/include/obj/NiPSysModifier.h index 57f1af61f0498f4da2d55c2eb475107ba91dbbb7..b86208d6b08a7a1d4a6ef544d0aef98e2c7ef7fa 100644 --- a/include/obj/NiPSysModifier.h +++ b/include/obj/NiPSysModifier.h @@ -28,20 +28,20 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; protected: NI_P_SYS_MODIFIER_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/NiPSysModifierActiveCtlr.h b/include/obj/NiPSysModifierActiveCtlr.h index d1269bc6607003851904e1f8325abb1c360fd7f5..9af19e6b1da390ad84e72bf76f48ab2756ab8111 100644 --- a/include/obj/NiPSysModifierActiveCtlr.h +++ b/include/obj/NiPSysModifierActiveCtlr.h @@ -26,20 +26,20 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; protected: NI_P_SYS_MODIFIER_ACTIVE_CTLR_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/NiPSysPlanarCollider.h b/include/obj/NiPSysPlanarCollider.h index d61e9f3e0d95ab43dd234580386e9cacc779729f..11cf9e33be669c34588c9db2c1c348d0365570b3 100644 --- a/include/obj/NiPSysPlanarCollider.h +++ b/include/obj/NiPSysPlanarCollider.h @@ -33,20 +33,20 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; protected: NI_P_SYS_PLANAR_COLLIDER_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/NiPSysPositionModifier.h b/include/obj/NiPSysPositionModifier.h index cb4b052351cbade3893e22f5921a553b4a515cd3..78bdddf119b57b87dc911d5a2d13f1f9a9e88c60 100644 --- a/include/obj/NiPSysPositionModifier.h +++ b/include/obj/NiPSysPositionModifier.h @@ -25,20 +25,20 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; protected: NI_P_SYS_POSITION_MODIFIER_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/NiPSysResetOnLoopCtlr.h b/include/obj/NiPSysResetOnLoopCtlr.h index 0adb27299799c895e28d434166a3b974a59b11d9..64e7bfe8c8352d399552cf5dd42fcf0906bf8de0 100644 --- a/include/obj/NiPSysResetOnLoopCtlr.h +++ b/include/obj/NiPSysResetOnLoopCtlr.h @@ -26,20 +26,20 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; protected: NI_P_SYS_RESET_ON_LOOP_CTLR_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/NiPSysRotationModifier.h b/include/obj/NiPSysRotationModifier.h index c5325d83ad4435d4aaa063cae174e9cb64156bd2..889091b23efd10a89b38b2bbc7282f2b1a6b3ea3 100644 --- a/include/obj/NiPSysRotationModifier.h +++ b/include/obj/NiPSysRotationModifier.h @@ -26,20 +26,20 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; protected: NI_P_SYS_ROTATION_MODIFIER_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/NiPSysSpawnModifier.h b/include/obj/NiPSysSpawnModifier.h index 853b734c6c73a31f225c90da47d20da425a899f6..39f54b0203b6ed463a94573152a62c81ac07f402 100644 --- a/include/obj/NiPSysSpawnModifier.h +++ b/include/obj/NiPSysSpawnModifier.h @@ -26,20 +26,20 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; protected: NI_P_SYS_SPAWN_MODIFIER_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/NiPSysSphereEmitter.h b/include/obj/NiPSysSphereEmitter.h index 19636ae01af80eaf10319e96e12d85f7e1b120a7..b75b491f3ac729db5ae58c9d9ad1a5cabaaef494 100644 --- a/include/obj/NiPSysSphereEmitter.h +++ b/include/obj/NiPSysSphereEmitter.h @@ -26,20 +26,20 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; protected: NI_P_SYS_SPHERE_EMITTER_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/NiPSysUpdateCtlr.h b/include/obj/NiPSysUpdateCtlr.h index 877b5dfbb46ba0673fcc960f6bd3f2c99e987af2..8d0cd53a8f4ee52a4e509d2b75ec61b60c988436 100644 --- a/include/obj/NiPSysUpdateCtlr.h +++ b/include/obj/NiPSysUpdateCtlr.h @@ -26,20 +26,20 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; protected: NI_P_SYS_UPDATE_CTLR_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/NiPSysVolumeEmitter.h b/include/obj/NiPSysVolumeEmitter.h index f5bdc86505c30a38e632f0bed1f2022440d9f81e..df78ac4c2b2c7db47fca9af5e389b36f58b29feb 100644 --- a/include/obj/NiPSysVolumeEmitter.h +++ b/include/obj/NiPSysVolumeEmitter.h @@ -28,20 +28,20 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; protected: NI_P_SYS_VOLUME_EMITTER_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/NiPalette.h b/include/obj/NiPalette.h index 8eb8d84c9c5a623e55a432a66ea68785441befcd..c02001d3c648fee1032c0c58d2681bedd5e94628 100644 --- a/include/obj/NiPalette.h +++ b/include/obj/NiPalette.h @@ -25,10 +25,10 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; @@ -46,10 +46,10 @@ public: protected: NI_PALETTE_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/NiParticleBomb.h b/include/obj/NiParticleBomb.h index 591e5602462925cd3cec5827648c4b7402a0c4b2..eb08111d0bff306dc3309bd42613ef32c95473c7 100644 --- a/include/obj/NiParticleBomb.h +++ b/include/obj/NiParticleBomb.h @@ -25,20 +25,20 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; protected: NI_PARTICLE_BOMB_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/NiParticleColorModifier.h b/include/obj/NiParticleColorModifier.h index beb793fc28b51f7ba17294bf402aca46bef03e15..453357776ac1044ed2ac4ead8af4079d15221b6c 100644 --- a/include/obj/NiParticleColorModifier.h +++ b/include/obj/NiParticleColorModifier.h @@ -31,20 +31,20 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; protected: NI_PARTICLE_COLOR_MODIFIER_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/NiParticleGrowFade.h b/include/obj/NiParticleGrowFade.h index b46cc093e3f0f6cbc0129c3e7bf155245c7eb839..9375d141e22c179227086a9db59262613a4d963a 100644 --- a/include/obj/NiParticleGrowFade.h +++ b/include/obj/NiParticleGrowFade.h @@ -29,20 +29,20 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; protected: NI_PARTICLE_GROW_FADE_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/NiParticleMeshModifier.h b/include/obj/NiParticleMeshModifier.h index 9eebfd09548201accb677a0d616b8370b356f247..cba567ba51c3864ec9c0c8f24b3c3652c6c3c18b 100644 --- a/include/obj/NiParticleMeshModifier.h +++ b/include/obj/NiParticleMeshModifier.h @@ -31,20 +31,20 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; protected: NI_PARTICLE_MESH_MODIFIER_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/NiParticleMeshes.h b/include/obj/NiParticleMeshes.h index 1d357b720ac71adf281959cca36e2909783ef266..64a2e33262d8712281c8a860140fb6318cfa2ff4 100644 --- a/include/obj/NiParticleMeshes.h +++ b/include/obj/NiParticleMeshes.h @@ -25,20 +25,20 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; protected: NI_PARTICLE_MESHES_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/NiParticleMeshesData.h b/include/obj/NiParticleMeshesData.h index dca151580fe58e8028272eef5b5df2d34eb61ee4..a81d865c9d57da16807ce685a467f362119438d7 100644 --- a/include/obj/NiParticleMeshesData.h +++ b/include/obj/NiParticleMeshesData.h @@ -31,20 +31,20 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; protected: NI_PARTICLE_MESHES_DATA_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/NiParticleRotation.h b/include/obj/NiParticleRotation.h index 9b0d0bd28ad8a9ce77e8ec68c171d298fbc5a058..798cc6314c90ec24837d3b104e7599cb748946b6 100644 --- a/include/obj/NiParticleRotation.h +++ b/include/obj/NiParticleRotation.h @@ -25,20 +25,20 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; protected: NI_PARTICLE_ROTATION_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/NiParticleSystem.h b/include/obj/NiParticleSystem.h index 3e33183a353e18e9896cbbce4f9fe66dc8c6c4c1..ed826225fd745d6a5de9c681ad7dec25a36ee9e9 100644 --- a/include/obj/NiParticleSystem.h +++ b/include/obj/NiParticleSystem.h @@ -31,20 +31,20 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; protected: NI_PARTICLE_SYSTEM_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/NiParticleSystemController.h b/include/obj/NiParticleSystemController.h index 90a4709a05b08774f37097baf64f4e162f61eee6..2e0e3f04c829d4861b55f544af55b902c97cd103 100644 --- a/include/obj/NiParticleSystemController.h +++ b/include/obj/NiParticleSystemController.h @@ -34,20 +34,20 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; //TODO: This controller is not a priority and it has a lot of unknown data. protected: NI_PARTICLE_SYSTEM_CONTROLLER_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/NiParticles.h b/include/obj/NiParticles.h index 9f21aff2f7562084277b22eb3f6760b1e923d9ab..327930792a3d5eefde1c74c8296ab0983646b4d8 100644 --- a/include/obj/NiParticles.h +++ b/include/obj/NiParticles.h @@ -25,20 +25,20 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; protected: NI_PARTICLES_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/NiParticlesData.h b/include/obj/NiParticlesData.h index 27061c32b6151ccaadcc6901e9f8cac08ff822ac..e76cd4b31906e7d6e01c64f16777510147d2095e 100644 --- a/include/obj/NiParticlesData.h +++ b/include/obj/NiParticlesData.h @@ -26,20 +26,20 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; protected: NI_PARTICLES_DATA_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/NiPathController.h b/include/obj/NiPathController.h index fcfcba923fab18d42dce7d14f88f471c07f06660..7194edf84601030bc032192786e35309d616ff93 100644 --- a/include/obj/NiPathController.h +++ b/include/obj/NiPathController.h @@ -32,10 +32,10 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; @@ -48,10 +48,10 @@ public: protected: NI_PATH_CONTROLLER_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/NiPathInterpolator.h b/include/obj/NiPathInterpolator.h index a2dff6d3930233c1e6b1a6296a0ab5fc3ee50442..5c5d78eabfb543ab8916b8261c5a3b75f274f6ef 100644 --- a/include/obj/NiPathInterpolator.h +++ b/include/obj/NiPathInterpolator.h @@ -32,10 +32,10 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; @@ -54,10 +54,10 @@ public: protected: NI_PATH_INTERPOLATOR_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/NiPixelData.h b/include/obj/NiPixelData.h index 7ed662332495b6ff7aa898a2dab92806de61940e..7b3c04ba0df94f060aca9ecb552be35c3d737dfe 100644 --- a/include/obj/NiPixelData.h +++ b/include/obj/NiPixelData.h @@ -32,10 +32,10 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; @@ -81,10 +81,10 @@ public: protected: NI_PIXEL_DATA_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/NiPlanarCollider.h b/include/obj/NiPlanarCollider.h index 4af83cc91820db6b4f03da425638e079262d5bbd..8f2ad956324c39c7e9b9f3cc0d3455e24ea72d57 100644 --- a/include/obj/NiPlanarCollider.h +++ b/include/obj/NiPlanarCollider.h @@ -25,20 +25,20 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; protected: NI_PLANAR_COLLIDER_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/NiPoint3Interpolator.h b/include/obj/NiPoint3Interpolator.h index bcbab41f7b96c44ec4c7cac180ec76e2f14bfe23..9595f1b132e103fb27f603ad56202b7bea7b4e9d 100644 --- a/include/obj/NiPoint3Interpolator.h +++ b/include/obj/NiPoint3Interpolator.h @@ -31,10 +31,10 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; @@ -53,10 +53,10 @@ public: protected: NI_POINT3_INTERPOLATOR_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/NiPointLight.h b/include/obj/NiPointLight.h index 42d5bda1a415fc7f015e3bea9530bdebf73a524a..53c28d6313a106ab6b4010e2f356a0c929dd3da4 100644 --- a/include/obj/NiPointLight.h +++ b/include/obj/NiPointLight.h @@ -26,10 +26,10 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; @@ -54,10 +54,10 @@ public: protected: NI_POINT_LIGHT_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/NiPosData.h b/include/obj/NiPosData.h index 915bdc94d8b3f15f8be417849bcb23147c8d14d0..58c196663f4b43a6c1bc5af171d00f382ce943e9 100644 --- a/include/obj/NiPosData.h +++ b/include/obj/NiPosData.h @@ -27,10 +27,10 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; @@ -61,10 +61,10 @@ public: protected: NI_POS_DATA_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/NiProperty.h b/include/obj/NiProperty.h index 4e3ac79fa322671a64276c857fa33f94e6caea3f..632c0d0f0d085534df27fed07a17d7b8d1a28b8c 100644 --- a/include/obj/NiProperty.h +++ b/include/obj/NiProperty.h @@ -25,20 +25,20 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; protected: NI_PROPERTY_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/NiRangeLODData.h b/include/obj/NiRangeLODData.h index f53be13ed9d24760e30b5e121c65be3ad7665a9b..392e8987736d9ec46164fdcd3349c5421c123ba6 100644 --- a/include/obj/NiRangeLODData.h +++ b/include/obj/NiRangeLODData.h @@ -30,10 +30,10 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; @@ -60,10 +60,10 @@ public: protected: NI_RANGE_L_O_D_DATA_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/NiRotatingParticles.h b/include/obj/NiRotatingParticles.h index f3020372249b0ac89fb8c44923bede5ef69d04d3..26ab9f2edb9b57d88e10ee7aab9602389e3b4ef1 100644 --- a/include/obj/NiRotatingParticles.h +++ b/include/obj/NiRotatingParticles.h @@ -25,20 +25,20 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; protected: NI_ROTATING_PARTICLES_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/NiRotatingParticlesData.h b/include/obj/NiRotatingParticlesData.h index f7cefe77cdbcdfc106d90e840114ac143cb8ba8e..db46c8347af164574c51416f83df1d5171b9f8f9 100644 --- a/include/obj/NiRotatingParticlesData.h +++ b/include/obj/NiRotatingParticlesData.h @@ -25,20 +25,20 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; protected: NI_ROTATING_PARTICLES_DATA_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/NiScreenLODData.h b/include/obj/NiScreenLODData.h index 8a246cc48528bb2d7e8e5b58a0e1ab9551991ae4..c90be43fffe292e6a2f65d12d8b8dd1a7da1460b 100644 --- a/include/obj/NiScreenLODData.h +++ b/include/obj/NiScreenLODData.h @@ -26,10 +26,10 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; @@ -86,10 +86,10 @@ public: protected: NI_SCREEN_L_O_D_DATA_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/NiSequenceStreamHelper.h b/include/obj/NiSequenceStreamHelper.h index de08327a6258fa3c7af49645c2c35247d0245800..d6de288d2bf10a775ae3f5cde0a086fc095b3842 100644 --- a/include/obj/NiSequenceStreamHelper.h +++ b/include/obj/NiSequenceStreamHelper.h @@ -25,20 +25,20 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; protected: NI_SEQUENCE_STREAM_HELPER_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/NiShadeProperty.h b/include/obj/NiShadeProperty.h index c736dbaa1eca2088c8a8ca958fb82d95ff3e7168..e22ad523e111933ce0cf39c8952b24780ae053e6 100644 --- a/include/obj/NiShadeProperty.h +++ b/include/obj/NiShadeProperty.h @@ -27,23 +27,23 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; - ushort GetFlags() const; - void SetFlags( ushort n ); + unsigned short GetFlags() const; + void SetFlags( unsigned short n ); protected: NI_SHADE_PROPERTY_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/NiSingleInterpolatorController.h b/include/obj/NiSingleInterpolatorController.h index d8b3a15fdfafc13f3039ec65dbcaebf159319f59..755efec7dce05db53662eee035fb2b86ed309281 100644 --- a/include/obj/NiSingleInterpolatorController.h +++ b/include/obj/NiSingleInterpolatorController.h @@ -32,10 +32,10 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; @@ -48,10 +48,10 @@ public: protected: NI_SINGLE_INTERPOLATOR_CONTROLLER_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/NiSkinData.h b/include/obj/NiSkinData.h index 69411876e2bec142cef31145b24aae3575f44fb8..55e40071637a3f9caa9d5c8c9784c42d4d88567f 100644 --- a/include/obj/NiSkinData.h +++ b/include/obj/NiSkinData.h @@ -40,20 +40,20 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; void ResetOffsets( const Ref<NiGeometry> & owner ); Matrix44 GetOverallTransform() const; void SetOverallTransform( const Matrix44 & transform ); - uint GetBoneCount() const; - Matrix44 GetBoneTransform( uint bone_index ) const; - vector<SkinWeight> GetBoneWeights( uint bone_index ) const; - void SetBoneWeights( uint bone_index, const vector<SkinWeight> & n, Vector3 center, float radius ); + unsigned int GetBoneCount() const; + Matrix44 GetBoneTransform( unsigned int bone_index ) const; + vector<SkinWeight> GetBoneWeights( unsigned int bone_index ) const; + void SetBoneWeights( unsigned int bone_index, const vector<SkinWeight> & n, Vector3 center, float radius ); void NormalizeWeights( unsigned numVertices ); @@ -63,10 +63,10 @@ public: protected: NI_SKIN_DATA_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/NiSkinInstance.h b/include/obj/NiSkinInstance.h index 75b254d6a9ad46f4e793cc1b4c6856d76df12781..cd3bea22a6a36ea56ce6fa1dc374c6268e0f6deb 100644 --- a/include/obj/NiSkinInstance.h +++ b/include/obj/NiSkinInstance.h @@ -40,14 +40,14 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; - uint GetBoneCount() const; + unsigned int GetBoneCount() const; vector< Ref<NiNode> > GetBones() const; Ref<NiNode> GetSkeletonRoot() const; @@ -66,10 +66,10 @@ public: protected: NI_SKIN_INSTANCE_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/NiSourceTexture.h b/include/obj/NiSourceTexture.h index 836fa48dadd90acdd5a293bcbb17e3141068a440..b2b6bb9f88cc73c47e53c76122ef092628922b60 100644 --- a/include/obj/NiSourceTexture.h +++ b/include/obj/NiSourceTexture.h @@ -32,10 +32,10 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; @@ -70,10 +70,10 @@ public: protected: NI_SOURCE_TEXTURE_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/NiSpecularProperty.h b/include/obj/NiSpecularProperty.h index eb33058ff6701a855645f203f4ea8d8568e38083..347b286436726f7ea9834a26679c150303cf1245 100644 --- a/include/obj/NiSpecularProperty.h +++ b/include/obj/NiSpecularProperty.h @@ -26,23 +26,23 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; - ushort GetFlags() const; - void SetFlags( ushort n ); + unsigned short GetFlags() const; + void SetFlags( unsigned short n ); protected: NI_SPECULAR_PROPERTY_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/NiSphericalCollider.h b/include/obj/NiSphericalCollider.h index b73d2c5131f75599b814a6d9893269ea14c9c36d..39badb3dbf155ce186b2cd8d5b02133f9215896d 100644 --- a/include/obj/NiSphericalCollider.h +++ b/include/obj/NiSphericalCollider.h @@ -25,20 +25,20 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; protected: NI_SPHERICAL_COLLIDER_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/NiSpotLight.h b/include/obj/NiSpotLight.h index a2c0a72323dec5cc82747df10407ee2e3872779a..1e82898c1cc7f0c1457812aedf4606851ea66786 100644 --- a/include/obj/NiSpotLight.h +++ b/include/obj/NiSpotLight.h @@ -26,10 +26,10 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; @@ -48,10 +48,10 @@ public: protected: NI_SPOT_LIGHT_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/NiStencilProperty.h b/include/obj/NiStencilProperty.h index a6e326b526c7156f776038360ce5c0b7164bd948..0e0c078e98c0e817c4d90fe12a6a34bd6f5b4d35 100644 --- a/include/obj/NiStencilProperty.h +++ b/include/obj/NiStencilProperty.h @@ -26,18 +26,18 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; /*! * Property flags. */ - ushort GetFlags() const; - void SetFlags(ushort value); + unsigned short GetFlags() const; + void SetFlags(unsigned short value); /*! * Enables or disables the stencil test. @@ -54,14 +54,14 @@ public: /*! * Unknown. Default is 0. */ - uint GetStencilRef() const; - void SetStencilRef(uint value); + unsigned int GetStencilRef() const; + void SetStencilRef(unsigned int value); /*! * A bit mask. The default is 0xffffffff. */ - uint GetStencilMask() const; - void SetStencilMask(uint value); + unsigned int GetStencilMask() const; + void SetStencilMask(unsigned int value); /*! * Unknown. @@ -90,10 +90,10 @@ public: protected: NI_STENCIL_PROPERTY_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/NiStringExtraData.h b/include/obj/NiStringExtraData.h index 1465f4f4fd4209cf65852b5cb848ec5588b4ee69..7afe31096b5e4c41bb08b7b078c4b6f4dcbbdffd 100644 --- a/include/obj/NiStringExtraData.h +++ b/include/obj/NiStringExtraData.h @@ -28,10 +28,10 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; @@ -41,10 +41,10 @@ public: protected: NI_STRING_EXTRA_DATA_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/NiStringPalette.h b/include/obj/NiStringPalette.h index e134c520fd284bcca0975a2317373c782ce00412..78f622ac9b4bc4ae4c260f16e89429e869f7130a 100644 --- a/include/obj/NiStringPalette.h +++ b/include/obj/NiStringPalette.h @@ -31,10 +31,10 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; @@ -46,10 +46,10 @@ public: protected: NI_STRING_PALETTE_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/NiStringsExtraData.h b/include/obj/NiStringsExtraData.h index 9f4b84813269fa98b082340e82cc497c24e5c7ec..d2a0b11189f2bbe8d0c455eec5dd8148839682fa 100644 --- a/include/obj/NiStringsExtraData.h +++ b/include/obj/NiStringsExtraData.h @@ -27,10 +27,10 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; @@ -40,10 +40,10 @@ public: protected: NI_STRINGS_EXTRA_DATA_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/NiTextKeyExtraData.h b/include/obj/NiTextKeyExtraData.h index 8616cf914d03a251bf3cab94e1686ffb16314665..4968be1b7cb159af6dd7c79666c8c69b35e95ae8 100644 --- a/include/obj/NiTextKeyExtraData.h +++ b/include/obj/NiTextKeyExtraData.h @@ -26,10 +26,10 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; const Type & GetType() const; @@ -50,10 +50,10 @@ public: protected: NI_TEXT_KEY_EXTRA_DATA_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/NiTextureEffect.h b/include/obj/NiTextureEffect.h index cfd813e12bb0d8e461d4b9c42e29774410028231..6f7369b63c8338f847c1c29c239bb2601fde724b 100644 --- a/include/obj/NiTextureEffect.h +++ b/include/obj/NiTextureEffect.h @@ -34,10 +34,10 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; @@ -72,15 +72,15 @@ public: * 0: PROJECTED_LIGHT 1: PROJECTED_SHADOW 2: ENVIRONMENT_MAP (Usual * value) 3: FOG_MAP */ - uint GetTextureType() const; - void SetTextureType( uint value ); + unsigned int GetTextureType() const; + void SetTextureType( unsigned int value ); /*! * 0: WORLD_PARALLEL 1: WORLD_PERSPECTIVE 2: SPHERE_MAP (Usual value) 3: * SPECULAR_CUBE_MAP 4: DIFFUSE_CUBE_MAP */ - uint GetCoordinateGenerationType() const; - void SetCoordinateGenerationType( uint value ); + unsigned int GetCoordinateGenerationType() const; + void SetCoordinateGenerationType( unsigned int value ); /*! * Source texture index. @@ -97,22 +97,22 @@ public: /*! * 0? */ - ushort GetPs2L() const; - void SetPs2L( ushort value ); + unsigned short GetPs2L() const; + void SetPs2L( unsigned short value ); /*! * 0xFFB5? */ - ushort GetPs2K() const; - void SetPs2K( ushort value ); + unsigned short GetPs2K() const; + void SetPs2K( unsigned short value ); protected: NI_TEXTURE_EFFECT_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/NiTextureModeProperty.h b/include/obj/NiTextureModeProperty.h index 64523d09b331dc2233165a9d552b8cac1c7dea5d..df65aa4fb20b6295e61024ec0a2c31e45137d1be 100644 --- a/include/obj/NiTextureModeProperty.h +++ b/include/obj/NiTextureModeProperty.h @@ -26,20 +26,20 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; protected: NI_TEXTURE_MODE_PROPERTY_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/NiTextureProperty.h b/include/obj/NiTextureProperty.h index 140bb88eeb39b55d9db85e76894e628ef24169ff..298b8e7f7e57fb33db7fb63909e543e0d4925860 100644 --- a/include/obj/NiTextureProperty.h +++ b/include/obj/NiTextureProperty.h @@ -31,20 +31,20 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; protected: NI_TEXTURE_PROPERTY_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/NiTextureTransformController.h b/include/obj/NiTextureTransformController.h index de4fd70db2831098341d920b7bfa477bec395901..47b2c348167791866079f88e214e1dc48d103163 100644 --- a/include/obj/NiTextureTransformController.h +++ b/include/obj/NiTextureTransformController.h @@ -31,20 +31,20 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; protected: NI_TEXTURE_TRANSFORM_CONTROLLER_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/NiTexturingProperty.h b/include/obj/NiTexturingProperty.h index ca500d9468003d1345594c352ff4ea0a48f52e3e..26ac0143e22525ef90a1f01e832c10c89119620f 100644 --- a/include/obj/NiTexturingProperty.h +++ b/include/obj/NiTexturingProperty.h @@ -28,10 +28,10 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; @@ -147,10 +147,10 @@ public: protected: NI_TEXTURING_PROPERTY_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/NiTimeController.h b/include/obj/NiTimeController.h index f603b26de552de0f38e59cd8e85647e458a1d5a8..8fd8c87c156bcc6f4e5347b23cef5106d1e8b09b 100644 --- a/include/obj/NiTimeController.h +++ b/include/obj/NiTimeController.h @@ -30,10 +30,10 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; @@ -63,8 +63,8 @@ public: */ Ref<NiObjectNET> GetTarget(); - ushort GetFlags() const; - void SetFlags( ushort n ); + unsigned short GetFlags() const; + void SetFlags( unsigned short n ); float GetFrequency() const; void SetFrequency( float n ); @@ -80,10 +80,10 @@ public: protected: NI_TIME_CONTROLLER_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/NiTransformController.h b/include/obj/NiTransformController.h index 9d34616bd733fc65d1be200a79a8aeab3867cdfc..808b19c640481a83f042384e505486f88cb2662f 100644 --- a/include/obj/NiTransformController.h +++ b/include/obj/NiTransformController.h @@ -26,20 +26,20 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; protected: NI_TRANSFORM_CONTROLLER_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/NiTransformData.h b/include/obj/NiTransformData.h index d1956611958b5b1469e63f18ae0d401216330254..d4e38158bd432863bb594c9a542e18b8159e88a8 100644 --- a/include/obj/NiTransformData.h +++ b/include/obj/NiTransformData.h @@ -25,20 +25,20 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; protected: NI_TRANSFORM_DATA_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/NiTransformInterpolator.h b/include/obj/NiTransformInterpolator.h index 9e928c610d8cc56a13fb61c765e46f0a45b406ac..e8f00e64257d1195116a10e2054392077196ffaf 100644 --- a/include/obj/NiTransformInterpolator.h +++ b/include/obj/NiTransformInterpolator.h @@ -31,10 +31,10 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; @@ -65,10 +65,10 @@ public: protected: NI_TRANSFORM_INTERPOLATOR_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/NiTriBasedGeom.h b/include/obj/NiTriBasedGeom.h index 9657818fd6ca3104b6c9b7b64fd2e67fc272c374..3f8ca4734ca79836d5cc68b9c51b99c0dafbb8e4 100644 --- a/include/obj/NiTriBasedGeom.h +++ b/include/obj/NiTriBasedGeom.h @@ -30,10 +30,10 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; @@ -48,10 +48,10 @@ public: protected: NI_TRI_BASED_GEOM_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/NiTriBasedGeomData.h b/include/obj/NiTriBasedGeomData.h index 25ab2cbd0a233cd04c26cc91b3a76feb003c3e1b..40e564d3dedb801795cb5f7e7defa4a26c305b7a 100644 --- a/include/obj/NiTriBasedGeomData.h +++ b/include/obj/NiTriBasedGeomData.h @@ -31,10 +31,10 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; @@ -55,10 +55,10 @@ public: protected: NI_TRI_BASED_GEOM_DATA_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/NiTriShape.h b/include/obj/NiTriShape.h index e71313c98d9787df811af3fd8f121a33167cd171..6d4535362fc637ec8c97819af55da3d8bfbcd759 100644 --- a/include/obj/NiTriShape.h +++ b/include/obj/NiTriShape.h @@ -25,20 +25,20 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; protected: NI_TRI_SHAPE_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/NiTriShapeData.h b/include/obj/NiTriShapeData.h index 010cdd97efa83152a91624fc96d0616474cc58f6..88c8ca4e1e955b0bea104670b829c5dcc9ecc4ac 100644 --- a/include/obj/NiTriShapeData.h +++ b/include/obj/NiTriShapeData.h @@ -27,10 +27,10 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; public: @@ -78,10 +78,10 @@ public: protected: NI_TRI_SHAPE_DATA_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/NiTriStrips.h b/include/obj/NiTriStrips.h index ed5ec4bc5e3a35a23c34e6af278e9805da6df2e4..d5326b59b2b136c733a8fe8e7023776aaccaa87b 100644 --- a/include/obj/NiTriStrips.h +++ b/include/obj/NiTriStrips.h @@ -26,20 +26,20 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; protected: NI_TRI_STRIPS_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/NiUVController.h b/include/obj/NiUVController.h index 310ec376a9b6988106fb9598c2394b4bae2b3300..5e025906e61176f3868f39661765c3cd94f09328 100644 --- a/include/obj/NiUVController.h +++ b/include/obj/NiUVController.h @@ -31,10 +31,10 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; @@ -45,10 +45,10 @@ public: protected: NI_U_V_CONTROLLER_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/NiUVData.h b/include/obj/NiUVData.h index 4db310c27d69f60217b889dcc70254bb7c6dace4..165c7fd29a7387fbe2b114d64cbd204ce0954ef6 100644 --- a/include/obj/NiUVData.h +++ b/include/obj/NiUVData.h @@ -28,20 +28,20 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; protected: NI_U_V_DATA_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/NiVectorExtraData.h b/include/obj/NiVectorExtraData.h index 63895e353bb99d867851aec95811dd69200818ff..a9f13d21d216544b8cd1e5506bcea270f1d46d8b 100644 --- a/include/obj/NiVectorExtraData.h +++ b/include/obj/NiVectorExtraData.h @@ -26,10 +26,10 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; @@ -40,10 +40,10 @@ public: protected: NI_VECTOR_EXTRA_DATA_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/NiVertWeightsExtraData.h b/include/obj/NiVertWeightsExtraData.h index 4124aebd69112e3b7eae55884e4c78a64d56f044..ac2ef7952ab4017df09521e20c5ca6fa2097dcf3 100644 --- a/include/obj/NiVertWeightsExtraData.h +++ b/include/obj/NiVertWeightsExtraData.h @@ -27,10 +27,10 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; @@ -40,10 +40,10 @@ public: protected: NI_VERT_WEIGHTS_EXTRA_DATA_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/NiVertexColorProperty.h b/include/obj/NiVertexColorProperty.h index dc3e7a1af516d44e770cc56171343ea43f55ae95..8584cda323a074031792933dba137f45c520b589 100644 --- a/include/obj/NiVertexColorProperty.h +++ b/include/obj/NiVertexColorProperty.h @@ -29,15 +29,15 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; - ushort GetFlags() const; - void SetFlags(ushort value); + unsigned short GetFlags() const; + void SetFlags(unsigned short value); VertMode GetVertexMode() const; void SetVertexMode(VertMode value); @@ -48,10 +48,10 @@ public: protected: NI_VERTEX_COLOR_PROPERTY_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/NiVisController.h b/include/obj/NiVisController.h index a39674fd79644fd13fa835a82106f0c1758be4cd..4637a1e673060fa42701391cd49c92d0effbdd8c 100644 --- a/include/obj/NiVisController.h +++ b/include/obj/NiVisController.h @@ -31,20 +31,20 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; protected: NI_VIS_CONTROLLER_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/NiVisData.h b/include/obj/NiVisData.h index 3b49349dbf17f704e69a3454d581df06a92d14ea..eb22b0b4fdc97d6c501e436cda8aac6cc6c27d46 100644 --- a/include/obj/NiVisData.h +++ b/include/obj/NiVisData.h @@ -26,20 +26,20 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; protected: NI_VIS_DATA_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/NiWireframeProperty.h b/include/obj/NiWireframeProperty.h index a61587d83f4e1b54a8be01c5c5990408cab66bd2..0e42c3c01fc5441266b70016ee114a4ef38e9cf8 100644 --- a/include/obj/NiWireframeProperty.h +++ b/include/obj/NiWireframeProperty.h @@ -26,23 +26,23 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; - ushort GetFlags() const; - void SetFlags( ushort n ); + unsigned short GetFlags() const; + void SetFlags( unsigned short n ); protected: NI_WIREFRAME_PROPERTY_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/NiZBufferProperty.h b/include/obj/NiZBufferProperty.h index b0984fbf9678108653d77dcdfdb7785438ed7c38..f5be723fc84e38fa5af2f932b93031be24762168 100644 --- a/include/obj/NiZBufferProperty.h +++ b/include/obj/NiZBufferProperty.h @@ -27,15 +27,15 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; - ushort GetFlags() const; - void SetFlags(ushort value); + unsigned short GetFlags() const; + void SetFlags(unsigned short value); CompareMode GetFunction() const; void SetFunction(CompareMode value); @@ -43,10 +43,10 @@ public: protected: NI_Z_BUFFER_PROPERTY_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/RootCollisionNode.h b/include/obj/RootCollisionNode.h index 39968e13a98ee94f05ec16c59e71bd0798f537d5..d1c10e1fab20a92df3a9dfdac4be44b4e798b681 100644 --- a/include/obj/RootCollisionNode.h +++ b/include/obj/RootCollisionNode.h @@ -25,20 +25,20 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; protected: ROOT_COLLISION_NODE_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/bhkBlendCollisionObject.h b/include/obj/bhkBlendCollisionObject.h index 245773fa95e3936b89cdbdab603cd4379f001b7a..be640be0faa1231789c32bb45f907650b02c78fe 100644 --- a/include/obj/bhkBlendCollisionObject.h +++ b/include/obj/bhkBlendCollisionObject.h @@ -25,20 +25,20 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; protected: BHK_BLEND_COLLISION_OBJECT_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/bhkBlendController.h b/include/obj/bhkBlendController.h index da58a88f873f94d3581768728c1363d523303b32..aae9f0353f9dde9fe894ddd1d662d31080a81f08 100644 --- a/include/obj/bhkBlendController.h +++ b/include/obj/bhkBlendController.h @@ -26,20 +26,20 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; protected: BHK_BLEND_CONTROLLER_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/bhkBoxShape.h b/include/obj/bhkBoxShape.h index 6ebad4a9d65843c549132576c9cd7262826e509d..dc8794bc12df08c54a83a9daf61869697c8e7d29 100644 --- a/include/obj/bhkBoxShape.h +++ b/include/obj/bhkBoxShape.h @@ -26,10 +26,10 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; @@ -42,10 +42,10 @@ public: protected: BHK_BOX_SHAPE_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/bhkCapsuleShape.h b/include/obj/bhkCapsuleShape.h index 30ba33474c7f47979a0700ebb07b0f266b0be7b0..19f22ebf75b3de63a3f9a52170bad20121a7ca48 100644 --- a/include/obj/bhkCapsuleShape.h +++ b/include/obj/bhkCapsuleShape.h @@ -26,10 +26,10 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; @@ -66,10 +66,10 @@ public: protected: BHK_CAPSULE_SHAPE_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/bhkCollisionObject.h b/include/obj/bhkCollisionObject.h index 1e07e7ce87d2b61c2e499641ad9093ea87ab35e2..177809ae1d3e124ce666bc117277f2db2d71035b 100644 --- a/include/obj/bhkCollisionObject.h +++ b/include/obj/bhkCollisionObject.h @@ -25,20 +25,20 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; protected: BHK_COLLISION_OBJECT_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/bhkConvexShape.h b/include/obj/bhkConvexShape.h index 27d2c4406aa26096ecfe538862f084c1d970d8d8..77d330827c900071024fd5635cd1cfef019bd31d 100644 --- a/include/obj/bhkConvexShape.h +++ b/include/obj/bhkConvexShape.h @@ -25,20 +25,20 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; protected: BHK_CONVEX_SHAPE_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/bhkConvexTransformShape.h b/include/obj/bhkConvexTransformShape.h index 82e6f191d05330740055bc322fefe1d77c06ffd3..25bd38695b6aa1a980f023135eb780c51ce44e37 100644 --- a/include/obj/bhkConvexTransformShape.h +++ b/include/obj/bhkConvexTransformShape.h @@ -25,20 +25,20 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; protected: BHK_CONVEX_TRANSFORM_SHAPE_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/bhkConvexVerticesShape.h b/include/obj/bhkConvexVerticesShape.h index dffc8da728bf4e1d34b6fea77e9cb58ce1470c86..0d7d31f2ca09cd0b66057e9e3bbf3eedf151bb82 100644 --- a/include/obj/bhkConvexVerticesShape.h +++ b/include/obj/bhkConvexVerticesShape.h @@ -25,20 +25,20 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; protected: BHK_CONVEX_VERTICES_SHAPE_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/bhkEntity.h b/include/obj/bhkEntity.h index 8b68e8834800cd296f9cbb678e558f691f4f39f9..a04c6181dd05f08a6a443ed6946ea0da1b947c2a 100644 --- a/include/obj/bhkEntity.h +++ b/include/obj/bhkEntity.h @@ -31,10 +31,10 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; @@ -111,10 +111,10 @@ public: protected: BHK_ENTITY_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/bhkHingeConstraint.h b/include/obj/bhkHingeConstraint.h index b7f362f843912d763cd67f7c8fde11f18e39a4f5..2f2a0474e37a04dc8be67a6d7cb228809b2d1b90 100644 --- a/include/obj/bhkHingeConstraint.h +++ b/include/obj/bhkHingeConstraint.h @@ -25,20 +25,20 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; protected: BHK_HINGE_CONSTRAINT_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/bhkLimitedHingeConstraint.h b/include/obj/bhkLimitedHingeConstraint.h index 656d1ca4c734162eb03c1531094acea47d7f3757..b35c7f2ccb3a85b2b1f4709f9fe1534faa7c7f1e 100644 --- a/include/obj/bhkLimitedHingeConstraint.h +++ b/include/obj/bhkLimitedHingeConstraint.h @@ -29,20 +29,20 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; protected: BHK_LIMITED_HINGE_CONSTRAINT_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/bhkListShape.h b/include/obj/bhkListShape.h index 26d8776408fa41d24553ff3138f5b09c7c36bb12..1d1eafd290e9587ed8d5ace72b459008ee895232 100644 --- a/include/obj/bhkListShape.h +++ b/include/obj/bhkListShape.h @@ -31,20 +31,20 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; protected: BHK_LIST_SHAPE_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/bhkMalleableConstraint.h b/include/obj/bhkMalleableConstraint.h index fe9e293f229f3e6fb937b0e61e7c36863613f8c8..d82b8051bf18e74c94c2e906678c209265d96d56 100644 --- a/include/obj/bhkMalleableConstraint.h +++ b/include/obj/bhkMalleableConstraint.h @@ -33,20 +33,20 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; protected: BHK_MALLEABLE_CONSTRAINT_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/bhkMoppBvTreeShape.h b/include/obj/bhkMoppBvTreeShape.h index 091e339b3f39e69e02b978415894060273b309a2..c5a41f3feb999f614ee5bc2c161737cfd9cee73f 100644 --- a/include/obj/bhkMoppBvTreeShape.h +++ b/include/obj/bhkMoppBvTreeShape.h @@ -32,20 +32,20 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; protected: BHK_MOPP_BV_TREE_SHAPE_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/bhkMultiSphereShape.h b/include/obj/bhkMultiSphereShape.h index fa22f01cf5133a95aa7ea14d737cd1a94460eb68..7d0ce5127cb2d9bc0f38f960a2afdd451b34fdf5 100644 --- a/include/obj/bhkMultiSphereShape.h +++ b/include/obj/bhkMultiSphereShape.h @@ -28,10 +28,10 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; @@ -44,10 +44,10 @@ public: protected: BHK_MULTI_SPHERE_SHAPE_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/bhkNiTriStripsShape.h b/include/obj/bhkNiTriStripsShape.h index 0dfb6928770e0edc1938b74bcf7e43644d0046fd..d7a5a555347f758012281220fb19f47c3ff52f3e 100644 --- a/include/obj/bhkNiTriStripsShape.h +++ b/include/obj/bhkNiTriStripsShape.h @@ -32,10 +32,10 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; @@ -51,10 +51,10 @@ public: protected: BHK_NI_TRI_STRIPS_SHAPE_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/bhkPackedNiTriStripsShape.h b/include/obj/bhkPackedNiTriStripsShape.h index 3f831906be55e47c75c8e3090e79ffae57cf9596..d56c53818abcda544b27d1b9970e46bff5894218 100644 --- a/include/obj/bhkPackedNiTriStripsShape.h +++ b/include/obj/bhkPackedNiTriStripsShape.h @@ -32,20 +32,20 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; protected: BHK_PACKED_NI_TRI_STRIPS_SHAPE_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/bhkPrismaticConstraint.h b/include/obj/bhkPrismaticConstraint.h index e51ca6fc2a42892b68439a2a2b0f0e5a7cafca12..a930700e8c6d356d463dc54156af1fe3cbbb5981 100644 --- a/include/obj/bhkPrismaticConstraint.h +++ b/include/obj/bhkPrismaticConstraint.h @@ -25,20 +25,20 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; protected: BHK_PRISMATIC_CONSTRAINT_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/bhkRagdollConstraint.h b/include/obj/bhkRagdollConstraint.h index d3b5d8625c3dfad9e162d5e1999fcee93edc9aa0..bb4bdb00b348ef35232a1a5eec73f97c2a7a361c 100644 --- a/include/obj/bhkRagdollConstraint.h +++ b/include/obj/bhkRagdollConstraint.h @@ -25,20 +25,20 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; protected: BHK_RAGDOLL_CONSTRAINT_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/bhkRefObject.h b/include/obj/bhkRefObject.h index 256596c14548a70634ce64e62249cf352771f851..d7d45b0494a0aa0c3f4e16f400c0313923bf4bb8 100644 --- a/include/obj/bhkRefObject.h +++ b/include/obj/bhkRefObject.h @@ -25,20 +25,20 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; protected: BHK_REF_OBJECT_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/bhkRigidBody.h b/include/obj/bhkRigidBody.h index c3d51be7f63483d7bb04ec953e643ccee553a190..960bc8899756970830c2c7d6af9b66c6f4e4af4f 100644 --- a/include/obj/bhkRigidBody.h +++ b/include/obj/bhkRigidBody.h @@ -32,10 +32,10 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; @@ -162,10 +162,10 @@ public: protected: BHK_RIGID_BODY_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/bhkRigidBodyT.h b/include/obj/bhkRigidBodyT.h index 6f798c74971de62f34e118a9faa1444572d86ad1..1bd7f95e1ac277867b20d0d1a18aee499fb4bbd8 100644 --- a/include/obj/bhkRigidBodyT.h +++ b/include/obj/bhkRigidBodyT.h @@ -25,20 +25,20 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; protected: BHK_RIGID_BODY_T_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/bhkSPCollisionObject.h b/include/obj/bhkSPCollisionObject.h index e35a3dbeecdc65f56ba0c0d8b9f697df9e0d9b13..e217028b9e01cc5abc6158e4ec4a3b5a74652a78 100644 --- a/include/obj/bhkSPCollisionObject.h +++ b/include/obj/bhkSPCollisionObject.h @@ -25,20 +25,20 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; protected: BHK_S_P_COLLISION_OBJECT_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/bhkSerializable.h b/include/obj/bhkSerializable.h index 8ea11c7c6e49161186fffbc9b9e38afa24c38270..dbe67e1c42345c899cf25f295fb470262ad640fd 100644 --- a/include/obj/bhkSerializable.h +++ b/include/obj/bhkSerializable.h @@ -26,20 +26,20 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; protected: BHK_SERIALIZABLE_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/bhkShape.h b/include/obj/bhkShape.h index f86aaebfaffdb021ef13f434d324dff807e07d1a..de3f36559d2b39167ecdd354f29f52e4f63941cb 100644 --- a/include/obj/bhkShape.h +++ b/include/obj/bhkShape.h @@ -25,20 +25,20 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; protected: BHK_SHAPE_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/bhkSimpleShapePhantom.h b/include/obj/bhkSimpleShapePhantom.h index fd7a9598e42f19e47324e66ae05e8da84a1f1330..3e9bcc2ecf33899372ca51c1f3d6a231a3524ae2 100644 --- a/include/obj/bhkSimpleShapePhantom.h +++ b/include/obj/bhkSimpleShapePhantom.h @@ -25,20 +25,20 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; protected: BHK_SIMPLE_SHAPE_PHANTOM_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/bhkSphereRepShape.h b/include/obj/bhkSphereRepShape.h index bbb18e4fa569b0b171337bcb4b97c7608a4c94a7..bb571898b752c3d908f0bb3af2ac11d3ffffceca 100644 --- a/include/obj/bhkSphereRepShape.h +++ b/include/obj/bhkSphereRepShape.h @@ -27,10 +27,10 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; @@ -43,10 +43,10 @@ public: protected: BHK_SPHERE_REP_SHAPE_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/bhkSphereShape.h b/include/obj/bhkSphereShape.h index 7ea014e591ed379415576f48297afdb1fe10a7f6..7d4b8f3b4f97655218e37dc3387ff5de5cb6cce8 100644 --- a/include/obj/bhkSphereShape.h +++ b/include/obj/bhkSphereShape.h @@ -26,10 +26,10 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; @@ -42,10 +42,10 @@ public: protected: BHK_SPHERE_SHAPE_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/bhkStiffSpringConstraint.h b/include/obj/bhkStiffSpringConstraint.h index d7d84a68e39c511984340b5c536fb5b26881d38e..7ef95304ad155cd4288d3c6269fb92e2a3040e59 100644 --- a/include/obj/bhkStiffSpringConstraint.h +++ b/include/obj/bhkStiffSpringConstraint.h @@ -25,20 +25,20 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; protected: BHK_STIFF_SPRING_CONSTRAINT_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/bhkTransformShape.h b/include/obj/bhkTransformShape.h index 6ff60f02cf8f3522095932ddec892bd2f67c06c0..ef3fd52a25a1229363070a5e8b2b28844e793443 100644 --- a/include/obj/bhkTransformShape.h +++ b/include/obj/bhkTransformShape.h @@ -26,20 +26,20 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; protected: BHK_TRANSFORM_SHAPE_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/bhkWorldObject.h b/include/obj/bhkWorldObject.h index b897f6db474affd4ae8403dc29f5dd009dd90133..b5fdd6e883e4a16db2f49455c5fbb21be09dfd72 100644 --- a/include/obj/bhkWorldObject.h +++ b/include/obj/bhkWorldObject.h @@ -25,20 +25,20 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; protected: BHK_WORLD_OBJECT_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/include/obj/hkPackedNiTriStripsData.h b/include/obj/hkPackedNiTriStripsData.h index e63ba270f841dec7c74da4bb015301f50cab05a2..a86fe8545ab059f901b18b3f8656772752c14b87 100644 --- a/include/obj/hkPackedNiTriStripsData.h +++ b/include/obj/hkPackedNiTriStripsData.h @@ -29,20 +29,20 @@ public: private: static const Type TYPE; public: - virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - virtual void Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + virtual void Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; virtual string asString( bool verbose = false ) const; - virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); virtual list<NiObjectRef> GetRefs() const; virtual const Type & GetType() const; protected: HK_PACKED_NI_TRI_STRIPS_DATA_MEMBERS private: - void InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ); - void InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const; + void InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const; string InternalAsString( bool verbose ) const; - void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ); + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ); list<NiObjectRef> InternalGetRefs() const; }; diff --git a/src/ComplexShape.cpp b/src/ComplexShape.cpp index de22450d9eaf7ac694fef4a99d4f69ea6c857241..6b7e408d261fd8b68edd986756edce5db91358fa 100644 --- a/src/ComplexShape.cpp +++ b/src/ComplexShape.cpp @@ -785,13 +785,13 @@ Ref<NiAVObject> ComplexShape::Split( Ref<NiNode> & parent, Matrix44 & transform, //Loop through all compound vertices, adding the data //to the correct arrays. - uint vert_index = 0; + unsigned int vert_index = 0; for ( vector<CompoundVertex>::iterator cv = compVerts.begin(); cv != compVerts.end(); ++cv ) { shapeVerts[vert_index] = cv->position; shapeColors[vert_index] = cv->color; shapeNorms[vert_index] = cv->normal; shapeNorms[vert_index] = cv->normal; - uint tex_index = 0; + unsigned int tex_index = 0; for ( list<int>::iterator tex = shapeTexCoordSets.begin(); tex != shapeTexCoordSets.end(); ++tex ) { if ( cv->texCoords.find( TexType(*tex) ) != cv->texCoords.end() ) { shapeTCs[tex_index][vert_index] = cv->texCoords[ TexType(*tex) ]; diff --git a/src/NIF_IO.cpp b/src/NIF_IO.cpp index f1806c365dcf708e0f108784d3de744010fc5552..6b5d7268b9b2e4f4512ac3bed3beaf60f964588e 100644 --- a/src/NIF_IO.cpp +++ b/src/NIF_IO.cpp @@ -14,16 +14,16 @@ int ReadInt( istream& in ){ return tmp; } -uint ReadUInt( istream& in ){ +unsigned int ReadUInt( istream& in ){ - uint tmp; + unsigned int tmp; in.read( (char*)&tmp, 4 ); return tmp; } -ushort ReadUShort( istream& in ){ +unsigned short ReadUShort( istream& in ){ - ushort tmp; + unsigned short tmp; in.read( (char*)&tmp, 2 ); return tmp; } @@ -49,7 +49,7 @@ float ReadFloat( istream &in ){ } string ReadString( istream &in ) { - uint len = ReadUInt( in ); + unsigned int len = ReadUInt( in ); string out; if ( len > 10000 ) throw runtime_error("String too long. Not a NIF file or unsupported format?"); @@ -77,12 +77,12 @@ void WriteInt( int val, ostream& out ){ out.write( (char*)&val, 4 ); } -void WriteUInt( uint val, ostream& out ){ +void WriteUInt( unsigned int val, ostream& out ){ out.write( (char*)&val, 4 ); } -void WriteUShort( ushort val, ostream& out ){ +void WriteUShort( unsigned short val, ostream& out ){ out.write( (char*)&val, 2 ); } @@ -102,7 +102,7 @@ void WriteFloat( float val, ostream& out ){ } void WriteString( string const & val, ostream& out ) { - WriteUInt( uint(val.size()), out ); + WriteUInt( unsigned int(val.size()), out ); out.write( val.c_str(), std::streamsize(val.size()) ); } @@ -130,41 +130,41 @@ void WriteBool( bool val, ostream& out, unsigned int version ) { //--Basic Types--// //int -void NifStream( int & val, istream& in, uint version ) { val = ReadInt( in ); }; -void NifStream( int const & val, ostream& out, uint version ) { WriteInt( val, out ); } +void NifStream( int & val, istream& in, unsigned int version ) { val = ReadInt( in ); }; +void NifStream( int const & val, ostream& out, unsigned int version ) { WriteInt( val, out ); } -//uint -void NifStream( uint & val, istream& in, uint version ) { val = ReadUInt( in ); }; -void NifStream( uint const & val, ostream& out, uint version ) { WriteUInt( val, out ); } +//unsigned int +void NifStream( unsigned int & val, istream& in, unsigned int version ) { val = ReadUInt( in ); }; +void NifStream( unsigned int const & val, ostream& out, unsigned int version ) { WriteUInt( val, out ); } -//ushort -void NifStream( ushort & val, istream& in, uint version ) { val = ReadUShort( in ); }; -void NifStream( ushort const & val, ostream& out, uint version ) { WriteUShort( val, out ); } +//unsigned short +void NifStream( unsigned short & val, istream& in, unsigned int version ) { val = ReadUShort( in ); }; +void NifStream( unsigned short const & val, ostream& out, unsigned int version ) { WriteUShort( val, out ); } //short -void NifStream( short & val, istream& in, uint version ) { val = ReadShort( in ); }; -void NifStream( short const & val, ostream& out, uint version ) { WriteShort( val, out ); } +void NifStream( short & val, istream& in, unsigned int version ) { val = ReadShort( in ); }; +void NifStream( short const & val, ostream& out, unsigned int version ) { WriteShort( val, out ); } //byte -void NifStream( byte & val, istream& in, uint version ) { val = ReadByte( in ); }; -void NifStream( byte const & val, ostream& out, uint version ) { WriteByte( val, out ); } +void NifStream( byte & val, istream& in, unsigned int version ) { val = ReadByte( in ); }; +void NifStream( byte const & val, ostream& out, unsigned int version ) { WriteByte( val, out ); } //bool -void NifStream( bool & val, istream& in, uint version ) { val = ReadBool( in, version ); }; -void NifStream( bool const & val, ostream& out, uint version ) { WriteBool( val, out, version ); } +void NifStream( bool & val, istream& in, unsigned int version ) { val = ReadBool( in, version ); }; +void NifStream( bool const & val, ostream& out, unsigned int version ) { WriteBool( val, out, version ); } //float -void NifStream( float & val, istream& in, uint version ) { val = ReadFloat( in ); }; -void NifStream( float const & val, ostream& out, uint version ) { WriteFloat( val, out ); } +void NifStream( float & val, istream& in, unsigned int version ) { val = ReadFloat( in ); }; +void NifStream( float const & val, ostream& out, unsigned int version ) { WriteFloat( val, out ); } //string -void NifStream( string & val, istream& in, uint version ) { val = ReadString( in ); }; -void NifStream( string const & val, ostream& out, uint version ) { WriteString( val, out ); } +void NifStream( string & val, istream& in, unsigned int version ) { val = ReadString( in ); }; +void NifStream( string const & val, ostream& out, unsigned int version ) { WriteString( val, out ); } //--Structs--// //HeaderString -void NifStream( HeaderString & val, istream& in, uint & version ) { +void NifStream( HeaderString & val, istream& in, unsigned int & version ) { char tmp[256]; in.getline( tmp, 256 ); val.header = tmp; @@ -195,7 +195,7 @@ void NifStream( HeaderString & val, istream& in, uint & version ) { //} }; -void NifStream( HeaderString const & val, ostream& out, uint version ) { +void NifStream( HeaderString const & val, ostream& out, unsigned int version ) { stringstream header_string; if ( version <= VER_10_0_1_0 ) { header_string << "NetImmerse File Format, Version "; @@ -216,13 +216,13 @@ ostream & operator<<( ostream & out, HeaderString const & val ) { } //LineString -void NifStream( LineString & val, istream& in, uint version ) { +void NifStream( LineString & val, istream& in, unsigned int version ) { char tmp[256]; in.getline( tmp, 256 ); val.line = tmp; }; -void NifStream( LineString const & val, ostream& out, uint version ) { +void NifStream( LineString const & val, ostream& out, unsigned int version ) { out << val.line << "\n"; }; @@ -231,7 +231,7 @@ ostream & operator<<( ostream & out, LineString const & val ) { } //ShortString -void NifStream( ShortString & val, istream& in, uint version ) { +void NifStream( ShortString & val, istream& in, unsigned int version ) { byte len = ReadByte( in ); char * buffer = new char[len]; in.read( buffer, len ); @@ -239,7 +239,7 @@ void NifStream( ShortString & val, istream& in, uint version ) { delete [] buffer; }; -void NifStream( ShortString const & val, ostream& out, uint version ) { +void NifStream( ShortString const & val, ostream& out, unsigned int version ) { WriteByte( byte(val.str.size() + 1), out ); out.write( val.str.c_str(), std::streamsize(val.str.size()) ); WriteByte( 0, out ); @@ -250,55 +250,55 @@ ostream & operator<<( ostream & out, ShortString const & val ) { } //TexCoord -void NifStream( TexCoord & val, istream& in, uint version ) { +void NifStream( TexCoord & val, istream& in, unsigned int version ) { val.u = ReadFloat( in ); val.v = ReadFloat( in ); }; -void NifStream( TexCoord const & val, ostream& out, uint version ) { +void NifStream( TexCoord const & val, ostream& out, unsigned int version ) { WriteFloat( val.u, out ); WriteFloat( val.v, out ); }; //Triangle -void NifStream( Triangle & val, istream& in, uint version ) { +void NifStream( Triangle & val, istream& in, unsigned int version ) { val.v1 = ReadUShort( in ); val.v2 = ReadUShort( in ); val.v3 = ReadUShort( in ); }; -void NifStream( Triangle const & val, ostream& out, uint version ) { +void NifStream( Triangle const & val, ostream& out, unsigned int version ) { WriteUShort( val.v1, out ); WriteUShort( val.v2, out ); WriteUShort( val.v3, out ); }; //Vector3 -void NifStream( Vector3 & val, istream& in, uint version ) { +void NifStream( Vector3 & val, istream& in, unsigned int version ) { val.x = ReadFloat( in ); val.y = ReadFloat( in ); val.z = ReadFloat( in ); }; -void NifStream( Vector3 const & val, ostream& out, uint version ) { +void NifStream( Vector3 const & val, ostream& out, unsigned int version ) { WriteFloat( val.x, out ); WriteFloat( val.y, out ); WriteFloat( val.z, out ); }; //Float2 -void NifStream( Float2 & val, istream& in, uint version ) { +void NifStream( Float2 & val, istream& in, unsigned int version ) { val.data[0] = ReadFloat( in ); val.data[1] = ReadFloat( in ); }; -void NifStream( Float2 const & val, ostream& out, uint version ) { +void NifStream( Float2 const & val, ostream& out, unsigned int version ) { WriteFloat( val.data[0], out ); WriteFloat( val.data[1], out ); }; //Matrix22 -void NifStream( Matrix22 & val, istream& in, uint version ) { +void NifStream( Matrix22 & val, istream& in, unsigned int version ) { for (int c = 0; c < 2; ++c) { for (int r = 0; r < 2; ++r) { val[r][c] = ReadFloat( in ); @@ -306,7 +306,7 @@ void NifStream( Matrix22 & val, istream& in, uint version ) { } } -void NifStream( Matrix22 const & val, ostream& out, uint version ) { +void NifStream( Matrix22 const & val, ostream& out, unsigned int version ) { for (int c = 0; c < 2; ++c) { for (int r = 0; r < 2; ++r) { WriteFloat( val[r][c], out ); @@ -315,20 +315,20 @@ void NifStream( Matrix22 const & val, ostream& out, uint version ) { } //Float3 -void NifStream( Float3 & val, istream& in, uint version ) { +void NifStream( Float3 & val, istream& in, unsigned int version ) { val.data[0] = ReadFloat( in ); val.data[1] = ReadFloat( in ); val.data[2] = ReadFloat( in ); }; -void NifStream( Float3 const & val, ostream& out, uint version ) { +void NifStream( Float3 const & val, ostream& out, unsigned int version ) { WriteFloat( val.data[0], out ); WriteFloat( val.data[1], out ); WriteFloat( val.data[2], out ); }; //Matrix33 -void NifStream( Matrix33 & val, istream& in, uint version ) { +void NifStream( Matrix33 & val, istream& in, unsigned int version ) { for (int c = 0; c < 3; ++c) { for (int r = 0; r < 3; ++r) { val[r][c] = ReadFloat( in ); @@ -336,7 +336,7 @@ void NifStream( Matrix33 & val, istream& in, uint version ) { } } -void NifStream( Matrix33 const & val, ostream& out, uint version ) { +void NifStream( Matrix33 const & val, ostream& out, unsigned int version ) { for (int c = 0; c < 3; ++c) { for (int r = 0; r < 3; ++r) { WriteFloat( val[r][c], out ); @@ -345,14 +345,14 @@ void NifStream( Matrix33 const & val, ostream& out, uint version ) { } //Float4 -void NifStream( Float4 & val, istream& in, uint version ) { +void NifStream( Float4 & val, istream& in, unsigned int version ) { val.data[0] = ReadFloat( in ); val.data[1] = ReadFloat( in ); val.data[2] = ReadFloat( in ); val.data[3] = ReadFloat( in ); }; -void NifStream( Float4 const & val, ostream& out, uint version ) { +void NifStream( Float4 const & val, ostream& out, unsigned int version ) { WriteFloat( val.data[0], out ); WriteFloat( val.data[1], out ); WriteFloat( val.data[2], out ); @@ -360,7 +360,7 @@ void NifStream( Float4 const & val, ostream& out, uint version ) { }; //Matrix44 -void NifStream( Matrix44 & val, istream& in, uint version ) { +void NifStream( Matrix44 & val, istream& in, unsigned int version ) { for (int c = 0; c < 4; ++c) { for (int r = 0; r < 4; ++r) { val[r][c] = ReadFloat( in ); @@ -368,7 +368,7 @@ void NifStream( Matrix44 & val, istream& in, uint version ) { } } -void NifStream( Matrix44 const & val, ostream& out, uint version ) { +void NifStream( Matrix44 const & val, ostream& out, unsigned int version ) { for (int c = 0; c < 4; ++c) { for (int r = 0; r < 4; ++r) { WriteFloat( val[r][c], out ); @@ -377,27 +377,27 @@ void NifStream( Matrix44 const & val, ostream& out, uint version ) { } //Color3 -void NifStream( Color3 & val, istream& in, uint version ) { +void NifStream( Color3 & val, istream& in, unsigned int version ) { val.r = ReadFloat( in ); val.g = ReadFloat( in ); val.b = ReadFloat( in ); }; -void NifStream( Color3 const & val, ostream& out, uint version ) { +void NifStream( Color3 const & val, ostream& out, unsigned int version ) { WriteFloat( val.r, out ); WriteFloat( val.g, out ); WriteFloat( val.b, out ); }; //Color4 -void NifStream( Color4 & val, istream& in, uint version ) { +void NifStream( Color4 & val, istream& in, unsigned int version ) { val.r = ReadFloat( in ); val.g = ReadFloat( in ); val.b = ReadFloat( in ); val.a = ReadFloat( in ); }; -void NifStream( Color4 const & val, ostream& out, uint version ) { +void NifStream( Color4 const & val, ostream& out, unsigned int version ) { WriteFloat( val.r, out ); WriteFloat( val.g, out ); WriteFloat( val.b, out ); @@ -405,14 +405,14 @@ void NifStream( Color4 const & val, ostream& out, uint version ) { }; //Quaternion -void NifStream( Quaternion & val, istream& in, uint version ) { +void NifStream( Quaternion & val, istream& in, unsigned int version ) { val.w = ReadFloat( in ); val.x = ReadFloat( in ); val.y = ReadFloat( in ); val.z = ReadFloat( in ); }; -void NifStream( Quaternion const & val, ostream& out, uint version ) { +void NifStream( Quaternion const & val, ostream& out, unsigned int version ) { WriteFloat( val.w, out ); WriteFloat( val.x, out ); WriteFloat( val.y, out ); @@ -421,14 +421,14 @@ void NifStream( Quaternion const & val, ostream& out, uint version ) { //The HexString function creates a formatted hex display of the given data for use in printing //a debug string for information that is not understood -string HexString( const byte * src, uint len ) { +string HexString( const byte * src, unsigned int len ) { stringstream out; //Display Data in Hex form out << hex << setfill('0'); - for ( uint i = 0; i < len; ++i ) { - out << uppercase << setw(2) << uint(src[i]); + for ( unsigned int i = 0; i < len; ++i ) { + out << uppercase << setw(2) << unsigned int(src[i]); if (i % 16 == 15 || i == len - 1) out << endl; else if (i % 16 == 7) @@ -445,10 +445,10 @@ string HexString( const byte * src, uint len ) { //Byte ostream & operator<<( ostream & out, byte const & val ) { - return out << uint(val); + return out << unsigned int(val); } -void NifStream( Key<Quaternion> & key, istream& file, uint version, KeyType type ) { +void NifStream( Key<Quaternion> & key, istream& file, unsigned int version, KeyType type ) { key.time = ReadFloat( file ); //If key type is not 1, 2, or 3, throw an exception @@ -468,7 +468,7 @@ void NifStream( Key<Quaternion> & key, istream& file, uint version, KeyType type } -void NifStream( Key<Quaternion> const & key, ostream& file, uint version, KeyType type ) { +void NifStream( Key<Quaternion> const & key, ostream& file, unsigned int version, KeyType type ) { WriteFloat( key.time, file ); //If key type is not 1, 2, or 3, throw an exception diff --git a/src/gen/BoundingBox.cpp b/src/gen/BoundingBox.cpp index de1c1d5f3025794c464055a761bafdad2591b6af..5d11968374cc1a9f73bd7b0983710fff545b6d69 100644 --- a/src/gen/BoundingBox.cpp +++ b/src/gen/BoundingBox.cpp @@ -5,7 +5,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Constructor -BoundingBox::BoundingBox() : unknownInt((uint)1) {}; +BoundingBox::BoundingBox() : unknownInt((unsigned int)1) {}; //Copy Constructor BoundingBox::BoundingBox( const BoundingBox & src ) { diff --git a/src/gen/ByteArray.cpp b/src/gen/ByteArray.cpp index 53195036eff9d2691b6331fd4cb8cd3210064e09..319d6b5870813548053b130c0617776387322ebd 100644 --- a/src/gen/ByteArray.cpp +++ b/src/gen/ByteArray.cpp @@ -5,7 +5,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Constructor -ByteArray::ByteArray() : dataSize((uint)0) {}; +ByteArray::ByteArray() : dataSize((unsigned int)0) {}; //Copy Constructor ByteArray::ByteArray( const ByteArray & src ) { diff --git a/src/gen/ControllerLink.cpp b/src/gen/ControllerLink.cpp index 8eb84b2b505072fd30217229c5c3f976fb713b37..8897d5a5d121d94b21d9bd3fe33a343309a222ca 100644 --- a/src/gen/ControllerLink.cpp +++ b/src/gen/ControllerLink.cpp @@ -9,7 +9,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Constructor -ControllerLink::ControllerLink() : controller(NULL), interpolator(NULL), unknownLink2(NULL), unknownShort0((ushort)0), priority_((byte)0), stringPalette(NULL), nodeNameOffset((uint)-1), propertyTypeOffset((uint)-1), controllerTypeOffset((uint)-1), variableOffset1((uint)-1), variableOffset2((uint)-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 ) { diff --git a/src/gen/Footer.cpp b/src/gen/Footer.cpp index 93b7992765fc900316adbea3126896fab2b0421c..29d2491fffd6d70fbc7ad3b866962cc838755962 100644 --- a/src/gen/Footer.cpp +++ b/src/gen/Footer.cpp @@ -6,7 +6,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Constructor -Footer::Footer() : numRoots((uint)0) {}; +Footer::Footer() : numRoots((unsigned int)0) {}; //Copy Constructor Footer::Footer( const Footer & src ) { @@ -23,23 +23,23 @@ Footer & Footer::operator=( const Footer & src ) { //Destructor Footer::~Footer() {}; -void Footer::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { - uint block_num; +void Footer::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { + unsigned int block_num; if ( version >= 0x0303000D ) { NifStream( numRoots, in, version ); roots.resize(numRoots); - for (uint i2 = 0; i2 < roots.size(); i2++) { + for (unsigned int i2 = 0; i2 < roots.size(); i2++) { NifStream( block_num, in, version ); link_stack.push_back( block_num ); }; }; } -void Footer::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { - numRoots = uint(roots.size()); +void Footer::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { + numRoots = unsigned int(roots.size()); if ( version >= 0x0303000D ) { NifStream( numRoots, out, version ); - for (uint i2 = 0; i2 < roots.size(); i2++) { + for (unsigned int i2 = 0; i2 < roots.size(); i2++) { if ( roots[i2] != NULL ) NifStream( link_map.find( StaticCast<NiObject>(roots[i2]) )->second, out, version ); else @@ -50,11 +50,11 @@ void Footer::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsign string Footer::asString( bool verbose ) const { stringstream out; - uint array_output_count = 0; - numRoots = uint(roots.size()); + unsigned int array_output_count = 0; + numRoots = unsigned int(roots.size()); out << " Num Roots: " << numRoots << endl; array_output_count = 0; - for (uint i1 = 0; i1 < roots.size(); i1++) { + for (unsigned int i1 = 0; i1 < roots.size(); i1++) { if ( !verbose && ( array_output_count > MAXARRAYDUMP ) ) { out << "<Data Truncated. Use verbose mode to see complete listing.>" << endl; break; diff --git a/src/gen/FurniturePosition.cpp b/src/gen/FurniturePosition.cpp index 2aa26ebcede2d64c22baa35821aeab148c3dfb75..f224aa69bbf934083e74971a68b61e9967adf0a9 100644 --- a/src/gen/FurniturePosition.cpp +++ b/src/gen/FurniturePosition.cpp @@ -5,7 +5,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Constructor -FurniturePosition::FurniturePosition() : orientation((ushort)0), positionRef1((byte)0), positionRef2((byte)0) {}; +FurniturePosition::FurniturePosition() : orientation((unsigned short)0), positionRef1((byte)0), positionRef2((byte)0) {}; //Copy Constructor FurniturePosition::FurniturePosition( const FurniturePosition & src ) { diff --git a/src/gen/Header.cpp b/src/gen/Header.cpp index 63dc26a5112d1cc426f3ba99e1bb58a70c4a6b14..0bc001c620a55463b30cd468fe1a5cccc22ccf60 100644 --- a/src/gen/Header.cpp +++ b/src/gen/Header.cpp @@ -5,7 +5,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Constructor -Header::Header() : version((uint)0x04000002), endianType((byte)1), userVersion((uint)0), numBlocks((uint)0), userVersion2((uint)0), numBlockTypes((ushort)0), unknownInt2((uint)0) {}; +Header::Header() : version((unsigned int)0x04000002), endianType((byte)1), userVersion((unsigned int)0), numBlocks((unsigned int)0), userVersion2((unsigned int)0), numBlockTypes((unsigned short)0), unknownInt2((unsigned int)0) {}; //Copy Constructor Header::Header( const Header & src ) { @@ -36,7 +36,7 @@ Header::~Header() {}; void Header::Read( istream& in ) { NifStream( headerString, in, version ); if ( version <= 0x03010000 ) { - for (uint i2 = 0; i2 < 3; i2++) { + for (unsigned int i2 = 0; i2 < 3; i2++) { NifStream( copyright[i2], in, version ); }; }; @@ -70,11 +70,11 @@ void Header::Read( istream& in ) { if ( version >= 0x0A000100 ) { NifStream( numBlockTypes, in, version ); blockTypes.resize(numBlockTypes); - for (uint i2 = 0; i2 < blockTypes.size(); i2++) { + for (unsigned int i2 = 0; i2 < blockTypes.size(); i2++) { NifStream( blockTypes[i2], in, version ); }; blockTypeIndex.resize(numBlocks); - for (uint i2 = 0; i2 < blockTypeIndex.size(); i2++) { + for (unsigned int i2 = 0; i2 < blockTypeIndex.size(); i2++) { NifStream( blockTypeIndex[i2], in, version ); }; NifStream( unknownInt2, in, version ); @@ -82,11 +82,11 @@ void Header::Read( istream& in ) { } void Header::Write( ostream& out ) const { - numBlockTypes = ushort(blockTypes.size()); - numBlocks = uint(blockTypeIndex.size()); + numBlockTypes = unsigned short(blockTypes.size()); + numBlocks = unsigned int(blockTypeIndex.size()); NifStream( headerString, out, version ); if ( version <= 0x03010000 ) { - for (uint i2 = 0; i2 < 3; i2++) { + for (unsigned int i2 = 0; i2 < 3; i2++) { NifStream( copyright[i2], out, version ); }; }; @@ -119,10 +119,10 @@ void Header::Write( ostream& out ) const { }; if ( version >= 0x0A000100 ) { NifStream( numBlockTypes, out, version ); - for (uint i2 = 0; i2 < blockTypes.size(); i2++) { + for (unsigned int i2 = 0; i2 < blockTypes.size(); i2++) { NifStream( blockTypes[i2], out, version ); }; - for (uint i2 = 0; i2 < blockTypeIndex.size(); i2++) { + for (unsigned int i2 = 0; i2 < blockTypeIndex.size(); i2++) { NifStream( blockTypeIndex[i2], out, version ); }; NifStream( unknownInt2, out, version ); @@ -131,12 +131,12 @@ void Header::Write( ostream& out ) const { string Header::asString( bool verbose ) const { stringstream out; - uint array_output_count = 0; - numBlockTypes = ushort(blockTypes.size()); - numBlocks = uint(blockTypeIndex.size()); + unsigned int array_output_count = 0; + numBlockTypes = unsigned short(blockTypes.size()); + numBlocks = unsigned int(blockTypeIndex.size()); out << " Header String: " << headerString << endl; array_output_count = 0; - for (uint i1 = 0; i1 < 3; i1++) { + for (unsigned int i1 = 0; i1 < 3; i1++) { if ( !verbose && ( array_output_count > MAXARRAYDUMP ) ) { out << "<Data Truncated. Use verbose mode to see complete listing.>" << endl; break; @@ -159,7 +159,7 @@ string Header::asString( bool verbose ) const { }; out << " Num Block Types: " << numBlockTypes << endl; array_output_count = 0; - for (uint i1 = 0; i1 < blockTypes.size(); i1++) { + for (unsigned int i1 = 0; i1 < blockTypes.size(); i1++) { if ( !verbose && ( array_output_count > MAXARRAYDUMP ) ) { out << "<Data Truncated. Use verbose mode to see complete listing.>" << endl; break; @@ -171,7 +171,7 @@ string Header::asString( bool verbose ) const { array_output_count++; }; array_output_count = 0; - for (uint i1 = 0; i1 < blockTypeIndex.size(); i1++) { + for (unsigned int i1 = 0; i1 < blockTypeIndex.size(); i1++) { if ( !verbose && ( array_output_count > MAXARRAYDUMP ) ) { out << "<Data Truncated. Use verbose mode to see complete listing.>" << endl; break; diff --git a/src/gen/MatchGroup.cpp b/src/gen/MatchGroup.cpp index 3b735e79595f6f7a9f4cb547a5692554874e3e4f..f9e70e923ae2f2edf8d5470cfa970adc284ddca3 100644 --- a/src/gen/MatchGroup.cpp +++ b/src/gen/MatchGroup.cpp @@ -5,7 +5,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Constructor -MatchGroup::MatchGroup() : numVertices((ushort)0) {}; +MatchGroup::MatchGroup() : numVertices((unsigned short)0) {}; //Copy Constructor MatchGroup::MatchGroup( const MatchGroup & src ) { diff --git a/src/gen/MipMap.cpp b/src/gen/MipMap.cpp index 7acf3c91ef33f114754b7f5b6c99c12772bf15a1..790a776694d1978d3dfaa5fe7c3b53e97cc8918d 100644 --- a/src/gen/MipMap.cpp +++ b/src/gen/MipMap.cpp @@ -5,7 +5,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Constructor -MipMap::MipMap() : width((uint)0), height((uint)0), offset((uint)0) {}; +MipMap::MipMap() : width((unsigned int)0), height((unsigned int)0), offset((unsigned int)0) {}; //Copy Constructor MipMap::MipMap( const MipMap & src ) { diff --git a/src/gen/Morph.cpp b/src/gen/Morph.cpp index 6bf3df13447b4a3e33843e31640da6bc3c36dd51..c164e34c321e6bf420013fe2f1430b5ce7661ef0 100644 --- a/src/gen/Morph.cpp +++ b/src/gen/Morph.cpp @@ -5,7 +5,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Constructor -Morph::Morph() : numKeys((uint)0), unknownInt((uint)0) {}; +Morph::Morph() : numKeys((unsigned int)0), unknownInt((unsigned int)0) {}; //Copy Constructor Morph::Morph( const Morph & src ) { diff --git a/src/gen/NodeGroup.cpp b/src/gen/NodeGroup.cpp index 556736282d8b11971e9301ec19b17efa04ef4211..3a8c5baf8938277c4d423377c37b70c0df994f64 100644 --- a/src/gen/NodeGroup.cpp +++ b/src/gen/NodeGroup.cpp @@ -6,7 +6,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Constructor -NodeGroup::NodeGroup() : numNodes((uint)0) {}; +NodeGroup::NodeGroup() : numNodes((unsigned int)0) {}; //Copy Constructor NodeGroup::NodeGroup( const NodeGroup & src ) { diff --git a/src/gen/OblivionColFilter.cpp b/src/gen/OblivionColFilter.cpp index 307619f8e47367123a50a0dc44ced5824602faf5..7b96a28c0b2ba1b61301fc0b222c0fe54850d5cc 100644 --- a/src/gen/OblivionColFilter.cpp +++ b/src/gen/OblivionColFilter.cpp @@ -5,7 +5,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Constructor -OblivionColFilter::OblivionColFilter() : colFilter((byte)0), unknownShort((ushort)0) {}; +OblivionColFilter::OblivionColFilter() : colFilter((byte)0), unknownShort((unsigned short)0) {}; //Copy Constructor OblivionColFilter::OblivionColFilter( const OblivionColFilter & src ) { diff --git a/src/gen/OblivionSubShape.cpp b/src/gen/OblivionSubShape.cpp index 04f72c841cb353b5f18e5af71a4fcc3bf14d5291..8780919d6885568069545e47a0799dd83f8b0d56 100644 --- a/src/gen/OblivionSubShape.cpp +++ b/src/gen/OblivionSubShape.cpp @@ -5,7 +5,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Constructor -OblivionSubShape::OblivionSubShape() : colFilter((byte)0), unknownShort((ushort)0), vertexCount___((uint)0) {}; +OblivionSubShape::OblivionSubShape() : colFilter((byte)0), unknownShort((unsigned short)0), vertexCount___((unsigned int)0) {}; //Copy Constructor OblivionSubShape::OblivionSubShape( const OblivionSubShape & src ) { diff --git a/src/gen/Particle.cpp b/src/gen/Particle.cpp index 45b6e503362f925f4be83742f6c952c56b7530dd..84288e0d332f853607004bb5fc78f57245cef176 100644 --- a/src/gen/Particle.cpp +++ b/src/gen/Particle.cpp @@ -5,7 +5,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Constructor -Particle::Particle() : lifetime(0.0f), lifespan(0.0f), timestamp(0.0f), unknownShort((ushort)0), vertexId((ushort)0) {}; +Particle::Particle() : lifetime(0.0f), lifespan(0.0f), timestamp(0.0f), unknownShort((unsigned short)0), vertexId((unsigned short)0) {}; //Copy Constructor Particle::Particle( const Particle & src ) { diff --git a/src/gen/ShaderTexDesc.cpp b/src/gen/ShaderTexDesc.cpp index 0402f8456fdf4e1b752b4f23bfe88474d2f760e1..4661875bf32548ac8eadd071e1612257bb5b183b 100644 --- a/src/gen/ShaderTexDesc.cpp +++ b/src/gen/ShaderTexDesc.cpp @@ -7,7 +7,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Constructor -ShaderTexDesc::ShaderTexDesc() : isUsed(false), unknownInt((uint)0) {}; +ShaderTexDesc::ShaderTexDesc() : isUsed(false), unknownInt((unsigned int)0) {}; //Copy Constructor ShaderTexDesc::ShaderTexDesc( const ShaderTexDesc & src ) { diff --git a/src/gen/SkinData.cpp b/src/gen/SkinData.cpp index aaeef9105897236dda7576d48f4e1ce76ae50dfd..d330cb3f99959689c362238d387fb9d19c9729e2 100644 --- a/src/gen/SkinData.cpp +++ b/src/gen/SkinData.cpp @@ -6,7 +6,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Constructor -SkinData::SkinData() : scale(0.0f), boundingSphereRadius(0.0f), numVertices((ushort)0) {}; +SkinData::SkinData() : scale(0.0f), boundingSphereRadius(0.0f), numVertices((unsigned short)0) {}; //Copy Constructor SkinData::SkinData( const SkinData & src ) { diff --git a/src/gen/SkinPartition.cpp b/src/gen/SkinPartition.cpp index 3299889c4ff7fd2b7afc3200893e649d14687605..b65fa2f7515145c691bae70a28706cb7a108a030 100644 --- a/src/gen/SkinPartition.cpp +++ b/src/gen/SkinPartition.cpp @@ -5,7 +5,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Constructor -SkinPartition::SkinPartition() : numVertices((ushort)0), numTriangles((ushort)0), numBones((ushort)0), numStrips((ushort)0), numWeightsPerVertex((ushort)0), hasVertexMap(false), hasVertexWeights(false), hasStrips(false), hasBoneIndices(false) {}; +SkinPartition::SkinPartition() : numVertices((unsigned short)0), numTriangles((unsigned short)0), numBones((unsigned short)0), numStrips((unsigned short)0), numWeightsPerVertex((unsigned short)0), hasVertexMap(false), hasVertexWeights(false), hasStrips(false), hasBoneIndices(false) {}; //Copy Constructor SkinPartition::SkinPartition( const SkinPartition & src ) { diff --git a/src/gen/SkinShapeGroup.cpp b/src/gen/SkinShapeGroup.cpp index 8cad1bb2ebe98ec4e8b3163610dae4ee8caf9507..c956de79f3d8fc531328671099bbb3972e5adfe5 100644 --- a/src/gen/SkinShapeGroup.cpp +++ b/src/gen/SkinShapeGroup.cpp @@ -8,7 +8,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Constructor -SkinShapeGroup::SkinShapeGroup() : numLinkPairs((uint)0) {}; +SkinShapeGroup::SkinShapeGroup() : numLinkPairs((unsigned int)0) {}; //Copy Constructor SkinShapeGroup::SkinShapeGroup( const SkinShapeGroup & src ) { diff --git a/src/gen/SkinWeight.cpp b/src/gen/SkinWeight.cpp index 9e19626700f44d0a0c4079fdea9d89e53e6bee84..f19a35f1da820c5305fc8cb96ea3d5d78df74d67 100644 --- a/src/gen/SkinWeight.cpp +++ b/src/gen/SkinWeight.cpp @@ -5,7 +5,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Constructor -SkinWeight::SkinWeight() : index((ushort)0), weight(0.0f) {}; +SkinWeight::SkinWeight() : index((unsigned short)0), weight(0.0f) {}; //Copy Constructor SkinWeight::SkinWeight( const SkinWeight & src ) { diff --git a/src/gen/StringPalette.cpp b/src/gen/StringPalette.cpp index ac67976704a33a7a5a80e024c3e67aae1c59f016..1daee7455386dbebf64bdd836b65bccb690bc5f4 100644 --- a/src/gen/StringPalette.cpp +++ b/src/gen/StringPalette.cpp @@ -5,7 +5,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Constructor -StringPalette::StringPalette() : length((uint)0) {}; +StringPalette::StringPalette() : length((unsigned int)0) {}; //Copy Constructor StringPalette::StringPalette( const StringPalette & src ) { diff --git a/src/gen/TexDesc.cpp b/src/gen/TexDesc.cpp index f5edb80ee5d8f9799d6c0c1355ce06a14956e1ea..d508b3e2f51a70fcd6742758a0730a1945f2c9f4 100644 --- a/src/gen/TexDesc.cpp +++ b/src/gen/TexDesc.cpp @@ -6,7 +6,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Constructor -TexDesc::TexDesc() : source(NULL), clampMode((TexClampMode)WRAP_S_WRAP_T), filterMode((TexFilterMode)FILTER_TRILERP), uvSet((uint)0), ps2L((ushort)0), ps2K((ushort)0xFFB5), unknown1((ushort)0), hasTextureTransform(false), wRotation(0.0f), transformType_((uint)0) {}; +TexDesc::TexDesc() : source(NULL), clampMode((TexClampMode)WRAP_S_WRAP_T), filterMode((TexFilterMode)FILTER_TRILERP), uvSet((unsigned int)0), ps2L((unsigned short)0), ps2K((unsigned short)0xFFB5), unknown1((unsigned short)0), hasTextureTransform(false), wRotation(0.0f), transformType_((unsigned int)0) {}; //Copy Constructor TexDesc::TexDesc( const TexDesc & src ) { diff --git a/src/gen/enums.cpp b/src/gen/enums.cpp index 2f64225c49977ffa99efeb20bab42fa49d099dac..6bb538e795362e624b9e206812d4e13c9b3e06db 100644 --- a/src/gen/enums.cpp +++ b/src/gen/enums.cpp @@ -15,14 +15,14 @@ namespace Niflib { //--ForceType--// -void NifStream( ForceType & val, istream& in, uint version ) { - uint temp; +void NifStream( ForceType & val, istream& in, unsigned int version ) { + unsigned int temp; NifStream( temp, in, version ); val = ForceType(temp); } -void NifStream( ForceType const & val, ostream& out, uint version ) { - NifStream( uint(val), out, version ); +void NifStream( ForceType const & val, ostream& out, unsigned int version ) { + NifStream( unsigned int(val), out, version ); } ostream & operator<<( ostream & out, ForceType const & val ) { @@ -30,21 +30,21 @@ ostream & operator<<( ostream & out, ForceType const & val ) { case FORCE_PLANAR: return out << "FORCE_PLANAR"; case FORCE_SPHERICAL: return out << "FORCE_SPHERICAL"; case FORCE_UNKNOWN: return out << "FORCE_UNKNOWN"; - default: return out << "Invalid Value! - " << uint(val); + default: return out << "Invalid Value! - " << unsigned int(val); } } //--HavokMaterial--// -void NifStream( HavokMaterial & val, istream& in, uint version ) { - uint temp; +void NifStream( HavokMaterial & val, istream& in, unsigned int version ) { + unsigned int temp; NifStream( temp, in, version ); val = HavokMaterial(temp); } -void NifStream( HavokMaterial const & val, ostream& out, uint version ) { - NifStream( uint(val), out, version ); +void NifStream( HavokMaterial const & val, ostream& out, unsigned int version ) { + NifStream( unsigned int(val), out, version ); } ostream & operator<<( ostream & out, HavokMaterial const & val ) { @@ -80,21 +80,21 @@ ostream & operator<<( ostream & out, HavokMaterial const & val ) { case HAV_MAT_CHAIN_STAIRS: return out << "HAV_MAT_CHAIN_STAIRS"; case HAV_MAT_SNOW_STAIRS: return out << "HAV_MAT_SNOW_STAIRS"; case HAV_MAT_ELEVATOR: return out << "HAV_MAT_ELEVATOR"; - default: return out << "Invalid Value! - " << uint(val); + default: return out << "Invalid Value! - " << unsigned int(val); } } //--CompareMode--// -void NifStream( CompareMode & val, istream& in, uint version ) { - uint temp; +void NifStream( CompareMode & val, istream& in, unsigned int version ) { + unsigned int temp; NifStream( temp, in, version ); val = CompareMode(temp); } -void NifStream( CompareMode const & val, ostream& out, uint version ) { - NifStream( uint(val), out, version ); +void NifStream( CompareMode const & val, ostream& out, unsigned int version ) { + NifStream( unsigned int(val), out, version ); } ostream & operator<<( ostream & out, CompareMode const & val ) { @@ -106,21 +106,21 @@ ostream & operator<<( ostream & out, CompareMode const & val ) { case TEST_GREATER: return out << "TEST_GREATER"; case TEST_GREATEREQUAL: return out << "TEST_GREATEREQUAL"; case TEST_ALWAYS: return out << "TEST_ALWAYS"; - default: return out << "Invalid Value! - " << uint(val); + default: return out << "Invalid Value! - " << unsigned int(val); } } //--TexFilterMode--// -void NifStream( TexFilterMode & val, istream& in, uint version ) { - uint temp; +void NifStream( TexFilterMode & val, istream& in, unsigned int version ) { + unsigned int temp; NifStream( temp, in, version ); val = TexFilterMode(temp); } -void NifStream( TexFilterMode const & val, ostream& out, uint version ) { - NifStream( uint(val), out, version ); +void NifStream( TexFilterMode const & val, ostream& out, unsigned int version ) { + NifStream( unsigned int(val), out, version ); } ostream & operator<<( ostream & out, TexFilterMode const & val ) { @@ -131,42 +131,42 @@ ostream & operator<<( ostream & out, TexFilterMode const & val ) { case FILTER_NEAREST_MIPNEAREST: return out << "FILTER_NEAREST_MIPNEAREST"; case FILTER_NEAREST_MIPLERP: return out << "FILTER_NEAREST_MIPLERP"; case FILTER_BILERP_MIPNEAREST: return out << "FILTER_BILERP_MIPNEAREST"; - default: return out << "Invalid Value! - " << uint(val); + default: return out << "Invalid Value! - " << unsigned int(val); } } //--LightMode--// -void NifStream( LightMode & val, istream& in, uint version ) { - uint temp; +void NifStream( LightMode & val, istream& in, unsigned int version ) { + unsigned int temp; NifStream( temp, in, version ); val = LightMode(temp); } -void NifStream( LightMode const & val, ostream& out, uint version ) { - NifStream( uint(val), out, version ); +void NifStream( LightMode const & val, ostream& out, unsigned int version ) { + NifStream( unsigned int(val), out, version ); } ostream & operator<<( ostream & out, LightMode const & val ) { switch ( val ) { case LIGHT_MODE_EMISSIVE: return out << "LIGHT_MODE_EMISSIVE"; case LIGHT_MODE_EMI_AMB_DIF: return out << "LIGHT_MODE_EMI_AMB_DIF"; - default: return out << "Invalid Value! - " << uint(val); + default: return out << "Invalid Value! - " << unsigned int(val); } } //--MipMapFormat--// -void NifStream( MipMapFormat & val, istream& in, uint version ) { - uint temp; +void NifStream( MipMapFormat & val, istream& in, unsigned int version ) { + unsigned int temp; NifStream( temp, in, version ); val = MipMapFormat(temp); } -void NifStream( MipMapFormat const & val, ostream& out, uint version ) { - NifStream( uint(val), out, version ); +void NifStream( MipMapFormat const & val, ostream& out, unsigned int version ) { + NifStream( unsigned int(val), out, version ); } ostream & operator<<( ostream & out, MipMapFormat const & val ) { @@ -174,21 +174,21 @@ ostream & operator<<( ostream & out, MipMapFormat const & val ) { case MIP_FMT_NO: return out << "MIP_FMT_NO"; case MIP_FMT_YES: return out << "MIP_FMT_YES"; case MIP_FMT_DEFAULT: return out << "MIP_FMT_DEFAULT"; - default: return out << "Invalid Value! - " << uint(val); + default: return out << "Invalid Value! - " << unsigned int(val); } } //--StencilAction--// -void NifStream( StencilAction & val, istream& in, uint version ) { - uint temp; +void NifStream( StencilAction & val, istream& in, unsigned int version ) { + unsigned int temp; NifStream( temp, in, version ); val = StencilAction(temp); } -void NifStream( StencilAction const & val, ostream& out, uint version ) { - NifStream( uint(val), out, version ); +void NifStream( StencilAction const & val, ostream& out, unsigned int version ) { + NifStream( unsigned int(val), out, version ); } ostream & operator<<( ostream & out, StencilAction const & val ) { @@ -199,20 +199,20 @@ ostream & operator<<( ostream & out, StencilAction const & val ) { case ACTION_INCREMENT: return out << "ACTION_INCREMENT"; case ACTION_DECREMENT: return out << "ACTION_DECREMENT"; case ACTION_INVERT: return out << "ACTION_INVERT"; - default: return out << "Invalid Value! - " << uint(val); + default: return out << "Invalid Value! - " << unsigned int(val); } } //--OblivionLayer--// -void NifStream( OblivionLayer & val, istream& in, uint version ) { +void NifStream( OblivionLayer & val, istream& in, unsigned int version ) { byte temp; NifStream( temp, in, version ); val = OblivionLayer(temp); } -void NifStream( OblivionLayer const & val, ostream& out, uint version ) { +void NifStream( OblivionLayer const & val, ostream& out, unsigned int version ) { NifStream( byte(val), out, version ); } @@ -276,21 +276,21 @@ ostream & operator<<( ostream & out, OblivionLayer const & val ) { case OL_PONYTAIL: return out << "OL_PONYTAIL"; case OL_WING: return out << "OL_WING"; case OL_NULL: return out << "OL_NULL"; - default: return out << "Invalid Value! - " << uint(val); + default: return out << "Invalid Value! - " << unsigned int(val); } } //--FaceDrawMode--// -void NifStream( FaceDrawMode & val, istream& in, uint version ) { - uint temp; +void NifStream( FaceDrawMode & val, istream& in, unsigned int version ) { + unsigned int temp; NifStream( temp, in, version ); val = FaceDrawMode(temp); } -void NifStream( FaceDrawMode const & val, ostream& out, uint version ) { - NifStream( uint(val), out, version ); +void NifStream( FaceDrawMode const & val, ostream& out, unsigned int version ) { + NifStream( unsigned int(val), out, version ); } ostream & operator<<( ostream & out, FaceDrawMode const & val ) { @@ -299,21 +299,21 @@ ostream & operator<<( ostream & out, FaceDrawMode const & val ) { case DRAW_CCW: return out << "DRAW_CCW"; case DRAW_CW: return out << "DRAW_CW"; case DRAW_BOTH: return out << "DRAW_BOTH"; - default: return out << "Invalid Value! - " << uint(val); + default: return out << "Invalid Value! - " << unsigned int(val); } } //--AlphaFormat--// -void NifStream( AlphaFormat & val, istream& in, uint version ) { - uint temp; +void NifStream( AlphaFormat & val, istream& in, unsigned int version ) { + unsigned int temp; NifStream( temp, in, version ); val = AlphaFormat(temp); } -void NifStream( AlphaFormat const & val, ostream& out, uint version ) { - NifStream( uint(val), out, version ); +void NifStream( AlphaFormat const & val, ostream& out, unsigned int version ) { + NifStream( unsigned int(val), out, version ); } ostream & operator<<( ostream & out, AlphaFormat const & val ) { @@ -322,21 +322,21 @@ ostream & operator<<( ostream & out, AlphaFormat const & val ) { case ALPHA_BINARY: return out << "ALPHA_BINARY"; case ALPHA_SMOOTH: return out << "ALPHA_SMOOTH"; case ALPHA_DEFAULT: return out << "ALPHA_DEFAULT"; - default: return out << "Invalid Value! - " << uint(val); + default: return out << "Invalid Value! - " << unsigned int(val); } } //--KeyType--// -void NifStream( KeyType & val, istream& in, uint version ) { - uint temp; +void NifStream( KeyType & val, istream& in, unsigned int version ) { + unsigned int temp; NifStream( temp, in, version ); val = KeyType(temp); } -void NifStream( KeyType const & val, ostream& out, uint version ) { - NifStream( uint(val), out, version ); +void NifStream( KeyType const & val, ostream& out, unsigned int version ) { + NifStream( unsigned int(val), out, version ); } ostream & operator<<( ostream & out, KeyType const & val ) { @@ -346,21 +346,21 @@ ostream & operator<<( ostream & out, KeyType const & val ) { case TBC_KEY: return out << "TBC_KEY"; case XYZ_ROTATION_KEY: return out << "XYZ_ROTATION_KEY"; case UNKNOWN_KEY: return out << "UNKNOWN_KEY"; - default: return out << "Invalid Value! - " << uint(val); + default: return out << "Invalid Value! - " << unsigned int(val); } } //--VertMode--// -void NifStream( VertMode & val, istream& in, uint version ) { - uint temp; +void NifStream( VertMode & val, istream& in, unsigned int version ) { + unsigned int temp; NifStream( temp, in, version ); val = VertMode(temp); } -void NifStream( VertMode const & val, ostream& out, uint version ) { - NifStream( uint(val), out, version ); +void NifStream( VertMode const & val, ostream& out, unsigned int version ) { + NifStream( unsigned int(val), out, version ); } ostream & operator<<( ostream & out, VertMode const & val ) { @@ -368,21 +368,21 @@ ostream & operator<<( ostream & out, VertMode const & val ) { case VERT_MODE_SRC_IGNORE: return out << "VERT_MODE_SRC_IGNORE"; case VERT_MODE_SRC_EMISSIVE: return out << "VERT_MODE_SRC_EMISSIVE"; case VERT_MODE_SRC_AMB_DIF: return out << "VERT_MODE_SRC_AMB_DIF"; - default: return out << "Invalid Value! - " << uint(val); + default: return out << "Invalid Value! - " << unsigned int(val); } } //--ApplyMode--// -void NifStream( ApplyMode & val, istream& in, uint version ) { - uint temp; +void NifStream( ApplyMode & val, istream& in, unsigned int version ) { + unsigned int temp; NifStream( temp, in, version ); val = ApplyMode(temp); } -void NifStream( ApplyMode const & val, ostream& out, uint version ) { - NifStream( uint(val), out, version ); +void NifStream( ApplyMode const & val, ostream& out, unsigned int version ) { + NifStream( unsigned int(val), out, version ); } ostream & operator<<( ostream & out, ApplyMode const & val ) { @@ -392,20 +392,20 @@ ostream & operator<<( ostream & out, ApplyMode const & val ) { case APPLY_MODULATE: return out << "APPLY_MODULATE"; case APPLY_HILIGHT: return out << "APPLY_HILIGHT"; case APPLY_HILIGHT2: return out << "APPLY_HILIGHT2"; - default: return out << "Invalid Value! - " << uint(val); + default: return out << "Invalid Value! - " << unsigned int(val); } } //--MotionSystem--// -void NifStream( MotionSystem & val, istream& in, uint version ) { +void NifStream( MotionSystem & val, istream& in, unsigned int version ) { byte temp; NifStream( temp, in, version ); val = MotionSystem(temp); } -void NifStream( MotionSystem const & val, ostream& out, uint version ) { +void NifStream( MotionSystem const & val, ostream& out, unsigned int version ) { NifStream( byte(val), out, version ); } @@ -413,21 +413,21 @@ ostream & operator<<( ostream & out, MotionSystem const & val ) { switch ( val ) { case MO_SYS_BOX: return out << "MO_SYS_BOX"; case MO_SYS_KEYFRAMED: return out << "MO_SYS_KEYFRAMED"; - default: return out << "Invalid Value! - " << uint(val); + default: return out << "Invalid Value! - " << unsigned int(val); } } //--BillboardMode--// -void NifStream( BillboardMode & val, istream& in, uint version ) { - ushort temp; +void NifStream( BillboardMode & val, istream& in, unsigned int version ) { + unsigned short temp; NifStream( temp, in, version ); val = BillboardMode(temp); } -void NifStream( BillboardMode const & val, ostream& out, uint version ) { - NifStream( ushort(val), out, version ); +void NifStream( BillboardMode const & val, ostream& out, unsigned int version ) { + NifStream( unsigned short(val), out, version ); } ostream & operator<<( ostream & out, BillboardMode const & val ) { @@ -437,21 +437,21 @@ ostream & operator<<( ostream & out, BillboardMode const & val ) { case RIGID_FACE_CAMERA: return out << "RIGID_FACE_CAMERA"; case ALWAYS_FACE_CENTER: return out << "ALWAYS_FACE_CENTER"; case RIGID_FACE_CENTER: return out << "RIGID_FACE_CENTER"; - default: return out << "Invalid Value! - " << uint(val); + default: return out << "Invalid Value! - " << unsigned int(val); } } //--TexType--// -void NifStream( TexType & val, istream& in, uint version ) { - uint temp; +void NifStream( TexType & val, istream& in, unsigned int version ) { + unsigned int temp; NifStream( temp, in, version ); val = TexType(temp); } -void NifStream( TexType const & val, ostream& out, uint version ) { - NifStream( uint(val), out, version ); +void NifStream( TexType const & val, ostream& out, unsigned int version ) { + NifStream( unsigned int(val), out, version ); } ostream & operator<<( ostream & out, TexType const & val ) { @@ -464,21 +464,21 @@ ostream & operator<<( ostream & out, TexType const & val ) { case BUMP_MAP: return out << "BUMP_MAP"; case DECAL_0_MAP: return out << "DECAL_0_MAP"; case DECAL_1_MAP: return out << "DECAL_1_MAP"; - default: return out << "Invalid Value! - " << uint(val); + default: return out << "Invalid Value! - " << unsigned int(val); } } //--PixelLayout--// -void NifStream( PixelLayout & val, istream& in, uint version ) { - uint temp; +void NifStream( PixelLayout & val, istream& in, unsigned int version ) { + unsigned int temp; NifStream( temp, in, version ); val = PixelLayout(temp); } -void NifStream( PixelLayout const & val, ostream& out, uint version ) { - NifStream( uint(val), out, version ); +void NifStream( PixelLayout const & val, ostream& out, unsigned int version ) { + NifStream( unsigned int(val), out, version ); } ostream & operator<<( ostream & out, PixelLayout const & val ) { @@ -489,21 +489,21 @@ ostream & operator<<( ostream & out, PixelLayout const & val ) { case PIX_LAY_COMPRESSED: return out << "PIX_LAY_COMPRESSED"; case PIX_LAY_BUMPMAP: return out << "PIX_LAY_BUMPMAP"; case PIX_LAY_DEFAULT: return out << "PIX_LAY_DEFAULT"; - default: return out << "Invalid Value! - " << uint(val); + default: return out << "Invalid Value! - " << unsigned int(val); } } //--TexClampMode--// -void NifStream( TexClampMode & val, istream& in, uint version ) { - uint temp; +void NifStream( TexClampMode & val, istream& in, unsigned int version ) { + unsigned int temp; NifStream( temp, in, version ); val = TexClampMode(temp); } -void NifStream( TexClampMode const & val, ostream& out, uint version ) { - NifStream( uint(val), out, version ); +void NifStream( TexClampMode const & val, ostream& out, unsigned int version ) { + NifStream( unsigned int(val), out, version ); } ostream & operator<<( ostream & out, TexClampMode const & val ) { @@ -512,20 +512,20 @@ ostream & operator<<( ostream & out, TexClampMode const & val ) { case CLAMP_S_WRAP_T: return out << "CLAMP_S_WRAP_T"; case WRAP_S_CLAMP_T: return out << "WRAP_S_CLAMP_T"; case WRAP_S_WRAP_T: return out << "WRAP_S_WRAP_T"; - default: return out << "Invalid Value! - " << uint(val); + default: return out << "Invalid Value! - " << unsigned int(val); } } //--MotionQuality--// -void NifStream( MotionQuality & val, istream& in, uint version ) { +void NifStream( MotionQuality & val, istream& in, unsigned int version ) { byte temp; NifStream( temp, in, version ); val = MotionQuality(temp); } -void NifStream( MotionQuality const & val, ostream& out, uint version ) { +void NifStream( MotionQuality const & val, ostream& out, unsigned int version ) { NifStream( byte(val), out, version ); } @@ -540,21 +540,21 @@ ostream & operator<<( ostream & out, MotionQuality const & val ) { case MO_QUAL_BULLET: return out << "MO_QUAL_BULLET"; case MO_QUAL_USER: return out << "MO_QUAL_USER"; case MO_QUAL_NULL: return out << "MO_QUAL_NULL"; - default: return out << "Invalid Value! - " << uint(val); + default: return out << "Invalid Value! - " << unsigned int(val); } } //--PixelFormat--// -void NifStream( PixelFormat & val, istream& in, uint version ) { - uint temp; +void NifStream( PixelFormat & val, istream& in, unsigned int version ) { + unsigned int temp; NifStream( temp, in, version ); val = PixelFormat(temp); } -void NifStream( PixelFormat const & val, ostream& out, uint version ) { - NifStream( uint(val), out, version ); +void NifStream( PixelFormat const & val, ostream& out, unsigned int version ) { + NifStream( unsigned int(val), out, version ); } ostream & operator<<( ostream & out, PixelFormat const & val ) { @@ -562,21 +562,21 @@ ostream & operator<<( ostream & out, PixelFormat const & val ) { case PX_FMT_RGB8: return out << "PX_FMT_RGB8"; case PX_FMT_RGBA8: return out << "PX_FMT_RGBA8"; case PX_FMT_PAL8: return out << "PX_FMT_PAL8"; - default: return out << "Invalid Value! - " << uint(val); + default: return out << "Invalid Value! - " << unsigned int(val); } } //--CycleType--// -void NifStream( CycleType & val, istream& in, uint version ) { - uint temp; +void NifStream( CycleType & val, istream& in, unsigned int version ) { + unsigned int temp; NifStream( temp, in, version ); val = CycleType(temp); } -void NifStream( CycleType const & val, ostream& out, uint version ) { - NifStream( uint(val), out, version ); +void NifStream( CycleType const & val, ostream& out, unsigned int version ) { + NifStream( unsigned int(val), out, version ); } ostream & operator<<( ostream & out, CycleType const & val ) { @@ -584,28 +584,28 @@ ostream & operator<<( ostream & out, CycleType const & val ) { case CYCLE_LOOP: return out << "CYCLE_LOOP"; case CYCLE_REVERSE: return out << "CYCLE_REVERSE"; case CYCLE_CLAMP: return out << "CYCLE_CLAMP"; - default: return out << "Invalid Value! - " << uint(val); + default: return out << "Invalid Value! - " << unsigned int(val); } } //--FieldType--// -void NifStream( FieldType & val, istream& in, uint version ) { - uint temp; +void NifStream( FieldType & val, istream& in, unsigned int version ) { + unsigned int temp; NifStream( temp, in, version ); val = FieldType(temp); } -void NifStream( FieldType const & val, ostream& out, uint version ) { - NifStream( uint(val), out, version ); +void NifStream( FieldType const & val, ostream& out, unsigned int version ) { + NifStream( unsigned int(val), out, version ); } ostream & operator<<( ostream & out, FieldType const & val ) { switch ( val ) { case FIELD_WIND: return out << "FIELD_WIND"; case FIELD_POINT: return out << "FIELD_POINT"; - default: return out << "Invalid Value! - " << uint(val); + default: return out << "Invalid Value! - " << unsigned int(val); } } diff --git a/src/gen/hkTriangle.cpp b/src/gen/hkTriangle.cpp index 4475a6bf523b068240aebd369397ea7b92671f67..6ffcec585bebc4c65846729081b0325332ea3869 100644 --- a/src/gen/hkTriangle.cpp +++ b/src/gen/hkTriangle.cpp @@ -5,7 +5,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Constructor -hkTriangle::hkTriangle() : unknownShort((ushort)0) {}; +hkTriangle::hkTriangle() : unknownShort((unsigned short)0) {}; //Copy Constructor hkTriangle::hkTriangle( const hkTriangle & src ) { diff --git a/src/gen/obj_impl.cpp b/src/gen/obj_impl.cpp index f15cc6d8c3f94e065fe5745b71ff54349c61f448..8033a7e06516f18e78b5a690922e27eaabcb7c8d 100644 --- a/src/gen/obj_impl.cpp +++ b/src/gen/obj_impl.cpp @@ -222,19 +222,19 @@ Ref<T> FixLink( const map<unsigned,NiObjectRef> & objects, list<unsigned int> & return object; } -void NiObject::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiObject::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { } -void NiObject::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiObject::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { } std::string NiObject::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; return out.str(); } -void NiObject::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiObject::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { } std::list<NiObjectRef> NiObject::InternalGetRefs() const { @@ -242,22 +242,22 @@ std::list<NiObjectRef> NiObject::InternalGetRefs() const { return refs; } -void AKeyedData::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void AKeyedData::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiObject::Read( in, link_stack, version, user_version ); } -void AKeyedData::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void AKeyedData::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { NiObject::Write( out, link_map, version, user_version ); } std::string AKeyedData::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << NiObject::asString(); return out.str(); } -void AKeyedData::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void AKeyedData::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiObject::FixLinks( objects, link_stack, version, user_version ); } @@ -267,8 +267,8 @@ std::list<NiObjectRef> AKeyedData::InternalGetRefs() const { return refs; } -void AParticleModifier::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { - uint block_num; +void AParticleModifier::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { + unsigned int block_num; NiObject::Read( in, link_stack, version, user_version ); NifStream( block_num, in, version ); link_stack.push_back( block_num ); @@ -276,7 +276,7 @@ void AParticleModifier::InternalRead( istream& in, list<uint> & link_stack, unsi link_stack.push_back( block_num ); } -void AParticleModifier::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void AParticleModifier::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { NiObject::Write( out, link_map, version, user_version ); if ( nextModifier != NULL ) NifStream( link_map.find( StaticCast<NiObject>(nextModifier) )->second, out, version ); @@ -290,14 +290,14 @@ void AParticleModifier::InternalWrite( ostream& out, const map<NiObjectRef,uint> std::string AParticleModifier::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << NiObject::asString(); out << " Next Modifier: " << nextModifier << endl; out << " Controller: " << controller << endl; return out.str(); } -void AParticleModifier::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void AParticleModifier::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiObject::FixLinks( objects, link_stack, version, user_version ); nextModifier = FixLink<AParticleModifier>( objects, link_stack, version ); controller = FixLink<NiParticleSystemController>( objects, link_stack, version ); @@ -311,22 +311,22 @@ std::list<NiObjectRef> AParticleModifier::InternalGetRefs() const { return refs; } -void bhkRefObject::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void bhkRefObject::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiObject::Read( in, link_stack, version, user_version ); } -void bhkRefObject::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void bhkRefObject::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { NiObject::Write( out, link_map, version, user_version ); } std::string bhkRefObject::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << NiObject::asString(); return out.str(); } -void bhkRefObject::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void bhkRefObject::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiObject::FixLinks( objects, link_stack, version, user_version ); } @@ -336,22 +336,22 @@ std::list<NiObjectRef> bhkRefObject::InternalGetRefs() const { return refs; } -void bhkSerializable::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void bhkSerializable::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { bhkRefObject::Read( in, link_stack, version, user_version ); } -void bhkSerializable::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void bhkSerializable::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { bhkRefObject::Write( out, link_map, version, user_version ); } std::string bhkSerializable::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << bhkRefObject::asString(); return out.str(); } -void bhkSerializable::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void bhkSerializable::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { bhkRefObject::FixLinks( objects, link_stack, version, user_version ); } @@ -361,23 +361,23 @@ std::list<NiObjectRef> bhkSerializable::InternalGetRefs() const { return refs; } -void AbhkConstraint::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { - uint block_num; +void AbhkConstraint::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { + unsigned int block_num; bhkSerializable::Read( in, link_stack, version, user_version ); NifStream( numBodies, in, version ); bodies.resize(numBodies); - for (uint i1 = 0; i1 < bodies.size(); i1++) { + for (unsigned int i1 = 0; i1 < bodies.size(); i1++) { NifStream( block_num, in, version ); link_stack.push_back( block_num ); }; NifStream( priority, in, version ); } -void AbhkConstraint::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void AbhkConstraint::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { bhkSerializable::Write( out, link_map, version, user_version ); - numBodies = uint(bodies.size()); + numBodies = unsigned int(bodies.size()); NifStream( numBodies, out, version ); - for (uint i1 = 0; i1 < bodies.size(); i1++) { + for (unsigned int i1 = 0; i1 < bodies.size(); i1++) { if ( bodies[i1] != NULL ) NifStream( link_map.find( StaticCast<NiObject>(bodies[i1]) )->second, out, version ); else @@ -388,12 +388,12 @@ void AbhkConstraint::InternalWrite( ostream& out, const map<NiObjectRef,uint> & std::string AbhkConstraint::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << bhkSerializable::asString(); - numBodies = uint(bodies.size()); + numBodies = unsigned int(bodies.size()); out << " Num Bodies: " << numBodies << endl; array_output_count = 0; - for (uint i1 = 0; i1 < bodies.size(); i1++) { + for (unsigned int i1 = 0; i1 < bodies.size(); i1++) { if ( !verbose && ( array_output_count > MAXARRAYDUMP ) ) { out << "<Data Truncated. Use verbose mode to see complete listing.>" << endl; break; @@ -408,9 +408,9 @@ std::string AbhkConstraint::InternalAsString( bool verbose ) const { return out.str(); } -void AbhkConstraint::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void AbhkConstraint::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { bhkSerializable::FixLinks( objects, link_stack, version, user_version ); - for (uint i1 = 0; i1 < bodies.size(); i1++) { + for (unsigned int i1 = 0; i1 < bodies.size(); i1++) { bodies[i1] = FixLink<bhkShape>( objects, link_stack, version ); }; } @@ -418,12 +418,12 @@ void AbhkConstraint::InternalFixLinks( const map<unsigned int,NiObjectRef> & obj std::list<NiObjectRef> AbhkConstraint::InternalGetRefs() const { list<Ref<NiObject> > refs; refs = bhkSerializable::GetRefs(); - for (uint i1 = 0; i1 < bodies.size(); i1++) { + for (unsigned int i1 = 0; i1 < bodies.size(); i1++) { }; return refs; } -void AbhkRagdollConstraint::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void AbhkRagdollConstraint::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { AbhkConstraint::Read( in, link_stack, version, user_version ); NifStream( pivotA, in, version ); NifStream( planeA, in, version ); @@ -439,7 +439,7 @@ void AbhkRagdollConstraint::InternalRead( istream& in, list<uint> & link_stack, NifStream( maxFriction, in, version ); } -void AbhkRagdollConstraint::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void AbhkRagdollConstraint::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { AbhkConstraint::Write( out, link_map, version, user_version ); NifStream( pivotA, out, version ); NifStream( planeA, out, version ); @@ -457,7 +457,7 @@ void AbhkRagdollConstraint::InternalWrite( ostream& out, const map<NiObjectRef,u std::string AbhkRagdollConstraint::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << AbhkConstraint::asString(); out << " Pivot A: " << pivotA << endl; out << " Plane A: " << planeA << endl; @@ -474,7 +474,7 @@ std::string AbhkRagdollConstraint::InternalAsString( bool verbose ) const { return out.str(); } -void AbhkRagdollConstraint::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void AbhkRagdollConstraint::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { AbhkConstraint::FixLinks( objects, link_stack, version, user_version ); } @@ -484,22 +484,22 @@ std::list<NiObjectRef> AbhkRagdollConstraint::InternalGetRefs() const { return refs; } -void bhkShape::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void bhkShape::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { bhkSerializable::Read( in, link_stack, version, user_version ); } -void bhkShape::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void bhkShape::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { bhkSerializable::Write( out, link_map, version, user_version ); } std::string bhkShape::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << bhkSerializable::asString(); return out.str(); } -void bhkShape::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void bhkShape::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { bhkSerializable::FixLinks( objects, link_stack, version, user_version ); } @@ -509,22 +509,22 @@ std::list<NiObjectRef> bhkShape::InternalGetRefs() const { return refs; } -void AbhkShapeCollection::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void AbhkShapeCollection::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { bhkShape::Read( in, link_stack, version, user_version ); } -void AbhkShapeCollection::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void AbhkShapeCollection::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { bhkShape::Write( out, link_map, version, user_version ); } std::string AbhkShapeCollection::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << bhkShape::asString(); return out.str(); } -void AbhkShapeCollection::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void AbhkShapeCollection::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { bhkShape::FixLinks( objects, link_stack, version, user_version ); } @@ -534,25 +534,25 @@ std::list<NiObjectRef> AbhkShapeCollection::InternalGetRefs() const { return refs; } -void bhkSphereRepShape::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void bhkSphereRepShape::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { bhkShape::Read( in, link_stack, version, user_version ); NifStream( material, in, version ); } -void bhkSphereRepShape::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void bhkSphereRepShape::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { bhkShape::Write( out, link_map, version, user_version ); NifStream( material, out, version ); } std::string bhkSphereRepShape::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << bhkShape::asString(); out << " Material: " << material << endl; return out.str(); } -void bhkSphereRepShape::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void bhkSphereRepShape::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { bhkShape::FixLinks( objects, link_stack, version, user_version ); } @@ -562,22 +562,22 @@ std::list<NiObjectRef> bhkSphereRepShape::InternalGetRefs() const { return refs; } -void bhkConvexShape::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void bhkConvexShape::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { bhkSphereRepShape::Read( in, link_stack, version, user_version ); } -void bhkConvexShape::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void bhkConvexShape::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { bhkSphereRepShape::Write( out, link_map, version, user_version ); } std::string bhkConvexShape::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << bhkSphereRepShape::asString(); return out.str(); } -void bhkConvexShape::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void bhkConvexShape::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { bhkSphereRepShape::FixLinks( objects, link_stack, version, user_version ); } @@ -587,22 +587,22 @@ std::list<NiObjectRef> bhkConvexShape::InternalGetRefs() const { return refs; } -void bhkWorldObject::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void bhkWorldObject::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { bhkShape::Read( in, link_stack, version, user_version ); } -void bhkWorldObject::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void bhkWorldObject::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { bhkShape::Write( out, link_map, version, user_version ); } std::string bhkWorldObject::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << bhkShape::asString(); return out.str(); } -void bhkWorldObject::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void bhkWorldObject::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { bhkShape::FixLinks( objects, link_stack, version, user_version ); } @@ -612,8 +612,8 @@ std::list<NiObjectRef> bhkWorldObject::InternalGetRefs() const { return refs; } -void bhkEntity::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { - uint block_num; +void bhkEntity::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { + unsigned int block_num; bhkWorldObject::Read( in, link_stack, version, user_version ); NifStream( block_num, in, version ); link_stack.push_back( block_num ); @@ -622,7 +622,7 @@ void bhkEntity::InternalRead( istream& in, list<uint> & link_stack, unsigned int NifStream( unknownShort, in, version ); } -void bhkEntity::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void bhkEntity::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { bhkWorldObject::Write( out, link_map, version, user_version ); if ( shape != NULL ) NifStream( link_map.find( StaticCast<NiObject>(shape) )->second, out, version ); @@ -635,7 +635,7 @@ void bhkEntity::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_ std::string bhkEntity::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << bhkWorldObject::asString(); out << " Shape: " << shape << endl; out << " Layer: " << layer << endl; @@ -644,7 +644,7 @@ std::string bhkEntity::InternalAsString( bool verbose ) const { return out.str(); } -void bhkEntity::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void bhkEntity::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { bhkWorldObject::FixLinks( objects, link_stack, version, user_version ); shape = FixLink<bhkShape>( objects, link_stack, version ); } @@ -657,8 +657,8 @@ std::list<NiObjectRef> bhkEntity::InternalGetRefs() const { return refs; } -void NiCollisionObject::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { - uint block_num; +void NiCollisionObject::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { + unsigned int block_num; NiObject::Read( in, link_stack, version, user_version ); NifStream( block_num, in, version ); link_stack.push_back( block_num ); @@ -667,7 +667,7 @@ void NiCollisionObject::InternalRead( istream& in, list<uint> & link_stack, unsi link_stack.push_back( block_num ); } -void NiCollisionObject::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiCollisionObject::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { NiObject::Write( out, link_map, version, user_version ); if ( parent != NULL ) NifStream( link_map.find( StaticCast<NiObject>(parent) )->second, out, version ); @@ -682,7 +682,7 @@ void NiCollisionObject::InternalWrite( ostream& out, const map<NiObjectRef,uint> std::string NiCollisionObject::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << NiObject::asString(); out << " Parent: " << parent << endl; out << " Unknown Short: " << unknownShort << endl; @@ -690,7 +690,7 @@ std::string NiCollisionObject::InternalAsString( bool verbose ) const { return out.str(); } -void NiCollisionObject::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiCollisionObject::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiObject::FixLinks( objects, link_stack, version, user_version ); parent = FixLink<NiAVObject>( objects, link_stack, version ); body = FixLink<NiObject>( objects, link_stack, version ); @@ -704,8 +704,8 @@ std::list<NiObjectRef> NiCollisionObject::InternalGetRefs() const { return refs; } -void NiExtraData::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { - uint block_num; +void NiExtraData::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { + unsigned int block_num; NiObject::Read( in, link_stack, version, user_version ); if ( version >= 0x0A000100 ) { NifStream( name, in, version ); @@ -716,7 +716,7 @@ void NiExtraData::InternalRead( istream& in, list<uint> & link_stack, unsigned i }; } -void NiExtraData::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiExtraData::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { NiObject::Write( out, link_map, version, user_version ); if ( version >= 0x0A000100 ) { NifStream( name, out, version ); @@ -731,14 +731,14 @@ void NiExtraData::InternalWrite( ostream& out, const map<NiObjectRef,uint> & lin std::string NiExtraData::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << NiObject::asString(); out << " Name: " << name << endl; out << " Next Extra Data: " << nextExtraData << endl; return out.str(); } -void NiExtraData::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiExtraData::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiObject::FixLinks( objects, link_stack, version, user_version ); if ( version <= 0x04020200 ) { nextExtraData = FixLink<NiExtraData>( objects, link_stack, version ); @@ -753,22 +753,22 @@ std::list<NiObjectRef> NiExtraData::InternalGetRefs() const { return refs; } -void NiInterpolator::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiInterpolator::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiObject::Read( in, link_stack, version, user_version ); } -void NiInterpolator::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiInterpolator::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { NiObject::Write( out, link_map, version, user_version ); } std::string NiInterpolator::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << NiObject::asString(); return out.str(); } -void NiInterpolator::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiInterpolator::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiObject::FixLinks( objects, link_stack, version, user_version ); } @@ -778,13 +778,13 @@ std::list<NiObjectRef> NiInterpolator::InternalGetRefs() const { return refs; } -void NiBlendInterpolator::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiBlendInterpolator::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiInterpolator::Read( in, link_stack, version, user_version ); NifStream( unknownShort, in, version ); NifStream( unknownInt, in, version ); } -void NiBlendInterpolator::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiBlendInterpolator::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { NiInterpolator::Write( out, link_map, version, user_version ); NifStream( unknownShort, out, version ); NifStream( unknownInt, out, version ); @@ -792,14 +792,14 @@ void NiBlendInterpolator::InternalWrite( ostream& out, const map<NiObjectRef,uin std::string NiBlendInterpolator::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << NiInterpolator::asString(); out << " Unknown Short: " << unknownShort << endl; out << " Unknown Int: " << unknownInt << endl; return out.str(); } -void NiBlendInterpolator::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiBlendInterpolator::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiInterpolator::FixLinks( objects, link_stack, version, user_version ); } @@ -809,8 +809,8 @@ std::list<NiObjectRef> NiBlendInterpolator::InternalGetRefs() const { return refs; } -void NiBSplineInterpolator::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { - uint block_num; +void NiBSplineInterpolator::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { + unsigned int block_num; NiInterpolator::Read( in, link_stack, version, user_version ); NifStream( startTime, in, version ); NifStream( stopTime, in, version ); @@ -820,7 +820,7 @@ void NiBSplineInterpolator::InternalRead( istream& in, list<uint> & link_stack, link_stack.push_back( block_num ); } -void NiBSplineInterpolator::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiBSplineInterpolator::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { NiInterpolator::Write( out, link_map, version, user_version ); NifStream( startTime, out, version ); NifStream( stopTime, out, version ); @@ -836,7 +836,7 @@ void NiBSplineInterpolator::InternalWrite( ostream& out, const map<NiObjectRef,u std::string NiBSplineInterpolator::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << NiInterpolator::asString(); out << " Start Time: " << startTime << endl; out << " Stop Time: " << stopTime << endl; @@ -845,7 +845,7 @@ std::string NiBSplineInterpolator::InternalAsString( bool verbose ) const { return out.str(); } -void NiBSplineInterpolator::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiBSplineInterpolator::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiInterpolator::FixLinks( objects, link_stack, version, user_version ); splineData = FixLink<NiBSplineData>( objects, link_stack, version ); basisData = FixLink<NiBSplineBasisData>( objects, link_stack, version ); @@ -861,8 +861,8 @@ std::list<NiObjectRef> NiBSplineInterpolator::InternalGetRefs() const { return refs; } -void NiObjectNET::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { - uint block_num; +void NiObjectNET::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { + unsigned int block_num; NiObject::Read( in, link_stack, version, user_version ); NifStream( name, in, version ); if ( version <= 0x04020200 ) { @@ -872,7 +872,7 @@ void NiObjectNET::InternalRead( istream& in, list<uint> & link_stack, unsigned i if ( version >= 0x0A000100 ) { NifStream( numExtraDataList, in, version ); extraDataList.resize(numExtraDataList); - for (uint i2 = 0; i2 < extraDataList.size(); i2++) { + for (unsigned int i2 = 0; i2 < extraDataList.size(); i2++) { NifStream( block_num, in, version ); link_stack.push_back( block_num ); }; @@ -881,9 +881,9 @@ void NiObjectNET::InternalRead( istream& in, list<uint> & link_stack, unsigned i link_stack.push_back( block_num ); } -void NiObjectNET::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiObjectNET::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { NiObject::Write( out, link_map, version, user_version ); - numExtraDataList = uint(extraDataList.size()); + numExtraDataList = unsigned int(extraDataList.size()); NifStream( name, out, version ); if ( version <= 0x04020200 ) { if ( extraData != NULL ) @@ -893,7 +893,7 @@ void NiObjectNET::InternalWrite( ostream& out, const map<NiObjectRef,uint> & lin }; if ( version >= 0x0A000100 ) { NifStream( numExtraDataList, out, version ); - for (uint i2 = 0; i2 < extraDataList.size(); i2++) { + for (unsigned int i2 = 0; i2 < extraDataList.size(); i2++) { if ( extraDataList[i2] != NULL ) NifStream( link_map.find( StaticCast<NiObject>(extraDataList[i2]) )->second, out, version ); else @@ -908,14 +908,14 @@ void NiObjectNET::InternalWrite( ostream& out, const map<NiObjectRef,uint> & lin std::string NiObjectNET::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << NiObject::asString(); - numExtraDataList = uint(extraDataList.size()); + numExtraDataList = unsigned int(extraDataList.size()); out << " Name: " << name << endl; out << " Extra Data: " << extraData << endl; out << " Num Extra Data List: " << numExtraDataList << endl; array_output_count = 0; - for (uint i1 = 0; i1 < extraDataList.size(); i1++) { + for (unsigned int i1 = 0; i1 < extraDataList.size(); i1++) { if ( !verbose && ( array_output_count > MAXARRAYDUMP ) ) { out << "<Data Truncated. Use verbose mode to see complete listing.>" << endl; break; @@ -930,13 +930,13 @@ std::string NiObjectNET::InternalAsString( bool verbose ) const { return out.str(); } -void NiObjectNET::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiObjectNET::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiObject::FixLinks( objects, link_stack, version, user_version ); if ( version <= 0x04020200 ) { extraData = FixLink<NiExtraData>( objects, link_stack, version ); }; if ( version >= 0x0A000100 ) { - for (uint i2 = 0; i2 < extraDataList.size(); i2++) { + for (unsigned int i2 = 0; i2 < extraDataList.size(); i2++) { extraDataList[i2] = FixLink<NiExtraData>( objects, link_stack, version ); }; }; @@ -948,7 +948,7 @@ std::list<NiObjectRef> NiObjectNET::InternalGetRefs() const { refs = NiObject::GetRefs(); if ( extraData != NULL ) refs.push_back(StaticCast<NiObject>(extraData)); - for (uint i1 = 0; i1 < extraDataList.size(); i1++) { + for (unsigned int i1 = 0; i1 < extraDataList.size(); i1++) { if ( extraDataList[i1] != NULL ) refs.push_back(StaticCast<NiObject>(extraDataList[i1])); }; @@ -957,8 +957,8 @@ std::list<NiObjectRef> NiObjectNET::InternalGetRefs() const { return refs; } -void NiAVObject::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { - uint block_num; +void NiAVObject::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { + unsigned int block_num; NiObjectNET::Read( in, link_stack, version, user_version ); NifStream( flags, in, version ); NifStream( translation, in, version ); @@ -969,7 +969,7 @@ void NiAVObject::InternalRead( istream& in, list<uint> & link_stack, unsigned in }; NifStream( numProperties, in, version ); properties.resize(numProperties); - for (uint i1 = 0; i1 < properties.size(); i1++) { + for (unsigned int i1 = 0; i1 < properties.size(); i1++) { NifStream( block_num, in, version ); link_stack.push_back( block_num ); }; @@ -992,9 +992,9 @@ void NiAVObject::InternalRead( istream& in, list<uint> & link_stack, unsigned in }; } -void NiAVObject::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiAVObject::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { NiObjectNET::Write( out, link_map, version, user_version ); - numProperties = uint(properties.size()); + numProperties = unsigned int(properties.size()); NifStream( flags, out, version ); NifStream( translation, out, version ); NifStream( rotation, out, version ); @@ -1003,7 +1003,7 @@ void NiAVObject::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link NifStream( velocity, out, version ); }; NifStream( numProperties, out, version ); - for (uint i1 = 0; i1 < properties.size(); i1++) { + for (unsigned int i1 = 0; i1 < properties.size(); i1++) { if ( properties[i1] != NULL ) NifStream( link_map.find( StaticCast<NiObject>(properties[i1]) )->second, out, version ); else @@ -1034,9 +1034,9 @@ void NiAVObject::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link std::string NiAVObject::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << NiObjectNET::asString(); - numProperties = uint(properties.size()); + numProperties = unsigned int(properties.size()); out << " Flags: " << flags << endl; out << " Translation: " << translation << endl; out << " Rotation: " << rotation << endl; @@ -1044,7 +1044,7 @@ std::string NiAVObject::InternalAsString( bool verbose ) const { out << " Velocity: " << velocity << endl; out << " Num Properties: " << numProperties << endl; array_output_count = 0; - for (uint i1 = 0; i1 < properties.size(); i1++) { + for (unsigned int i1 = 0; i1 < properties.size(); i1++) { if ( !verbose && ( array_output_count > MAXARRAYDUMP ) ) { out << "<Data Truncated. Use verbose mode to see complete listing.>" << endl; break; @@ -1067,9 +1067,9 @@ std::string NiAVObject::InternalAsString( bool verbose ) const { return out.str(); } -void NiAVObject::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiAVObject::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiObjectNET::FixLinks( objects, link_stack, version, user_version ); - for (uint i1 = 0; i1 < properties.size(); i1++) { + for (unsigned int i1 = 0; i1 < properties.size(); i1++) { properties[i1] = FixLink<NiProperty>( objects, link_stack, version ); }; if ( ( version >= 0x0A000100 ) && ( version <= 0x0A020000 ) ) { @@ -1083,7 +1083,7 @@ void NiAVObject::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects std::list<NiObjectRef> NiAVObject::InternalGetRefs() const { list<Ref<NiObject> > refs; refs = NiObjectNET::GetRefs(); - for (uint i1 = 0; i1 < properties.size(); i1++) { + for (unsigned int i1 = 0; i1 < properties.size(); i1++) { if ( properties[i1] != NULL ) refs.push_back(StaticCast<NiObject>(properties[i1])); }; @@ -1094,8 +1094,8 @@ std::list<NiObjectRef> NiAVObject::InternalGetRefs() const { return refs; } -void NiDynamicEffect::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { - uint block_num; +void NiDynamicEffect::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { + unsigned int block_num; NiAVObject::Read( in, link_stack, version, user_version ); if ( version >= 0x0A020000 ) { NifStream( switchState, in, version ); @@ -1103,35 +1103,35 @@ void NiDynamicEffect::InternalRead( istream& in, list<uint> & link_stack, unsign if ( version <= 0x04000002 ) { NifStream( numAffectedNodes, in, version ); affectedNodeListPointers.resize(numAffectedNodes); - for (uint i2 = 0; i2 < affectedNodeListPointers.size(); i2++) { + for (unsigned int i2 = 0; i2 < affectedNodeListPointers.size(); i2++) { NifStream( affectedNodeListPointers[i2], in, version ); }; }; if ( version >= 0x0A010000 ) { NifStream( numAffectedNodes, in, version ); affectedNodes.resize(numAffectedNodes); - for (uint i2 = 0; i2 < affectedNodes.size(); i2++) { + for (unsigned int i2 = 0; i2 < affectedNodes.size(); i2++) { NifStream( block_num, in, version ); link_stack.push_back( block_num ); }; }; } -void NiDynamicEffect::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiDynamicEffect::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { NiAVObject::Write( out, link_map, version, user_version ); - numAffectedNodes = uint(affectedNodeListPointers.size()); + numAffectedNodes = unsigned int(affectedNodeListPointers.size()); if ( version >= 0x0A020000 ) { NifStream( switchState, out, version ); }; if ( version <= 0x04000002 ) { NifStream( numAffectedNodes, out, version ); - for (uint i2 = 0; i2 < affectedNodeListPointers.size(); i2++) { + for (unsigned int i2 = 0; i2 < affectedNodeListPointers.size(); i2++) { NifStream( affectedNodeListPointers[i2], out, version ); }; }; if ( version >= 0x0A010000 ) { NifStream( numAffectedNodes, out, version ); - for (uint i2 = 0; i2 < affectedNodes.size(); i2++) { + for (unsigned int i2 = 0; i2 < affectedNodes.size(); i2++) { if ( affectedNodes[i2] != NULL ) NifStream( link_map.find( StaticCast<NiObject>(affectedNodes[i2]) )->second, out, version ); else @@ -1142,13 +1142,13 @@ void NiDynamicEffect::InternalWrite( ostream& out, const map<NiObjectRef,uint> & std::string NiDynamicEffect::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << NiAVObject::asString(); - numAffectedNodes = uint(affectedNodeListPointers.size()); + numAffectedNodes = unsigned int(affectedNodeListPointers.size()); out << " Switch State: " << switchState << endl; out << " Num Affected Nodes: " << numAffectedNodes << endl; array_output_count = 0; - for (uint i1 = 0; i1 < affectedNodeListPointers.size(); i1++) { + for (unsigned int i1 = 0; i1 < affectedNodeListPointers.size(); i1++) { if ( !verbose && ( array_output_count > MAXARRAYDUMP ) ) { out << "<Data Truncated. Use verbose mode to see complete listing.>" << endl; break; @@ -1160,7 +1160,7 @@ std::string NiDynamicEffect::InternalAsString( bool verbose ) const { array_output_count++; }; array_output_count = 0; - for (uint i1 = 0; i1 < affectedNodes.size(); i1++) { + for (unsigned int i1 = 0; i1 < affectedNodes.size(); i1++) { if ( !verbose && ( array_output_count > MAXARRAYDUMP ) ) { out << "<Data Truncated. Use verbose mode to see complete listing.>" << endl; break; @@ -1174,10 +1174,10 @@ std::string NiDynamicEffect::InternalAsString( bool verbose ) const { return out.str(); } -void NiDynamicEffect::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiDynamicEffect::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiAVObject::FixLinks( objects, link_stack, version, user_version ); if ( version >= 0x0A010000 ) { - for (uint i2 = 0; i2 < affectedNodes.size(); i2++) { + for (unsigned int i2 = 0; i2 < affectedNodes.size(); i2++) { affectedNodes[i2] = FixLink<NiAVObject>( objects, link_stack, version ); }; }; @@ -1186,14 +1186,14 @@ void NiDynamicEffect::InternalFixLinks( const map<unsigned int,NiObjectRef> & ob std::list<NiObjectRef> NiDynamicEffect::InternalGetRefs() const { list<Ref<NiObject> > refs; refs = NiAVObject::GetRefs(); - for (uint i1 = 0; i1 < affectedNodes.size(); i1++) { + for (unsigned int i1 = 0; i1 < affectedNodes.size(); i1++) { if ( affectedNodes[i1] != NULL ) refs.push_back(StaticCast<NiObject>(affectedNodes[i1])); }; return refs; } -void NiLight::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiLight::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiDynamicEffect::Read( in, link_stack, version, user_version ); NifStream( dimmer, in, version ); NifStream( ambientColor, in, version ); @@ -1201,7 +1201,7 @@ void NiLight::InternalRead( istream& in, list<uint> & link_stack, unsigned int v NifStream( specularColor, in, version ); } -void NiLight::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiLight::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { NiDynamicEffect::Write( out, link_map, version, user_version ); NifStream( dimmer, out, version ); NifStream( ambientColor, out, version ); @@ -1211,7 +1211,7 @@ void NiLight::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_ma std::string NiLight::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << NiDynamicEffect::asString(); out << " Dimmer: " << dimmer << endl; out << " Ambient Color: " << ambientColor << endl; @@ -1220,7 +1220,7 @@ std::string NiLight::InternalAsString( bool verbose ) const { return out.str(); } -void NiLight::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiLight::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiDynamicEffect::FixLinks( objects, link_stack, version, user_version ); } @@ -1230,22 +1230,22 @@ std::list<NiObjectRef> NiLight::InternalGetRefs() const { return refs; } -void NiProperty::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiProperty::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiObjectNET::Read( in, link_stack, version, user_version ); } -void NiProperty::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiProperty::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { NiObjectNET::Write( out, link_map, version, user_version ); } std::string NiProperty::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << NiObjectNET::asString(); return out.str(); } -void NiProperty::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiProperty::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiObjectNET::FixLinks( objects, link_stack, version, user_version ); } @@ -1255,8 +1255,8 @@ std::list<NiObjectRef> NiProperty::InternalGetRefs() const { return refs; } -void NiPSysModifier::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { - uint block_num; +void NiPSysModifier::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { + unsigned int block_num; NiObject::Read( in, link_stack, version, user_version ); NifStream( name, in, version ); NifStream( order, in, version ); @@ -1265,7 +1265,7 @@ void NiPSysModifier::InternalRead( istream& in, list<uint> & link_stack, unsigne NifStream( active, in, version ); } -void NiPSysModifier::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiPSysModifier::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { NiObject::Write( out, link_map, version, user_version ); NifStream( name, out, version ); NifStream( order, out, version ); @@ -1278,7 +1278,7 @@ void NiPSysModifier::InternalWrite( ostream& out, const map<NiObjectRef,uint> & std::string NiPSysModifier::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << NiObject::asString(); out << " Name: " << name << endl; out << " Order: " << order << endl; @@ -1287,7 +1287,7 @@ std::string NiPSysModifier::InternalAsString( bool verbose ) const { return out.str(); } -void NiPSysModifier::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiPSysModifier::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiObject::FixLinks( objects, link_stack, version, user_version ); target = FixLink<NiParticleSystem>( objects, link_stack, version ); } @@ -1298,7 +1298,7 @@ std::list<NiObjectRef> NiPSysModifier::InternalGetRefs() const { return refs; } -void NiPSysEmitter::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiPSysEmitter::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiPSysModifier::Read( in, link_stack, version, user_version ); NifStream( speed, in, version ); NifStream( speedVariation, in, version ); @@ -1315,7 +1315,7 @@ void NiPSysEmitter::InternalRead( istream& in, list<uint> & link_stack, unsigned NifStream( lifeSpanVariation, in, version ); } -void NiPSysEmitter::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiPSysEmitter::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { NiPSysModifier::Write( out, link_map, version, user_version ); NifStream( speed, out, version ); NifStream( speedVariation, out, version ); @@ -1334,7 +1334,7 @@ void NiPSysEmitter::InternalWrite( ostream& out, const map<NiObjectRef,uint> & l std::string NiPSysEmitter::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << NiPSysModifier::asString(); out << " Speed: " << speed << endl; out << " Speed Variation: " << speedVariation << endl; @@ -1350,7 +1350,7 @@ std::string NiPSysEmitter::InternalAsString( bool verbose ) const { return out.str(); } -void NiPSysEmitter::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiPSysEmitter::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiPSysModifier::FixLinks( objects, link_stack, version, user_version ); } @@ -1360,8 +1360,8 @@ std::list<NiObjectRef> NiPSysEmitter::InternalGetRefs() const { return refs; } -void NiPSysVolumeEmitter::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { - uint block_num; +void NiPSysVolumeEmitter::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { + unsigned int block_num; NiPSysEmitter::Read( in, link_stack, version, user_version ); if ( version >= 0x0A010000 ) { NifStream( block_num, in, version ); @@ -1369,7 +1369,7 @@ void NiPSysVolumeEmitter::InternalRead( istream& in, list<uint> & link_stack, un }; } -void NiPSysVolumeEmitter::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiPSysVolumeEmitter::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { NiPSysEmitter::Write( out, link_map, version, user_version ); if ( version >= 0x0A010000 ) { if ( emitterObject != NULL ) @@ -1381,13 +1381,13 @@ void NiPSysVolumeEmitter::InternalWrite( ostream& out, const map<NiObjectRef,uin std::string NiPSysVolumeEmitter::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << NiPSysEmitter::asString(); out << " Emitter Object: " << emitterObject << endl; return out.str(); } -void NiPSysVolumeEmitter::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiPSysVolumeEmitter::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiPSysEmitter::FixLinks( objects, link_stack, version, user_version ); if ( version >= 0x0A010000 ) { emitterObject = FixLink<NiNode>( objects, link_stack, version ); @@ -1400,8 +1400,8 @@ std::list<NiObjectRef> NiPSysVolumeEmitter::InternalGetRefs() const { return refs; } -void NiTimeController::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { - uint block_num; +void NiTimeController::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { + unsigned int block_num; NiObject::Read( in, link_stack, version, user_version ); NifStream( block_num, in, version ); link_stack.push_back( block_num ); @@ -1414,7 +1414,7 @@ void NiTimeController::InternalRead( istream& in, list<uint> & link_stack, unsig link_stack.push_back( block_num ); } -void NiTimeController::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiTimeController::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { NiObject::Write( out, link_map, version, user_version ); if ( nextController != NULL ) NifStream( link_map.find( StaticCast<NiObject>(nextController) )->second, out, version ); @@ -1433,7 +1433,7 @@ void NiTimeController::InternalWrite( ostream& out, const map<NiObjectRef,uint> std::string NiTimeController::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << NiObject::asString(); out << " Next Controller: " << nextController << endl; out << " Flags: " << flags << endl; @@ -1445,7 +1445,7 @@ std::string NiTimeController::InternalAsString( bool verbose ) const { return out.str(); } -void NiTimeController::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiTimeController::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiObject::FixLinks( objects, link_stack, version, user_version ); nextController = FixLink<NiTimeController>( objects, link_stack, version ); target = FixLink<NiObjectNET>( objects, link_stack, version ); @@ -1459,33 +1459,33 @@ std::list<NiObjectRef> NiTimeController::InternalGetRefs() const { return refs; } -void ABoneLODController::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { - uint block_num; +void ABoneLODController::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { + unsigned int block_num; NiTimeController::Read( in, link_stack, version, user_version ); NifStream( unknownInt1, in, version ); NifStream( numNodeGroups, in, version ); NifStream( numNodeGroups2, in, version ); nodeGroups.resize(numNodeGroups); - for (uint i1 = 0; i1 < nodeGroups.size(); i1++) { + for (unsigned int i1 = 0; i1 < nodeGroups.size(); i1++) { NifStream( nodeGroups[i1].numNodes, in, version ); nodeGroups[i1].nodes.resize(nodeGroups[i1].numNodes); - for (uint i2 = 0; i2 < nodeGroups[i1].nodes.size(); i2++) { + for (unsigned int i2 = 0; i2 < nodeGroups[i1].nodes.size(); i2++) { NifStream( block_num, in, version ); link_stack.push_back( block_num ); }; }; } -void ABoneLODController::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void ABoneLODController::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { NiTimeController::Write( out, link_map, version, user_version ); - numNodeGroups = uint(nodeGroups.size()); + numNodeGroups = unsigned int(nodeGroups.size()); NifStream( unknownInt1, out, version ); NifStream( numNodeGroups, out, version ); NifStream( numNodeGroups2, out, version ); - for (uint i1 = 0; i1 < nodeGroups.size(); i1++) { - nodeGroups[i1].numNodes = uint(nodeGroups[i1].nodes.size()); + for (unsigned int i1 = 0; i1 < nodeGroups.size(); i1++) { + nodeGroups[i1].numNodes = unsigned int(nodeGroups[i1].nodes.size()); NifStream( nodeGroups[i1].numNodes, out, version ); - for (uint i2 = 0; i2 < nodeGroups[i1].nodes.size(); i2++) { + for (unsigned int i2 = 0; i2 < nodeGroups[i1].nodes.size(); i2++) { if ( nodeGroups[i1].nodes[i2] != NULL ) NifStream( link_map.find( StaticCast<NiObject>(nodeGroups[i1].nodes[i2]) )->second, out, version ); else @@ -1496,22 +1496,22 @@ void ABoneLODController::InternalWrite( ostream& out, const map<NiObjectRef,uint std::string ABoneLODController::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << NiTimeController::asString(); - numNodeGroups = uint(nodeGroups.size()); + numNodeGroups = unsigned int(nodeGroups.size()); out << " Unknown Int 1: " << unknownInt1 << endl; out << " Num Node Groups: " << numNodeGroups << endl; out << " Num Node Groups 2: " << numNodeGroups2 << endl; array_output_count = 0; - for (uint i1 = 0; i1 < nodeGroups.size(); i1++) { + for (unsigned int i1 = 0; i1 < nodeGroups.size(); i1++) { if ( !verbose && ( array_output_count > MAXARRAYDUMP ) ) { out << "<Data Truncated. Use verbose mode to see complete listing.>" << endl; break; }; - nodeGroups[i1].numNodes = uint(nodeGroups[i1].nodes.size()); + nodeGroups[i1].numNodes = unsigned int(nodeGroups[i1].nodes.size()); out << " Num Nodes: " << nodeGroups[i1].numNodes << endl; array_output_count = 0; - for (uint i2 = 0; i2 < nodeGroups[i1].nodes.size(); i2++) { + for (unsigned int i2 = 0; i2 < nodeGroups[i1].nodes.size(); i2++) { if ( !verbose && ( array_output_count > MAXARRAYDUMP ) ) { out << "<Data Truncated. Use verbose mode to see complete listing.>" << endl; break; @@ -1526,10 +1526,10 @@ std::string ABoneLODController::InternalAsString( bool verbose ) const { return out.str(); } -void ABoneLODController::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void ABoneLODController::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiTimeController::FixLinks( objects, link_stack, version, user_version ); - for (uint i1 = 0; i1 < nodeGroups.size(); i1++) { - for (uint i2 = 0; i2 < nodeGroups[i1].nodes.size(); i2++) { + for (unsigned int i1 = 0; i1 < nodeGroups.size(); i1++) { + for (unsigned int i2 = 0; i2 < nodeGroups[i1].nodes.size(); i2++) { nodeGroups[i1].nodes[i2] = FixLink<NiNode>( objects, link_stack, version ); }; }; @@ -1538,15 +1538,15 @@ void ABoneLODController::InternalFixLinks( const map<unsigned int,NiObjectRef> & std::list<NiObjectRef> ABoneLODController::InternalGetRefs() const { list<Ref<NiObject> > refs; refs = NiTimeController::GetRefs(); - for (uint i1 = 0; i1 < nodeGroups.size(); i1++) { - for (uint i2 = 0; i2 < nodeGroups[i1].nodes.size(); i2++) { + for (unsigned int i1 = 0; i1 < nodeGroups.size(); i1++) { + for (unsigned int i2 = 0; i2 < nodeGroups[i1].nodes.size(); i2++) { }; }; return refs; } -void NiSingleInterpolatorController::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { - uint block_num; +void NiSingleInterpolatorController::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { + unsigned int block_num; NiTimeController::Read( in, link_stack, version, user_version ); if ( version >= 0x0A020000 ) { NifStream( block_num, in, version ); @@ -1554,7 +1554,7 @@ void NiSingleInterpolatorController::InternalRead( istream& in, list<uint> & lin }; } -void NiSingleInterpolatorController::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiSingleInterpolatorController::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { NiTimeController::Write( out, link_map, version, user_version ); if ( version >= 0x0A020000 ) { if ( interpolator != NULL ) @@ -1566,13 +1566,13 @@ void NiSingleInterpolatorController::InternalWrite( ostream& out, const map<NiOb std::string NiSingleInterpolatorController::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << NiTimeController::asString(); out << " Interpolator: " << interpolator << endl; return out.str(); } -void NiSingleInterpolatorController::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiSingleInterpolatorController::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiTimeController::FixLinks( objects, link_stack, version, user_version ); if ( version >= 0x0A020000 ) { interpolator = FixLink<NiInterpolator>( objects, link_stack, version ); @@ -1587,25 +1587,25 @@ std::list<NiObjectRef> NiSingleInterpolatorController::InternalGetRefs() const { return refs; } -void APSysCtlr::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void APSysCtlr::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiSingleInterpolatorController::Read( in, link_stack, version, user_version ); NifStream( modifierName, in, version ); } -void APSysCtlr::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void APSysCtlr::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { NiSingleInterpolatorController::Write( out, link_map, version, user_version ); NifStream( modifierName, out, version ); } std::string APSysCtlr::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << NiSingleInterpolatorController::asString(); out << " Modifier Name: " << modifierName << endl; return out.str(); } -void APSysCtlr::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void APSysCtlr::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiSingleInterpolatorController::FixLinks( objects, link_stack, version, user_version ); } @@ -1615,8 +1615,8 @@ std::list<NiObjectRef> APSysCtlr::InternalGetRefs() const { return refs; } -void NiGeometry::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { - uint block_num; +void NiGeometry::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { + unsigned int block_num; NiAVObject::Read( in, link_stack, version, user_version ); NifStream( block_num, in, version ); link_stack.push_back( block_num ); @@ -1634,7 +1634,7 @@ void NiGeometry::InternalRead( istream& in, list<uint> & link_stack, unsigned in }; } -void NiGeometry::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiGeometry::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { NiAVObject::Write( out, link_map, version, user_version ); if ( data != NULL ) NifStream( link_map.find( StaticCast<NiObject>(data) )->second, out, version ); @@ -1660,7 +1660,7 @@ void NiGeometry::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link std::string NiGeometry::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << NiAVObject::asString(); out << " Data: " << data << endl; out << " Skin Instance: " << skinInstance << endl; @@ -1672,7 +1672,7 @@ std::string NiGeometry::InternalAsString( bool verbose ) const { return out.str(); } -void NiGeometry::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiGeometry::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiAVObject::FixLinks( objects, link_stack, version, user_version ); data = FixLink<NiGeometryData>( objects, link_stack, version ); if ( version >= 0x0303000D ) { @@ -1697,22 +1697,22 @@ std::list<NiObjectRef> NiGeometry::InternalGetRefs() const { return refs; } -void NiTriBasedGeom::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiTriBasedGeom::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiGeometry::Read( in, link_stack, version, user_version ); } -void NiTriBasedGeom::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiTriBasedGeom::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { NiGeometry::Write( out, link_map, version, user_version ); } std::string NiTriBasedGeom::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << NiGeometry::asString(); return out.str(); } -void NiTriBasedGeom::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiTriBasedGeom::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiGeometry::FixLinks( objects, link_stack, version, user_version ); } @@ -1722,8 +1722,8 @@ std::list<NiObjectRef> NiTriBasedGeom::InternalGetRefs() const { return refs; } -void NiGeometryData::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { - uint block_num; +void NiGeometryData::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { + unsigned int block_num; NiObject::Read( in, link_stack, version, user_version ); if ( version >= 0x0A020000 ) { NifStream( name, in, version ); @@ -1735,7 +1735,7 @@ void NiGeometryData::InternalRead( istream& in, list<uint> & link_stack, unsigne NifStream( hasVertices, in, version ); if ( (hasVertices != 0) ) { vertices.resize(numVertices); - for (uint i2 = 0; i2 < vertices.size(); i2++) { + for (unsigned int i2 = 0; i2 < vertices.size(); i2++) { NifStream( vertices[i2], in, version ); }; }; @@ -1746,18 +1746,18 @@ void NiGeometryData::InternalRead( istream& in, list<uint> & link_stack, unsigne NifStream( hasNormals, in, version ); if ( (hasNormals != 0) ) { normals.resize(numVertices); - for (uint i2 = 0; i2 < normals.size(); i2++) { + for (unsigned int i2 = 0; i2 < normals.size(); i2++) { NifStream( normals[i2], in, version ); }; }; if ( version >= 0x0A010000 ) { if ( (((hasNormals != 0)) && ((unknownByte & 16))) ) { unknownVectors1.resize(numVertices); - for (uint i3 = 0; i3 < unknownVectors1.size(); i3++) { + for (unsigned int i3 = 0; i3 < unknownVectors1.size(); i3++) { NifStream( unknownVectors1[i3], in, version ); }; unknownVectors2.resize(numVertices); - for (uint i3 = 0; i3 < unknownVectors2.size(); i3++) { + for (unsigned int i3 = 0; i3 < unknownVectors2.size(); i3++) { NifStream( unknownVectors2[i3], in, version ); }; }; @@ -1767,7 +1767,7 @@ void NiGeometryData::InternalRead( istream& in, list<uint> & link_stack, unsigne NifStream( hasVertexColors, in, version ); if ( (hasVertexColors != 0) ) { vertexColors.resize(numVertices); - for (uint i2 = 0; i2 < vertexColors.size(); i2++) { + for (unsigned int i2 = 0; i2 < vertexColors.size(); i2++) { NifStream( vertexColors[i2], in, version ); }; }; @@ -1779,18 +1779,18 @@ void NiGeometryData::InternalRead( istream& in, list<uint> & link_stack, unsigne }; if ( version <= 0x04020200 ) { uvSets.resize(numUvSets); - for (uint i2 = 0; i2 < uvSets.size(); i2++) { + for (unsigned int i2 = 0; i2 < uvSets.size(); i2++) { uvSets[i2].resize(numVertices); - for (uint i3 = 0; i3 < uvSets[i2].size(); i3++) { + for (unsigned int i3 = 0; i3 < uvSets[i2].size(); i3++) { NifStream( uvSets[i2][i3], in, version ); }; }; }; if ( version >= 0x0A000100 ) { uvSets.resize((numUvSets2 & 63)); - for (uint i2 = 0; i2 < uvSets.size(); i2++) { + for (unsigned int i2 = 0; i2 < uvSets.size(); i2++) { uvSets[i2].resize(numVertices); - for (uint i3 = 0; i3 < uvSets[i2].size(); i3++) { + for (unsigned int i3 = 0; i3 < uvSets[i2].size(); i3++) { NifStream( uvSets[i2][i3], in, version ); }; }; @@ -1802,11 +1802,11 @@ void NiGeometryData::InternalRead( istream& in, list<uint> & link_stack, unsigne }; } -void NiGeometryData::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiGeometryData::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { NiObject::Write( out, link_map, version, user_version ); - numUvSets = ushort(uvSets.size()); + numUvSets = unsigned short(uvSets.size()); numUvSets2 = byte(uvSets.size()); - numVertices = ushort(vertices.size()); + numVertices = unsigned short(vertices.size()); if ( version >= 0x0A020000 ) { NifStream( name, out, version ); }; @@ -1816,7 +1816,7 @@ void NiGeometryData::InternalWrite( ostream& out, const map<NiObjectRef,uint> & }; NifStream( hasVertices, out, version ); if ( (hasVertices != 0) ) { - for (uint i2 = 0; i2 < vertices.size(); i2++) { + for (unsigned int i2 = 0; i2 < vertices.size(); i2++) { NifStream( vertices[i2], out, version ); }; }; @@ -1826,16 +1826,16 @@ void NiGeometryData::InternalWrite( ostream& out, const map<NiObjectRef,uint> & }; NifStream( hasNormals, out, version ); if ( (hasNormals != 0) ) { - for (uint i2 = 0; i2 < normals.size(); i2++) { + for (unsigned int i2 = 0; i2 < normals.size(); i2++) { NifStream( normals[i2], out, version ); }; }; if ( version >= 0x0A010000 ) { if ( (((hasNormals != 0)) && ((unknownByte & 16))) ) { - for (uint i3 = 0; i3 < unknownVectors1.size(); i3++) { + for (unsigned int i3 = 0; i3 < unknownVectors1.size(); i3++) { NifStream( unknownVectors1[i3], out, version ); }; - for (uint i3 = 0; i3 < unknownVectors2.size(); i3++) { + for (unsigned int i3 = 0; i3 < unknownVectors2.size(); i3++) { NifStream( unknownVectors2[i3], out, version ); }; }; @@ -1844,7 +1844,7 @@ void NiGeometryData::InternalWrite( ostream& out, const map<NiObjectRef,uint> & NifStream( radius, out, version ); NifStream( hasVertexColors, out, version ); if ( (hasVertexColors != 0) ) { - for (uint i2 = 0; i2 < vertexColors.size(); i2++) { + for (unsigned int i2 = 0; i2 < vertexColors.size(); i2++) { NifStream( vertexColors[i2], out, version ); }; }; @@ -1855,15 +1855,15 @@ void NiGeometryData::InternalWrite( ostream& out, const map<NiObjectRef,uint> & NifStream( hasUv, out, version ); }; if ( version <= 0x04020200 ) { - for (uint i2 = 0; i2 < uvSets.size(); i2++) { - for (uint i3 = 0; i3 < uvSets[i2].size(); i3++) { + for (unsigned int i2 = 0; i2 < uvSets.size(); i2++) { + for (unsigned int i3 = 0; i3 < uvSets[i2].size(); i3++) { NifStream( uvSets[i2][i3], out, version ); }; }; }; if ( version >= 0x0A000100 ) { - for (uint i2 = 0; i2 < uvSets.size(); i2++) { - for (uint i3 = 0; i3 < uvSets[i2].size(); i3++) { + for (unsigned int i2 = 0; i2 < uvSets.size(); i2++) { + for (unsigned int i3 = 0; i3 < uvSets[i2].size(); i3++) { NifStream( uvSets[i2][i3], out, version ); }; }; @@ -1879,18 +1879,18 @@ void NiGeometryData::InternalWrite( ostream& out, const map<NiObjectRef,uint> & std::string NiGeometryData::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << NiObject::asString(); - numUvSets = ushort(uvSets.size()); + numUvSets = unsigned short(uvSets.size()); numUvSets2 = byte(uvSets.size()); - numVertices = ushort(vertices.size()); + numVertices = unsigned short(vertices.size()); out << " Name: " << name << endl; out << " Num Vertices: " << numVertices << endl; out << " Unknown Short 1: " << unknownShort1 << endl; out << " Has Vertices: " << hasVertices << endl; if ( (hasVertices != 0) ) { array_output_count = 0; - for (uint i2 = 0; i2 < vertices.size(); i2++) { + for (unsigned int i2 = 0; i2 < vertices.size(); i2++) { if ( !verbose && ( array_output_count > MAXARRAYDUMP ) ) { out << "<Data Truncated. Use verbose mode to see complete listing.>" << endl; break; @@ -1907,7 +1907,7 @@ std::string NiGeometryData::InternalAsString( bool verbose ) const { out << " Has Normals: " << hasNormals << endl; if ( (hasNormals != 0) ) { array_output_count = 0; - for (uint i2 = 0; i2 < normals.size(); i2++) { + for (unsigned int i2 = 0; i2 < normals.size(); i2++) { if ( !verbose && ( array_output_count > MAXARRAYDUMP ) ) { out << "<Data Truncated. Use verbose mode to see complete listing.>" << endl; break; @@ -1921,7 +1921,7 @@ std::string NiGeometryData::InternalAsString( bool verbose ) const { }; if ( (((hasNormals != 0)) && ((unknownByte & 16))) ) { array_output_count = 0; - for (uint i2 = 0; i2 < unknownVectors1.size(); i2++) { + for (unsigned int i2 = 0; i2 < unknownVectors1.size(); i2++) { if ( !verbose && ( array_output_count > MAXARRAYDUMP ) ) { out << "<Data Truncated. Use verbose mode to see complete listing.>" << endl; break; @@ -1933,7 +1933,7 @@ std::string NiGeometryData::InternalAsString( bool verbose ) const { array_output_count++; }; array_output_count = 0; - for (uint i2 = 0; i2 < unknownVectors2.size(); i2++) { + for (unsigned int i2 = 0; i2 < unknownVectors2.size(); i2++) { if ( !verbose && ( array_output_count > MAXARRAYDUMP ) ) { out << "<Data Truncated. Use verbose mode to see complete listing.>" << endl; break; @@ -1950,7 +1950,7 @@ std::string NiGeometryData::InternalAsString( bool verbose ) const { out << " Has Vertex Colors: " << hasVertexColors << endl; if ( (hasVertexColors != 0) ) { array_output_count = 0; - for (uint i2 = 0; i2 < vertexColors.size(); i2++) { + for (unsigned int i2 = 0; i2 < vertexColors.size(); i2++) { if ( !verbose && ( array_output_count > MAXARRAYDUMP ) ) { out << "<Data Truncated. Use verbose mode to see complete listing.>" << endl; break; @@ -1965,12 +1965,12 @@ std::string NiGeometryData::InternalAsString( bool verbose ) const { out << " Num UV Sets: " << numUvSets << endl; out << " Has UV: " << hasUv << endl; array_output_count = 0; - for (uint i1 = 0; i1 < uvSets.size(); i1++) { + for (unsigned int i1 = 0; i1 < uvSets.size(); i1++) { if ( !verbose && ( array_output_count > MAXARRAYDUMP ) ) { out << "<Data Truncated. Use verbose mode to see complete listing.>" << endl; break; }; - for (uint i2 = 0; i2 < uvSets[i1].size(); i2++) { + for (unsigned int i2 = 0; i2 < uvSets[i1].size(); i2++) { if ( !verbose && ( array_output_count > MAXARRAYDUMP ) ) { break; }; @@ -1983,7 +1983,7 @@ std::string NiGeometryData::InternalAsString( bool verbose ) const { return out.str(); } -void NiGeometryData::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiGeometryData::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiObject::FixLinks( objects, link_stack, version, user_version ); if ( version >= 0x14000004 ) { unknownLink = FixLink<NiObject>( objects, link_stack, version ); @@ -1998,25 +1998,25 @@ std::list<NiObjectRef> NiGeometryData::InternalGetRefs() const { return refs; } -void NiTriBasedGeomData::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiTriBasedGeomData::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiGeometryData::Read( in, link_stack, version, user_version ); NifStream( numTriangles, in, version ); } -void NiTriBasedGeomData::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiTriBasedGeomData::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { NiGeometryData::Write( out, link_map, version, user_version ); NifStream( numTriangles, out, version ); } std::string NiTriBasedGeomData::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << NiGeometryData::asString(); out << " Num Triangles: " << numTriangles << endl; return out.str(); } -void NiTriBasedGeomData::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiTriBasedGeomData::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiGeometryData::FixLinks( objects, link_stack, version, user_version ); } @@ -2026,12 +2026,12 @@ std::list<NiObjectRef> NiTriBasedGeomData::InternalGetRefs() const { return refs; } -void APSysData::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void APSysData::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiGeometryData::Read( in, link_stack, version, user_version ); NifStream( hasUnknownFloats1, in, version ); if ( (hasUnknownFloats1 != 0) ) { unknownFloats1.resize(numVertices); - for (uint i2 = 0; i2 < unknownFloats1.size(); i2++) { + for (unsigned int i2 = 0; i2 < unknownFloats1.size(); i2++) { NifStream( unknownFloats1[i2], in, version ); }; }; @@ -2039,40 +2039,40 @@ void APSysData::InternalRead( istream& in, list<uint> & link_stack, unsigned int NifStream( hasUnknownFloats2, in, version ); if ( (hasUnknownFloats2 != 0) ) { unknownFloats2.resize(numVertices); - for (uint i2 = 0; i2 < unknownFloats2.size(); i2++) { + for (unsigned int i2 = 0; i2 < unknownFloats2.size(); i2++) { NifStream( unknownFloats2[i2], in, version ); }; }; NifStream( hasUnknownFloats3, in, version ); if ( (hasUnknownFloats3 != 0) ) { unknownFloats3.resize(numVertices); - for (uint i2 = 0; i2 < unknownFloats3.size(); i2++) { - for (uint i3 = 0; i3 < 4; i3++) { + for (unsigned int i2 = 0; i2 < unknownFloats3.size(); i2++) { + for (unsigned int i3 = 0; i3 < 4; i3++) { NifStream( unknownFloats3[i2][i3], in, version ); }; }; }; } -void APSysData::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void APSysData::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { NiGeometryData::Write( out, link_map, version, user_version ); NifStream( hasUnknownFloats1, out, version ); if ( (hasUnknownFloats1 != 0) ) { - for (uint i2 = 0; i2 < unknownFloats1.size(); i2++) { + for (unsigned int i2 = 0; i2 < unknownFloats1.size(); i2++) { NifStream( unknownFloats1[i2], out, version ); }; }; NifStream( unknownShort3, out, version ); NifStream( hasUnknownFloats2, out, version ); if ( (hasUnknownFloats2 != 0) ) { - for (uint i2 = 0; i2 < unknownFloats2.size(); i2++) { + for (unsigned int i2 = 0; i2 < unknownFloats2.size(); i2++) { NifStream( unknownFloats2[i2], out, version ); }; }; NifStream( hasUnknownFloats3, out, version ); if ( (hasUnknownFloats3 != 0) ) { - for (uint i2 = 0; i2 < unknownFloats3.size(); i2++) { - for (uint i3 = 0; i3 < 4; i3++) { + for (unsigned int i2 = 0; i2 < unknownFloats3.size(); i2++) { + for (unsigned int i3 = 0; i3 < 4; i3++) { NifStream( unknownFloats3[i2][i3], out, version ); }; }; @@ -2081,12 +2081,12 @@ void APSysData::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_ std::string APSysData::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << NiGeometryData::asString(); out << " Has Unknown Floats 1: " << hasUnknownFloats1 << endl; if ( (hasUnknownFloats1 != 0) ) { array_output_count = 0; - for (uint i2 = 0; i2 < unknownFloats1.size(); i2++) { + for (unsigned int i2 = 0; i2 < unknownFloats1.size(); i2++) { if ( !verbose && ( array_output_count > MAXARRAYDUMP ) ) { out << "<Data Truncated. Use verbose mode to see complete listing.>" << endl; break; @@ -2102,7 +2102,7 @@ std::string APSysData::InternalAsString( bool verbose ) const { out << " Has Unknown Floats 2: " << hasUnknownFloats2 << endl; if ( (hasUnknownFloats2 != 0) ) { array_output_count = 0; - for (uint i2 = 0; i2 < unknownFloats2.size(); i2++) { + for (unsigned int i2 = 0; i2 < unknownFloats2.size(); i2++) { if ( !verbose && ( array_output_count > MAXARRAYDUMP ) ) { out << "<Data Truncated. Use verbose mode to see complete listing.>" << endl; break; @@ -2117,12 +2117,12 @@ std::string APSysData::InternalAsString( bool verbose ) const { out << " Has Unknown Floats 3: " << hasUnknownFloats3 << endl; if ( (hasUnknownFloats3 != 0) ) { array_output_count = 0; - for (uint i2 = 0; i2 < unknownFloats3.size(); i2++) { + for (unsigned int i2 = 0; i2 < unknownFloats3.size(); i2++) { if ( !verbose && ( array_output_count > MAXARRAYDUMP ) ) { out << "<Data Truncated. Use verbose mode to see complete listing.>" << endl; break; }; - for (uint i3 = 0; i3 < 4; i3++) { + for (unsigned int i3 = 0; i3 < 4; i3++) { if ( !verbose && ( array_output_count > MAXARRAYDUMP ) ) { break; }; @@ -2134,7 +2134,7 @@ std::string APSysData::InternalAsString( bool verbose ) const { return out.str(); } -void APSysData::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void APSysData::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiGeometryData::FixLinks( objects, link_stack, version, user_version ); } @@ -2144,13 +2144,13 @@ std::list<NiObjectRef> APSysData::InternalGetRefs() const { return refs; } -void bhkBlendCollisionObject::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void bhkBlendCollisionObject::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiCollisionObject::Read( in, link_stack, version, user_version ); NifStream( unknownFloat1, in, version ); NifStream( unknownFloat2, in, version ); } -void bhkBlendCollisionObject::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void bhkBlendCollisionObject::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { NiCollisionObject::Write( out, link_map, version, user_version ); NifStream( unknownFloat1, out, version ); NifStream( unknownFloat2, out, version ); @@ -2158,14 +2158,14 @@ void bhkBlendCollisionObject::InternalWrite( ostream& out, const map<NiObjectRef std::string bhkBlendCollisionObject::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << NiCollisionObject::asString(); out << " Unknown Float 1: " << unknownFloat1 << endl; out << " Unknown Float 2: " << unknownFloat2 << endl; return out.str(); } -void bhkBlendCollisionObject::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void bhkBlendCollisionObject::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiCollisionObject::FixLinks( objects, link_stack, version, user_version ); } @@ -2175,25 +2175,25 @@ std::list<NiObjectRef> bhkBlendCollisionObject::InternalGetRefs() const { return refs; } -void bhkBlendController::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void bhkBlendController::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiTimeController::Read( in, link_stack, version, user_version ); NifStream( unknownInt, in, version ); } -void bhkBlendController::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void bhkBlendController::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { NiTimeController::Write( out, link_map, version, user_version ); NifStream( unknownInt, out, version ); } std::string bhkBlendController::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << NiTimeController::asString(); out << " Unknown Int: " << unknownInt << endl; return out.str(); } -void bhkBlendController::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void bhkBlendController::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiTimeController::FixLinks( objects, link_stack, version, user_version ); } @@ -2203,7 +2203,7 @@ std::list<NiObjectRef> bhkBlendController::InternalGetRefs() const { return refs; } -void bhkBoxShape::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void bhkBoxShape::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { bhkConvexShape::Read( in, link_stack, version, user_version ); NifStream( unknownFloat1, in, version ); NifStream( unknownShort1, in, version ); @@ -2214,7 +2214,7 @@ void bhkBoxShape::InternalRead( istream& in, list<uint> & link_stack, unsigned i NifStream( min_Size, in, version ); } -void bhkBoxShape::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void bhkBoxShape::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { bhkConvexShape::Write( out, link_map, version, user_version ); NifStream( unknownFloat1, out, version ); NifStream( unknownShort1, out, version ); @@ -2227,7 +2227,7 @@ void bhkBoxShape::InternalWrite( ostream& out, const map<NiObjectRef,uint> & lin std::string bhkBoxShape::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << bhkConvexShape::asString(); out << " Unknown Float 1: " << unknownFloat1 << endl; out << " Unknown Short 1: " << unknownShort1 << endl; @@ -2239,7 +2239,7 @@ std::string bhkBoxShape::InternalAsString( bool verbose ) const { return out.str(); } -void bhkBoxShape::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void bhkBoxShape::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { bhkConvexShape::FixLinks( objects, link_stack, version, user_version ); } @@ -2249,7 +2249,7 @@ std::list<NiObjectRef> bhkBoxShape::InternalGetRefs() const { return refs; } -void bhkCapsuleShape::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void bhkCapsuleShape::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { bhkConvexShape::Read( in, link_stack, version, user_version ); NifStream( radius, in, version ); NifStream( unknownShort1, in, version ); @@ -2262,7 +2262,7 @@ void bhkCapsuleShape::InternalRead( istream& in, list<uint> & link_stack, unsign NifStream( radius2, in, version ); } -void bhkCapsuleShape::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void bhkCapsuleShape::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { bhkConvexShape::Write( out, link_map, version, user_version ); NifStream( radius, out, version ); NifStream( unknownShort1, out, version ); @@ -2277,7 +2277,7 @@ void bhkCapsuleShape::InternalWrite( ostream& out, const map<NiObjectRef,uint> & std::string bhkCapsuleShape::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << bhkConvexShape::asString(); out << " Radius: " << radius << endl; out << " Unknown Short 1: " << unknownShort1 << endl; @@ -2291,7 +2291,7 @@ std::string bhkCapsuleShape::InternalAsString( bool verbose ) const { return out.str(); } -void bhkCapsuleShape::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void bhkCapsuleShape::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { bhkConvexShape::FixLinks( objects, link_stack, version, user_version ); } @@ -2301,22 +2301,22 @@ std::list<NiObjectRef> bhkCapsuleShape::InternalGetRefs() const { return refs; } -void bhkCollisionObject::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void bhkCollisionObject::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiCollisionObject::Read( in, link_stack, version, user_version ); } -void bhkCollisionObject::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void bhkCollisionObject::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { NiCollisionObject::Write( out, link_map, version, user_version ); } std::string bhkCollisionObject::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << NiCollisionObject::asString(); return out.str(); } -void bhkCollisionObject::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void bhkCollisionObject::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiCollisionObject::FixLinks( objects, link_stack, version, user_version ); } @@ -2326,48 +2326,48 @@ std::list<NiObjectRef> bhkCollisionObject::InternalGetRefs() const { return refs; } -void bhkConvexVerticesShape::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void bhkConvexVerticesShape::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { bhkSphereRepShape::Read( in, link_stack, version, user_version ); - for (uint i1 = 0; i1 < 7; i1++) { + for (unsigned int i1 = 0; i1 < 7; i1++) { NifStream( unknownFloats1[i1], in, version ); }; NifStream( numVertices, in, version ); vertices.resize(numVertices); - for (uint i1 = 0; i1 < vertices.size(); i1++) { + for (unsigned int i1 = 0; i1 < vertices.size(); i1++) { NifStream( vertices[i1], in, version ); }; NifStream( numNormals, in, version ); normals.resize(numNormals); - for (uint i1 = 0; i1 < normals.size(); i1++) { + for (unsigned int i1 = 0; i1 < normals.size(); i1++) { NifStream( normals[i1], in, version ); }; } -void bhkConvexVerticesShape::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void bhkConvexVerticesShape::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { bhkSphereRepShape::Write( out, link_map, version, user_version ); - numNormals = uint(normals.size()); - numVertices = uint(vertices.size()); - for (uint i1 = 0; i1 < 7; i1++) { + numNormals = unsigned int(normals.size()); + numVertices = unsigned int(vertices.size()); + for (unsigned int i1 = 0; i1 < 7; i1++) { NifStream( unknownFloats1[i1], out, version ); }; NifStream( numVertices, out, version ); - for (uint i1 = 0; i1 < vertices.size(); i1++) { + for (unsigned int i1 = 0; i1 < vertices.size(); i1++) { NifStream( vertices[i1], out, version ); }; NifStream( numNormals, out, version ); - for (uint i1 = 0; i1 < normals.size(); i1++) { + for (unsigned int i1 = 0; i1 < normals.size(); i1++) { NifStream( normals[i1], out, version ); }; } std::string bhkConvexVerticesShape::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << bhkSphereRepShape::asString(); - numNormals = uint(normals.size()); - numVertices = uint(vertices.size()); + numNormals = unsigned int(normals.size()); + numVertices = unsigned int(vertices.size()); array_output_count = 0; - for (uint i1 = 0; i1 < 7; i1++) { + for (unsigned int i1 = 0; i1 < 7; i1++) { if ( !verbose && ( array_output_count > MAXARRAYDUMP ) ) { out << "<Data Truncated. Use verbose mode to see complete listing.>" << endl; break; @@ -2380,7 +2380,7 @@ std::string bhkConvexVerticesShape::InternalAsString( bool verbose ) const { }; out << " Num Vertices: " << numVertices << endl; array_output_count = 0; - for (uint i1 = 0; i1 < vertices.size(); i1++) { + for (unsigned int i1 = 0; i1 < vertices.size(); i1++) { if ( !verbose && ( array_output_count > MAXARRAYDUMP ) ) { out << "<Data Truncated. Use verbose mode to see complete listing.>" << endl; break; @@ -2393,7 +2393,7 @@ std::string bhkConvexVerticesShape::InternalAsString( bool verbose ) const { }; out << " Num Normals: " << numNormals << endl; array_output_count = 0; - for (uint i1 = 0; i1 < normals.size(); i1++) { + for (unsigned int i1 = 0; i1 < normals.size(); i1++) { if ( !verbose && ( array_output_count > MAXARRAYDUMP ) ) { out << "<Data Truncated. Use verbose mode to see complete listing.>" << endl; break; @@ -2407,7 +2407,7 @@ std::string bhkConvexVerticesShape::InternalAsString( bool verbose ) const { return out.str(); } -void bhkConvexVerticesShape::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void bhkConvexVerticesShape::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { bhkSphereRepShape::FixLinks( objects, link_stack, version, user_version ); } @@ -2417,19 +2417,19 @@ std::list<NiObjectRef> bhkConvexVerticesShape::InternalGetRefs() const { return refs; } -void bhkHingeConstraint::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void bhkHingeConstraint::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { AbhkConstraint::Read( in, link_stack, version, user_version ); - for (uint i1 = 0; i1 < 5; i1++) { - for (uint i2 = 0; i2 < 4; i2++) { + for (unsigned int i1 = 0; i1 < 5; i1++) { + for (unsigned int i2 = 0; i2 < 4; i2++) { NifStream( unknownFloats[i1][i2], in, version ); }; }; } -void bhkHingeConstraint::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void bhkHingeConstraint::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { AbhkConstraint::Write( out, link_map, version, user_version ); - for (uint i1 = 0; i1 < 5; i1++) { - for (uint i2 = 0; i2 < 4; i2++) { + for (unsigned int i1 = 0; i1 < 5; i1++) { + for (unsigned int i2 = 0; i2 < 4; i2++) { NifStream( unknownFloats[i1][i2], out, version ); }; }; @@ -2437,15 +2437,15 @@ void bhkHingeConstraint::InternalWrite( ostream& out, const map<NiObjectRef,uint std::string bhkHingeConstraint::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << AbhkConstraint::asString(); array_output_count = 0; - for (uint i1 = 0; i1 < 5; i1++) { + for (unsigned int i1 = 0; i1 < 5; i1++) { if ( !verbose && ( array_output_count > MAXARRAYDUMP ) ) { out << "<Data Truncated. Use verbose mode to see complete listing.>" << endl; break; }; - for (uint i2 = 0; i2 < 4; i2++) { + for (unsigned int i2 = 0; i2 < 4; i2++) { if ( !verbose && ( array_output_count > MAXARRAYDUMP ) ) { break; }; @@ -2456,7 +2456,7 @@ std::string bhkHingeConstraint::InternalAsString( bool verbose ) const { return out.str(); } -void bhkHingeConstraint::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void bhkHingeConstraint::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { AbhkConstraint::FixLinks( objects, link_stack, version, user_version ); } @@ -2466,7 +2466,7 @@ std::list<NiObjectRef> bhkHingeConstraint::InternalGetRefs() const { return refs; } -void bhkLimitedHingeConstraint::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void bhkLimitedHingeConstraint::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { AbhkConstraint::Read( in, link_stack, version, user_version ); NifStream( limitedHinge.pivotA, in, version ); NifStream( limitedHinge.axleA, in, version ); @@ -2480,7 +2480,7 @@ void bhkLimitedHingeConstraint::InternalRead( istream& in, list<uint> & link_sta NifStream( limitedHinge.maxFriction, in, version ); } -void bhkLimitedHingeConstraint::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void bhkLimitedHingeConstraint::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { AbhkConstraint::Write( out, link_map, version, user_version ); NifStream( limitedHinge.pivotA, out, version ); NifStream( limitedHinge.axleA, out, version ); @@ -2496,7 +2496,7 @@ void bhkLimitedHingeConstraint::InternalWrite( ostream& out, const map<NiObjectR std::string bhkLimitedHingeConstraint::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << AbhkConstraint::asString(); out << " Pivot A: " << limitedHinge.pivotA << endl; out << " Axle A: " << limitedHinge.axleA << endl; @@ -2511,7 +2511,7 @@ std::string bhkLimitedHingeConstraint::InternalAsString( bool verbose ) const { return out.str(); } -void bhkLimitedHingeConstraint::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void bhkLimitedHingeConstraint::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { AbhkConstraint::FixLinks( objects, link_stack, version, user_version ); } @@ -2521,56 +2521,56 @@ std::list<NiObjectRef> bhkLimitedHingeConstraint::InternalGetRefs() const { return refs; } -void bhkListShape::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { - uint block_num; +void bhkListShape::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { + unsigned int block_num; AbhkShapeCollection::Read( in, link_stack, version, user_version ); NifStream( numSubShapes, in, version ); subShapes.resize(numSubShapes); - for (uint i1 = 0; i1 < subShapes.size(); i1++) { + for (unsigned int i1 = 0; i1 < subShapes.size(); i1++) { NifStream( block_num, in, version ); link_stack.push_back( block_num ); }; NifStream( material, in, version ); - for (uint i1 = 0; i1 < 6; i1++) { + for (unsigned int i1 = 0; i1 < 6; i1++) { NifStream( unknownFloats[i1], in, version ); }; NifStream( numUnknownInts, in, version ); unknownInts.resize(numUnknownInts); - for (uint i1 = 0; i1 < unknownInts.size(); i1++) { + for (unsigned int i1 = 0; i1 < unknownInts.size(); i1++) { NifStream( unknownInts[i1], in, version ); }; } -void bhkListShape::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void bhkListShape::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { AbhkShapeCollection::Write( out, link_map, version, user_version ); - numUnknownInts = uint(unknownInts.size()); - numSubShapes = uint(subShapes.size()); + numUnknownInts = unsigned int(unknownInts.size()); + numSubShapes = unsigned int(subShapes.size()); NifStream( numSubShapes, out, version ); - for (uint i1 = 0; i1 < subShapes.size(); i1++) { + for (unsigned int i1 = 0; i1 < subShapes.size(); i1++) { if ( subShapes[i1] != NULL ) NifStream( link_map.find( StaticCast<NiObject>(subShapes[i1]) )->second, out, version ); else NifStream( 0xffffffff, out, version ); }; NifStream( material, out, version ); - for (uint i1 = 0; i1 < 6; i1++) { + for (unsigned int i1 = 0; i1 < 6; i1++) { NifStream( unknownFloats[i1], out, version ); }; NifStream( numUnknownInts, out, version ); - for (uint i1 = 0; i1 < unknownInts.size(); i1++) { + for (unsigned int i1 = 0; i1 < unknownInts.size(); i1++) { NifStream( unknownInts[i1], out, version ); }; } std::string bhkListShape::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << AbhkShapeCollection::asString(); - numUnknownInts = uint(unknownInts.size()); - numSubShapes = uint(subShapes.size()); + numUnknownInts = unsigned int(unknownInts.size()); + numSubShapes = unsigned int(subShapes.size()); out << " Num Sub Shapes: " << numSubShapes << endl; array_output_count = 0; - for (uint i1 = 0; i1 < subShapes.size(); i1++) { + for (unsigned int i1 = 0; i1 < subShapes.size(); i1++) { if ( !verbose && ( array_output_count > MAXARRAYDUMP ) ) { out << "<Data Truncated. Use verbose mode to see complete listing.>" << endl; break; @@ -2583,7 +2583,7 @@ std::string bhkListShape::InternalAsString( bool verbose ) const { }; out << " Material: " << material << endl; array_output_count = 0; - for (uint i1 = 0; i1 < 6; i1++) { + for (unsigned int i1 = 0; i1 < 6; i1++) { if ( !verbose && ( array_output_count > MAXARRAYDUMP ) ) { out << "<Data Truncated. Use verbose mode to see complete listing.>" << endl; break; @@ -2596,7 +2596,7 @@ std::string bhkListShape::InternalAsString( bool verbose ) const { }; out << " Num Unknown Ints: " << numUnknownInts << endl; array_output_count = 0; - for (uint i1 = 0; i1 < unknownInts.size(); i1++) { + for (unsigned int i1 = 0; i1 < unknownInts.size(); i1++) { if ( !verbose && ( array_output_count > MAXARRAYDUMP ) ) { out << "<Data Truncated. Use verbose mode to see complete listing.>" << endl; break; @@ -2610,9 +2610,9 @@ std::string bhkListShape::InternalAsString( bool verbose ) const { return out.str(); } -void bhkListShape::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void bhkListShape::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { AbhkShapeCollection::FixLinks( objects, link_stack, version, user_version ); - for (uint i1 = 0; i1 < subShapes.size(); i1++) { + for (unsigned int i1 = 0; i1 < subShapes.size(); i1++) { subShapes[i1] = FixLink<bhkShape>( objects, link_stack, version ); }; } @@ -2620,15 +2620,15 @@ void bhkListShape::InternalFixLinks( const map<unsigned int,NiObjectRef> & objec std::list<NiObjectRef> bhkListShape::InternalGetRefs() const { list<Ref<NiObject> > refs; refs = AbhkShapeCollection::GetRefs(); - for (uint i1 = 0; i1 < subShapes.size(); i1++) { + for (unsigned int i1 = 0; i1 < subShapes.size(); i1++) { if ( subShapes[i1] != NULL ) refs.push_back(StaticCast<NiObject>(subShapes[i1])); }; return refs; } -void bhkMalleableConstraint::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { - uint block_num; +void bhkMalleableConstraint::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { + unsigned int block_num; AbhkConstraint::Read( in, link_stack, version, user_version ); NifStream( type, in, version ); NifStream( unknownInt2, in, version ); @@ -2667,7 +2667,7 @@ void bhkMalleableConstraint::InternalRead( istream& in, list<uint> & link_stack, NifStream( damping, in, version ); } -void bhkMalleableConstraint::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void bhkMalleableConstraint::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { AbhkConstraint::Write( out, link_map, version, user_version ); NifStream( type, out, version ); NifStream( unknownInt2, out, version ); @@ -2712,7 +2712,7 @@ void bhkMalleableConstraint::InternalWrite( ostream& out, const map<NiObjectRef, std::string bhkMalleableConstraint::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << AbhkConstraint::asString(); out << " Type: " << type << endl; out << " Unknown Int 2: " << unknownInt2 << endl; @@ -2750,7 +2750,7 @@ std::string bhkMalleableConstraint::InternalAsString( bool verbose ) const { return out.str(); } -void bhkMalleableConstraint::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void bhkMalleableConstraint::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { AbhkConstraint::FixLinks( objects, link_stack, version, user_version ); unknownLink1 = FixLink<NiObject>( objects, link_stack, version ); unknownLink2 = FixLink<NiObject>( objects, link_stack, version ); @@ -2766,39 +2766,39 @@ std::list<NiObjectRef> bhkMalleableConstraint::InternalGetRefs() const { return refs; } -void bhkMoppBvTreeShape::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { - uint block_num; +void bhkMoppBvTreeShape::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { + unsigned int block_num; bhkShape::Read( in, link_stack, version, user_version ); NifStream( block_num, in, version ); link_stack.push_back( block_num ); NifStream( material, in, version ); - for (uint i1 = 0; i1 < 8; i1++) { + for (unsigned int i1 = 0; i1 < 8; i1++) { NifStream( unknownBytes1[i1], in, version ); }; NifStream( unknownFloat, in, version ); NifStream( numUnknownBytes2, in, version ); unknownBytes2.resize(numUnknownBytes2); - for (uint i1 = 0; i1 < unknownBytes2.size(); i1++) { + for (unsigned int i1 = 0; i1 < unknownBytes2.size(); i1++) { NifStream( unknownBytes2[i1], in, version ); }; NifStream( unknownVector, in, version ); NifStream( unknownFloat2, in, version ); } -void bhkMoppBvTreeShape::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void bhkMoppBvTreeShape::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { bhkShape::Write( out, link_map, version, user_version ); - numUnknownBytes2 = uint(unknownBytes2.size()); + numUnknownBytes2 = unsigned int(unknownBytes2.size()); if ( shape != NULL ) NifStream( link_map.find( StaticCast<NiObject>(shape) )->second, out, version ); else NifStream( 0xffffffff, out, version ); NifStream( material, out, version ); - for (uint i1 = 0; i1 < 8; i1++) { + for (unsigned int i1 = 0; i1 < 8; i1++) { NifStream( unknownBytes1[i1], out, version ); }; NifStream( unknownFloat, out, version ); NifStream( numUnknownBytes2, out, version ); - for (uint i1 = 0; i1 < unknownBytes2.size(); i1++) { + for (unsigned int i1 = 0; i1 < unknownBytes2.size(); i1++) { NifStream( unknownBytes2[i1], out, version ); }; NifStream( unknownVector, out, version ); @@ -2807,13 +2807,13 @@ void bhkMoppBvTreeShape::InternalWrite( ostream& out, const map<NiObjectRef,uint std::string bhkMoppBvTreeShape::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << bhkShape::asString(); - numUnknownBytes2 = uint(unknownBytes2.size()); + numUnknownBytes2 = unsigned int(unknownBytes2.size()); out << " Shape: " << shape << endl; out << " Material: " << material << endl; array_output_count = 0; - for (uint i1 = 0; i1 < 8; i1++) { + for (unsigned int i1 = 0; i1 < 8; i1++) { if ( !verbose && ( array_output_count > MAXARRAYDUMP ) ) { out << "<Data Truncated. Use verbose mode to see complete listing.>" << endl; break; @@ -2827,7 +2827,7 @@ std::string bhkMoppBvTreeShape::InternalAsString( bool verbose ) const { out << " Unknown Float: " << unknownFloat << endl; out << " Num Unknown Bytes 2: " << numUnknownBytes2 << endl; array_output_count = 0; - for (uint i1 = 0; i1 < unknownBytes2.size(); i1++) { + for (unsigned int i1 = 0; i1 < unknownBytes2.size(); i1++) { if ( !verbose && ( array_output_count > MAXARRAYDUMP ) ) { out << "<Data Truncated. Use verbose mode to see complete listing.>" << endl; break; @@ -2843,7 +2843,7 @@ std::string bhkMoppBvTreeShape::InternalAsString( bool verbose ) const { return out.str(); } -void bhkMoppBvTreeShape::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void bhkMoppBvTreeShape::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { bhkShape::FixLinks( objects, link_stack, version, user_version ); shape = FixLink<bhkShape>( objects, link_stack, version ); } @@ -2856,27 +2856,27 @@ std::list<NiObjectRef> bhkMoppBvTreeShape::InternalGetRefs() const { return refs; } -void bhkMultiSphereShape::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void bhkMultiSphereShape::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { bhkSphereRepShape::Read( in, link_stack, version, user_version ); NifStream( unknownFloat1, in, version ); NifStream( unknownFloat2, in, version ); NifStream( unknownFloat3, in, version ); NifStream( numSpheres, in, version ); spheres.resize(numSpheres); - for (uint i1 = 0; i1 < spheres.size(); i1++) { + for (unsigned int i1 = 0; i1 < spheres.size(); i1++) { NifStream( spheres[i1].center, in, version ); NifStream( spheres[i1].radius, in, version ); }; } -void bhkMultiSphereShape::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void bhkMultiSphereShape::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { bhkSphereRepShape::Write( out, link_map, version, user_version ); - numSpheres = uint(spheres.size()); + numSpheres = unsigned int(spheres.size()); NifStream( unknownFloat1, out, version ); NifStream( unknownFloat2, out, version ); NifStream( unknownFloat3, out, version ); NifStream( numSpheres, out, version ); - for (uint i1 = 0; i1 < spheres.size(); i1++) { + for (unsigned int i1 = 0; i1 < spheres.size(); i1++) { NifStream( spheres[i1].center, out, version ); NifStream( spheres[i1].radius, out, version ); }; @@ -2884,15 +2884,15 @@ void bhkMultiSphereShape::InternalWrite( ostream& out, const map<NiObjectRef,uin std::string bhkMultiSphereShape::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << bhkSphereRepShape::asString(); - numSpheres = uint(spheres.size()); + numSpheres = unsigned int(spheres.size()); out << " Unknown Float 1: " << unknownFloat1 << endl; out << " Unknown Float 2: " << unknownFloat2 << endl; out << " Unknown Float 3: " << unknownFloat3 << endl; out << " Num Spheres: " << numSpheres << endl; array_output_count = 0; - for (uint i1 = 0; i1 < spheres.size(); i1++) { + for (unsigned int i1 = 0; i1 < spheres.size(); i1++) { if ( !verbose && ( array_output_count > MAXARRAYDUMP ) ) { out << "<Data Truncated. Use verbose mode to see complete listing.>" << endl; break; @@ -2903,7 +2903,7 @@ std::string bhkMultiSphereShape::InternalAsString( bool verbose ) const { return out.str(); } -void bhkMultiSphereShape::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void bhkMultiSphereShape::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { bhkSphereRepShape::FixLinks( objects, link_stack, version, user_version ); } @@ -2913,12 +2913,12 @@ std::list<NiObjectRef> bhkMultiSphereShape::InternalGetRefs() const { return refs; } -void bhkNiTriStripsShape::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { - uint block_num; +void bhkNiTriStripsShape::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { + unsigned int block_num; bhkSphereRepShape::Read( in, link_stack, version, user_version ); NifStream( unknownFloat1, in, version ); NifStream( unknownInt1, in, version ); - for (uint i1 = 0; i1 < 4; i1++) { + for (unsigned int i1 = 0; i1 < 4; i1++) { NifStream( unknownInts1[i1], in, version ); }; NifStream( unknownInt2, in, version ); @@ -2926,40 +2926,40 @@ void bhkNiTriStripsShape::InternalRead( istream& in, list<uint> & link_stack, un NifStream( unknownInt3, in, version ); NifStream( numStripsData, in, version ); stripsData.resize(numStripsData); - for (uint i1 = 0; i1 < stripsData.size(); i1++) { + for (unsigned int i1 = 0; i1 < stripsData.size(); i1++) { NifStream( block_num, in, version ); link_stack.push_back( block_num ); }; NifStream( numDataLayers, in, version ); dataLayers.resize(numDataLayers); - for (uint i1 = 0; i1 < dataLayers.size(); i1++) { + for (unsigned int i1 = 0; i1 < dataLayers.size(); i1++) { NifStream( dataLayers[i1].layer, in, version ); NifStream( dataLayers[i1].colFilter, in, version ); NifStream( dataLayers[i1].unknownShort, in, version ); }; } -void bhkNiTriStripsShape::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void bhkNiTriStripsShape::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { bhkSphereRepShape::Write( out, link_map, version, user_version ); - numDataLayers = uint(dataLayers.size()); - numStripsData = uint(stripsData.size()); + numDataLayers = unsigned int(dataLayers.size()); + numStripsData = unsigned int(stripsData.size()); NifStream( unknownFloat1, out, version ); NifStream( unknownInt1, out, version ); - for (uint i1 = 0; i1 < 4; i1++) { + for (unsigned int i1 = 0; i1 < 4; i1++) { NifStream( unknownInts1[i1], out, version ); }; NifStream( unknownInt2, out, version ); NifStream( scale, out, version ); NifStream( unknownInt3, out, version ); NifStream( numStripsData, out, version ); - for (uint i1 = 0; i1 < stripsData.size(); i1++) { + for (unsigned int i1 = 0; i1 < stripsData.size(); i1++) { if ( stripsData[i1] != NULL ) NifStream( link_map.find( StaticCast<NiObject>(stripsData[i1]) )->second, out, version ); else NifStream( 0xffffffff, out, version ); }; NifStream( numDataLayers, out, version ); - for (uint i1 = 0; i1 < dataLayers.size(); i1++) { + for (unsigned int i1 = 0; i1 < dataLayers.size(); i1++) { NifStream( dataLayers[i1].layer, out, version ); NifStream( dataLayers[i1].colFilter, out, version ); NifStream( dataLayers[i1].unknownShort, out, version ); @@ -2968,14 +2968,14 @@ void bhkNiTriStripsShape::InternalWrite( ostream& out, const map<NiObjectRef,uin std::string bhkNiTriStripsShape::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << bhkSphereRepShape::asString(); - numDataLayers = uint(dataLayers.size()); - numStripsData = uint(stripsData.size()); + numDataLayers = unsigned int(dataLayers.size()); + numStripsData = unsigned int(stripsData.size()); out << " Unknown Float 1: " << unknownFloat1 << endl; out << " Unknown Int 1: " << unknownInt1 << endl; array_output_count = 0; - for (uint i1 = 0; i1 < 4; i1++) { + for (unsigned int i1 = 0; i1 < 4; i1++) { if ( !verbose && ( array_output_count > MAXARRAYDUMP ) ) { out << "<Data Truncated. Use verbose mode to see complete listing.>" << endl; break; @@ -2991,7 +2991,7 @@ std::string bhkNiTriStripsShape::InternalAsString( bool verbose ) const { out << " Unknown Int 3: " << unknownInt3 << endl; out << " Num Strips Data: " << numStripsData << endl; array_output_count = 0; - for (uint i1 = 0; i1 < stripsData.size(); i1++) { + for (unsigned int i1 = 0; i1 < stripsData.size(); i1++) { if ( !verbose && ( array_output_count > MAXARRAYDUMP ) ) { out << "<Data Truncated. Use verbose mode to see complete listing.>" << endl; break; @@ -3004,7 +3004,7 @@ std::string bhkNiTriStripsShape::InternalAsString( bool verbose ) const { }; out << " Num Data Layers: " << numDataLayers << endl; array_output_count = 0; - for (uint i1 = 0; i1 < dataLayers.size(); i1++) { + for (unsigned int i1 = 0; i1 < dataLayers.size(); i1++) { if ( !verbose && ( array_output_count > MAXARRAYDUMP ) ) { out << "<Data Truncated. Use verbose mode to see complete listing.>" << endl; break; @@ -3016,9 +3016,9 @@ std::string bhkNiTriStripsShape::InternalAsString( bool verbose ) const { return out.str(); } -void bhkNiTriStripsShape::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void bhkNiTriStripsShape::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { bhkSphereRepShape::FixLinks( objects, link_stack, version, user_version ); - for (uint i1 = 0; i1 < stripsData.size(); i1++) { + for (unsigned int i1 = 0; i1 < stripsData.size(); i1++) { stripsData[i1] = FixLink<NiTriStripsData>( objects, link_stack, version ); }; } @@ -3026,52 +3026,52 @@ void bhkNiTriStripsShape::InternalFixLinks( const map<unsigned int,NiObjectRef> std::list<NiObjectRef> bhkNiTriStripsShape::InternalGetRefs() const { list<Ref<NiObject> > refs; refs = bhkSphereRepShape::GetRefs(); - for (uint i1 = 0; i1 < stripsData.size(); i1++) { + for (unsigned int i1 = 0; i1 < stripsData.size(); i1++) { if ( stripsData[i1] != NULL ) refs.push_back(StaticCast<NiObject>(stripsData[i1])); }; return refs; } -void bhkPackedNiTriStripsShape::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { - uint block_num; +void bhkPackedNiTriStripsShape::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { + unsigned int block_num; AbhkShapeCollection::Read( in, link_stack, version, user_version ); NifStream( numSubShapes, in, version ); subShapes.resize(numSubShapes); - for (uint i1 = 0; i1 < subShapes.size(); i1++) { + for (unsigned int i1 = 0; i1 < subShapes.size(); i1++) { NifStream( subShapes[i1].layer, in, version ); NifStream( subShapes[i1].colFilter, in, version ); NifStream( subShapes[i1].unknownShort, in, version ); NifStream( subShapes[i1].vertexCount___, in, version ); NifStream( subShapes[i1].material, in, version ); }; - for (uint i1 = 0; i1 < 9; i1++) { + for (unsigned int i1 = 0; i1 < 9; i1++) { NifStream( unknownFloats[i1], in, version ); }; NifStream( scale, in, version ); - for (uint i1 = 0; i1 < 3; i1++) { + for (unsigned int i1 = 0; i1 < 3; i1++) { NifStream( unknownFloats2[i1], in, version ); }; NifStream( block_num, in, version ); link_stack.push_back( block_num ); } -void bhkPackedNiTriStripsShape::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void bhkPackedNiTriStripsShape::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { AbhkShapeCollection::Write( out, link_map, version, user_version ); - numSubShapes = ushort(subShapes.size()); + numSubShapes = unsigned short(subShapes.size()); NifStream( numSubShapes, out, version ); - for (uint i1 = 0; i1 < subShapes.size(); i1++) { + for (unsigned int i1 = 0; i1 < subShapes.size(); i1++) { NifStream( subShapes[i1].layer, out, version ); NifStream( subShapes[i1].colFilter, out, version ); NifStream( subShapes[i1].unknownShort, out, version ); NifStream( subShapes[i1].vertexCount___, out, version ); NifStream( subShapes[i1].material, out, version ); }; - for (uint i1 = 0; i1 < 9; i1++) { + for (unsigned int i1 = 0; i1 < 9; i1++) { NifStream( unknownFloats[i1], out, version ); }; NifStream( scale, out, version ); - for (uint i1 = 0; i1 < 3; i1++) { + for (unsigned int i1 = 0; i1 < 3; i1++) { NifStream( unknownFloats2[i1], out, version ); }; if ( data != NULL ) @@ -3082,12 +3082,12 @@ void bhkPackedNiTriStripsShape::InternalWrite( ostream& out, const map<NiObjectR std::string bhkPackedNiTriStripsShape::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << AbhkShapeCollection::asString(); - numSubShapes = ushort(subShapes.size()); + numSubShapes = unsigned short(subShapes.size()); out << " Num Sub Shapes: " << numSubShapes << endl; array_output_count = 0; - for (uint i1 = 0; i1 < subShapes.size(); i1++) { + for (unsigned int i1 = 0; i1 < subShapes.size(); i1++) { if ( !verbose && ( array_output_count > MAXARRAYDUMP ) ) { out << "<Data Truncated. Use verbose mode to see complete listing.>" << endl; break; @@ -3099,7 +3099,7 @@ std::string bhkPackedNiTriStripsShape::InternalAsString( bool verbose ) const { out << " Material: " << subShapes[i1].material << endl; }; array_output_count = 0; - for (uint i1 = 0; i1 < 9; i1++) { + for (unsigned int i1 = 0; i1 < 9; i1++) { if ( !verbose && ( array_output_count > MAXARRAYDUMP ) ) { out << "<Data Truncated. Use verbose mode to see complete listing.>" << endl; break; @@ -3112,7 +3112,7 @@ std::string bhkPackedNiTriStripsShape::InternalAsString( bool verbose ) const { }; out << " Scale: " << scale << endl; array_output_count = 0; - for (uint i1 = 0; i1 < 3; i1++) { + for (unsigned int i1 = 0; i1 < 3; i1++) { if ( !verbose && ( array_output_count > MAXARRAYDUMP ) ) { out << "<Data Truncated. Use verbose mode to see complete listing.>" << endl; break; @@ -3127,7 +3127,7 @@ std::string bhkPackedNiTriStripsShape::InternalAsString( bool verbose ) const { return out.str(); } -void bhkPackedNiTriStripsShape::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void bhkPackedNiTriStripsShape::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { AbhkShapeCollection::FixLinks( objects, link_stack, version, user_version ); data = FixLink<hkPackedNiTriStripsData>( objects, link_stack, version ); } @@ -3140,32 +3140,32 @@ std::list<NiObjectRef> bhkPackedNiTriStripsShape::InternalGetRefs() const { return refs; } -void bhkPrismaticConstraint::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void bhkPrismaticConstraint::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { AbhkConstraint::Read( in, link_stack, version, user_version ); - for (uint i1 = 0; i1 < 8; i1++) { + for (unsigned int i1 = 0; i1 < 8; i1++) { NifStream( unknownVectors[i1], in, version ); }; - for (uint i1 = 0; i1 < 3; i1++) { + for (unsigned int i1 = 0; i1 < 3; i1++) { NifStream( unknownFloats2[i1], in, version ); }; } -void bhkPrismaticConstraint::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void bhkPrismaticConstraint::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { AbhkConstraint::Write( out, link_map, version, user_version ); - for (uint i1 = 0; i1 < 8; i1++) { + for (unsigned int i1 = 0; i1 < 8; i1++) { NifStream( unknownVectors[i1], out, version ); }; - for (uint i1 = 0; i1 < 3; i1++) { + for (unsigned int i1 = 0; i1 < 3; i1++) { NifStream( unknownFloats2[i1], out, version ); }; } std::string bhkPrismaticConstraint::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << AbhkConstraint::asString(); array_output_count = 0; - for (uint i1 = 0; i1 < 8; i1++) { + for (unsigned int i1 = 0; i1 < 8; i1++) { if ( !verbose && ( array_output_count > MAXARRAYDUMP ) ) { out << "<Data Truncated. Use verbose mode to see complete listing.>" << endl; break; @@ -3177,7 +3177,7 @@ std::string bhkPrismaticConstraint::InternalAsString( bool verbose ) const { array_output_count++; }; array_output_count = 0; - for (uint i1 = 0; i1 < 3; i1++) { + for (unsigned int i1 = 0; i1 < 3; i1++) { if ( !verbose && ( array_output_count > MAXARRAYDUMP ) ) { out << "<Data Truncated. Use verbose mode to see complete listing.>" << endl; break; @@ -3191,7 +3191,7 @@ std::string bhkPrismaticConstraint::InternalAsString( bool verbose ) const { return out.str(); } -void bhkPrismaticConstraint::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void bhkPrismaticConstraint::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { AbhkConstraint::FixLinks( objects, link_stack, version, user_version ); } @@ -3201,22 +3201,22 @@ std::list<NiObjectRef> bhkPrismaticConstraint::InternalGetRefs() const { return refs; } -void bhkRagdollConstraint::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void bhkRagdollConstraint::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { AbhkRagdollConstraint::Read( in, link_stack, version, user_version ); } -void bhkRagdollConstraint::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void bhkRagdollConstraint::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { AbhkRagdollConstraint::Write( out, link_map, version, user_version ); } std::string bhkRagdollConstraint::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << AbhkRagdollConstraint::asString(); return out.str(); } -void bhkRagdollConstraint::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void bhkRagdollConstraint::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { AbhkRagdollConstraint::FixLinks( objects, link_stack, version, user_version ); } @@ -3226,18 +3226,18 @@ std::list<NiObjectRef> bhkRagdollConstraint::InternalGetRefs() const { return refs; } -void bhkRigidBody::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { - uint block_num; +void bhkRigidBody::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { + unsigned int block_num; bhkEntity::Read( in, link_stack, version, user_version ); - for (uint i1 = 0; i1 < 5; i1++) { + for (unsigned int i1 = 0; i1 < 5; i1++) { NifStream( unknown5Floats[i1], in, version ); }; - for (uint i1 = 0; i1 < 4; i1++) { + for (unsigned int i1 = 0; i1 < 4; i1++) { NifStream( unknown4Shorts[i1], in, version ); }; NifStream( layerCopy, in, version ); NifStream( colFilterCopy, in, version ); - for (uint i1 = 0; i1 < 7; i1++) { + for (unsigned int i1 = 0; i1 < 7; i1++) { NifStream( unknown7Shorts[i1], in, version ); }; NifStream( translation, in, version ); @@ -3250,7 +3250,7 @@ void bhkRigidBody::InternalRead( istream& in, list<uint> & link_stack, unsigned NifStream( unknownFloat01, in, version ); NifStream( angularVelocity, in, version ); NifStream( unknownFloat02, in, version ); - for (uint i1 = 0; i1 < 12; i1++) { + for (unsigned int i1 = 0; i1 < 12; i1++) { NifStream( transform[i1], in, version ); }; NifStream( center, in, version ); @@ -3272,25 +3272,25 @@ void bhkRigidBody::InternalRead( istream& in, list<uint> & link_stack, unsigned NifStream( unknownInt8, in, version ); NifStream( numConstraints, in, version ); constraints.resize(numConstraints); - for (uint i1 = 0; i1 < constraints.size(); i1++) { + for (unsigned int i1 = 0; i1 < constraints.size(); i1++) { NifStream( block_num, in, version ); link_stack.push_back( block_num ); }; NifStream( unknownInt6, in, version ); } -void bhkRigidBody::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void bhkRigidBody::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { bhkEntity::Write( out, link_map, version, user_version ); - numConstraints = uint(constraints.size()); - for (uint i1 = 0; i1 < 5; i1++) { + numConstraints = unsigned int(constraints.size()); + for (unsigned int i1 = 0; i1 < 5; i1++) { NifStream( unknown5Floats[i1], out, version ); }; - for (uint i1 = 0; i1 < 4; i1++) { + for (unsigned int i1 = 0; i1 < 4; i1++) { NifStream( unknown4Shorts[i1], out, version ); }; NifStream( layerCopy, out, version ); NifStream( colFilterCopy, out, version ); - for (uint i1 = 0; i1 < 7; i1++) { + for (unsigned int i1 = 0; i1 < 7; i1++) { NifStream( unknown7Shorts[i1], out, version ); }; NifStream( translation, out, version ); @@ -3303,7 +3303,7 @@ void bhkRigidBody::InternalWrite( ostream& out, const map<NiObjectRef,uint> & li NifStream( unknownFloat01, out, version ); NifStream( angularVelocity, out, version ); NifStream( unknownFloat02, out, version ); - for (uint i1 = 0; i1 < 12; i1++) { + for (unsigned int i1 = 0; i1 < 12; i1++) { NifStream( transform[i1], out, version ); }; NifStream( center, out, version ); @@ -3324,7 +3324,7 @@ void bhkRigidBody::InternalWrite( ostream& out, const map<NiObjectRef,uint> & li NifStream( unknownInt7, out, version ); NifStream( unknownInt8, out, version ); NifStream( numConstraints, out, version ); - for (uint i1 = 0; i1 < constraints.size(); i1++) { + for (unsigned int i1 = 0; i1 < constraints.size(); i1++) { if ( constraints[i1] != NULL ) NifStream( link_map.find( StaticCast<NiObject>(constraints[i1]) )->second, out, version ); else @@ -3335,11 +3335,11 @@ void bhkRigidBody::InternalWrite( ostream& out, const map<NiObjectRef,uint> & li std::string bhkRigidBody::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << bhkEntity::asString(); - numConstraints = uint(constraints.size()); + numConstraints = unsigned int(constraints.size()); array_output_count = 0; - for (uint i1 = 0; i1 < 5; i1++) { + for (unsigned int i1 = 0; i1 < 5; i1++) { if ( !verbose && ( array_output_count > MAXARRAYDUMP ) ) { out << "<Data Truncated. Use verbose mode to see complete listing.>" << endl; break; @@ -3351,7 +3351,7 @@ std::string bhkRigidBody::InternalAsString( bool verbose ) const { array_output_count++; }; array_output_count = 0; - for (uint i1 = 0; i1 < 4; i1++) { + for (unsigned int i1 = 0; i1 < 4; i1++) { if ( !verbose && ( array_output_count > MAXARRAYDUMP ) ) { out << "<Data Truncated. Use verbose mode to see complete listing.>" << endl; break; @@ -3365,7 +3365,7 @@ std::string bhkRigidBody::InternalAsString( bool verbose ) const { out << " Layer Copy: " << layerCopy << endl; out << " Col Filter Copy: " << colFilterCopy << endl; array_output_count = 0; - for (uint i1 = 0; i1 < 7; i1++) { + for (unsigned int i1 = 0; i1 < 7; i1++) { if ( !verbose && ( array_output_count > MAXARRAYDUMP ) ) { out << "<Data Truncated. Use verbose mode to see complete listing.>" << endl; break; @@ -3387,7 +3387,7 @@ std::string bhkRigidBody::InternalAsString( bool verbose ) const { out << " Angular Velocity: " << angularVelocity << endl; out << " Unknown Float 02: " << unknownFloat02 << endl; array_output_count = 0; - for (uint i1 = 0; i1 < 12; i1++) { + for (unsigned int i1 = 0; i1 < 12; i1++) { if ( !verbose && ( array_output_count > MAXARRAYDUMP ) ) { out << "<Data Truncated. Use verbose mode to see complete listing.>" << endl; break; @@ -3417,7 +3417,7 @@ std::string bhkRigidBody::InternalAsString( bool verbose ) const { out << " Unknown Int 8: " << unknownInt8 << endl; out << " Num Constraints: " << numConstraints << endl; array_output_count = 0; - for (uint i1 = 0; i1 < constraints.size(); i1++) { + for (unsigned int i1 = 0; i1 < constraints.size(); i1++) { if ( !verbose && ( array_output_count > MAXARRAYDUMP ) ) { out << "<Data Truncated. Use verbose mode to see complete listing.>" << endl; break; @@ -3431,9 +3431,9 @@ std::string bhkRigidBody::InternalAsString( bool verbose ) const { return out.str(); } -void bhkRigidBody::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void bhkRigidBody::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { bhkEntity::FixLinks( objects, link_stack, version, user_version ); - for (uint i1 = 0; i1 < constraints.size(); i1++) { + for (unsigned int i1 = 0; i1 < constraints.size(); i1++) { constraints[i1] = FixLink<AbhkConstraint>( objects, link_stack, version ); }; } @@ -3441,29 +3441,29 @@ void bhkRigidBody::InternalFixLinks( const map<unsigned int,NiObjectRef> & objec std::list<NiObjectRef> bhkRigidBody::InternalGetRefs() const { list<Ref<NiObject> > refs; refs = bhkEntity::GetRefs(); - for (uint i1 = 0; i1 < constraints.size(); i1++) { + for (unsigned int i1 = 0; i1 < constraints.size(); i1++) { if ( constraints[i1] != NULL ) refs.push_back(StaticCast<NiObject>(constraints[i1])); }; return refs; } -void bhkRigidBodyT::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void bhkRigidBodyT::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { bhkRigidBody::Read( in, link_stack, version, user_version ); } -void bhkRigidBodyT::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void bhkRigidBodyT::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { bhkRigidBody::Write( out, link_map, version, user_version ); } std::string bhkRigidBodyT::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << bhkRigidBody::asString(); return out.str(); } -void bhkRigidBodyT::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void bhkRigidBodyT::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { bhkRigidBody::FixLinks( objects, link_stack, version, user_version ); } @@ -3473,26 +3473,26 @@ std::list<NiObjectRef> bhkRigidBodyT::InternalGetRefs() const { return refs; } -void bhkSimpleShapePhantom::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void bhkSimpleShapePhantom::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { bhkEntity::Read( in, link_stack, version, user_version ); - for (uint i1 = 0; i1 < 7; i1++) { + for (unsigned int i1 = 0; i1 < 7; i1++) { NifStream( unkownFloats[i1], in, version ); }; - for (uint i1 = 0; i1 < 3; i1++) { - for (uint i2 = 0; i2 < 5; i2++) { + for (unsigned int i1 = 0; i1 < 3; i1++) { + for (unsigned int i2 = 0; i2 < 5; i2++) { NifStream( unknownFloats2[i1][i2], in, version ); }; }; NifStream( unknownFloat, in, version ); } -void bhkSimpleShapePhantom::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void bhkSimpleShapePhantom::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { bhkEntity::Write( out, link_map, version, user_version ); - for (uint i1 = 0; i1 < 7; i1++) { + for (unsigned int i1 = 0; i1 < 7; i1++) { NifStream( unkownFloats[i1], out, version ); }; - for (uint i1 = 0; i1 < 3; i1++) { - for (uint i2 = 0; i2 < 5; i2++) { + for (unsigned int i1 = 0; i1 < 3; i1++) { + for (unsigned int i2 = 0; i2 < 5; i2++) { NifStream( unknownFloats2[i1][i2], out, version ); }; }; @@ -3501,10 +3501,10 @@ void bhkSimpleShapePhantom::InternalWrite( ostream& out, const map<NiObjectRef,u std::string bhkSimpleShapePhantom::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << bhkEntity::asString(); array_output_count = 0; - for (uint i1 = 0; i1 < 7; i1++) { + for (unsigned int i1 = 0; i1 < 7; i1++) { if ( !verbose && ( array_output_count > MAXARRAYDUMP ) ) { out << "<Data Truncated. Use verbose mode to see complete listing.>" << endl; break; @@ -3516,12 +3516,12 @@ std::string bhkSimpleShapePhantom::InternalAsString( bool verbose ) const { array_output_count++; }; array_output_count = 0; - for (uint i1 = 0; i1 < 3; i1++) { + for (unsigned int i1 = 0; i1 < 3; i1++) { if ( !verbose && ( array_output_count > MAXARRAYDUMP ) ) { out << "<Data Truncated. Use verbose mode to see complete listing.>" << endl; break; }; - for (uint i2 = 0; i2 < 5; i2++) { + for (unsigned int i2 = 0; i2 < 5; i2++) { if ( !verbose && ( array_output_count > MAXARRAYDUMP ) ) { break; }; @@ -3533,7 +3533,7 @@ std::string bhkSimpleShapePhantom::InternalAsString( bool verbose ) const { return out.str(); } -void bhkSimpleShapePhantom::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void bhkSimpleShapePhantom::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { bhkEntity::FixLinks( objects, link_stack, version, user_version ); } @@ -3543,22 +3543,22 @@ std::list<NiObjectRef> bhkSimpleShapePhantom::InternalGetRefs() const { return refs; } -void bhkSPCollisionObject::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void bhkSPCollisionObject::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiCollisionObject::Read( in, link_stack, version, user_version ); } -void bhkSPCollisionObject::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void bhkSPCollisionObject::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { NiCollisionObject::Write( out, link_map, version, user_version ); } std::string bhkSPCollisionObject::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << NiCollisionObject::asString(); return out.str(); } -void bhkSPCollisionObject::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void bhkSPCollisionObject::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiCollisionObject::FixLinks( objects, link_stack, version, user_version ); } @@ -3568,25 +3568,25 @@ std::list<NiObjectRef> bhkSPCollisionObject::InternalGetRefs() const { return refs; } -void bhkSphereShape::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void bhkSphereShape::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { bhkConvexShape::Read( in, link_stack, version, user_version ); NifStream( radius, in, version ); } -void bhkSphereShape::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void bhkSphereShape::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { bhkConvexShape::Write( out, link_map, version, user_version ); NifStream( radius, out, version ); } std::string bhkSphereShape::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << bhkConvexShape::asString(); out << " Radius: " << radius << endl; return out.str(); } -void bhkSphereShape::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void bhkSphereShape::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { bhkConvexShape::FixLinks( objects, link_stack, version, user_version ); } @@ -3596,20 +3596,20 @@ std::list<NiObjectRef> bhkSphereShape::InternalGetRefs() const { return refs; } -void bhkStiffSpringConstraint::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void bhkStiffSpringConstraint::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { AbhkConstraint::Read( in, link_stack, version, user_version ); - for (uint i1 = 0; i1 < 2; i1++) { - for (uint i2 = 0; i2 < 4; i2++) { + for (unsigned int i1 = 0; i1 < 2; i1++) { + for (unsigned int i2 = 0; i2 < 4; i2++) { NifStream( unknownFloats[i1][i2], in, version ); }; }; NifStream( unknownFloat, in, version ); } -void bhkStiffSpringConstraint::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void bhkStiffSpringConstraint::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { AbhkConstraint::Write( out, link_map, version, user_version ); - for (uint i1 = 0; i1 < 2; i1++) { - for (uint i2 = 0; i2 < 4; i2++) { + for (unsigned int i1 = 0; i1 < 2; i1++) { + for (unsigned int i2 = 0; i2 < 4; i2++) { NifStream( unknownFloats[i1][i2], out, version ); }; }; @@ -3618,15 +3618,15 @@ void bhkStiffSpringConstraint::InternalWrite( ostream& out, const map<NiObjectRe std::string bhkStiffSpringConstraint::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << AbhkConstraint::asString(); array_output_count = 0; - for (uint i1 = 0; i1 < 2; i1++) { + for (unsigned int i1 = 0; i1 < 2; i1++) { if ( !verbose && ( array_output_count > MAXARRAYDUMP ) ) { out << "<Data Truncated. Use verbose mode to see complete listing.>" << endl; break; }; - for (uint i2 = 0; i2 < 4; i2++) { + for (unsigned int i2 = 0; i2 < 4; i2++) { if ( !verbose && ( array_output_count > MAXARRAYDUMP ) ) { break; }; @@ -3638,7 +3638,7 @@ std::string bhkStiffSpringConstraint::InternalAsString( bool verbose ) const { return out.str(); } -void bhkStiffSpringConstraint::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void bhkStiffSpringConstraint::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { AbhkConstraint::FixLinks( objects, link_stack, version, user_version ); } @@ -3648,7 +3648,7 @@ std::list<NiObjectRef> bhkStiffSpringConstraint::InternalGetRefs() const { return refs; } -void bhkTransformShape::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void bhkTransformShape::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { bhkEntity::Read( in, link_stack, version, user_version ); NifStream( unknownFloat1, in, version ); NifStream( unknownFloat2, in, version ); @@ -3656,7 +3656,7 @@ void bhkTransformShape::InternalRead( istream& in, list<uint> & link_stack, unsi NifStream( transform, in, version ); } -void bhkTransformShape::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void bhkTransformShape::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { bhkEntity::Write( out, link_map, version, user_version ); NifStream( unknownFloat1, out, version ); NifStream( unknownFloat2, out, version ); @@ -3666,7 +3666,7 @@ void bhkTransformShape::InternalWrite( ostream& out, const map<NiObjectRef,uint> std::string bhkTransformShape::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << bhkEntity::asString(); out << " Unknown Float 1: " << unknownFloat1 << endl; out << " Unknown Float 2: " << unknownFloat2 << endl; @@ -3675,7 +3675,7 @@ std::string bhkTransformShape::InternalAsString( bool verbose ) const { return out.str(); } -void bhkTransformShape::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void bhkTransformShape::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { bhkEntity::FixLinks( objects, link_stack, version, user_version ); } @@ -3685,22 +3685,22 @@ std::list<NiObjectRef> bhkTransformShape::InternalGetRefs() const { return refs; } -void bhkConvexTransformShape::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void bhkConvexTransformShape::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { bhkTransformShape::Read( in, link_stack, version, user_version ); } -void bhkConvexTransformShape::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void bhkConvexTransformShape::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { bhkTransformShape::Write( out, link_map, version, user_version ); } std::string bhkConvexTransformShape::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << bhkTransformShape::asString(); return out.str(); } -void bhkConvexTransformShape::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void bhkConvexTransformShape::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { bhkTransformShape::FixLinks( objects, link_stack, version, user_version ); } @@ -3710,13 +3710,13 @@ std::list<NiObjectRef> bhkConvexTransformShape::InternalGetRefs() const { return refs; } -void BSBound::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void BSBound::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiExtraData::Read( in, link_stack, version, user_version ); NifStream( center, in, version ); NifStream( dimensions, in, version ); } -void BSBound::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void BSBound::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { NiExtraData::Write( out, link_map, version, user_version ); NifStream( center, out, version ); NifStream( dimensions, out, version ); @@ -3724,14 +3724,14 @@ void BSBound::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_ma std::string BSBound::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << NiExtraData::asString(); out << " Center: " << center << endl; out << " Dimensions: " << dimensions << endl; return out.str(); } -void BSBound::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void BSBound::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiExtraData::FixLinks( objects, link_stack, version, user_version ); } @@ -3741,11 +3741,11 @@ std::list<NiObjectRef> BSBound::InternalGetRefs() const { return refs; } -void BSFurnitureMarker::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void BSFurnitureMarker::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiExtraData::Read( in, link_stack, version, user_version ); NifStream( numPositions, in, version ); positions.resize(numPositions); - for (uint i1 = 0; i1 < positions.size(); i1++) { + for (unsigned int i1 = 0; i1 < positions.size(); i1++) { NifStream( positions[i1].offset, in, version ); NifStream( positions[i1].orientation, in, version ); NifStream( positions[i1].positionRef1, in, version ); @@ -3753,11 +3753,11 @@ void BSFurnitureMarker::InternalRead( istream& in, list<uint> & link_stack, unsi }; } -void BSFurnitureMarker::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void BSFurnitureMarker::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { NiExtraData::Write( out, link_map, version, user_version ); - numPositions = uint(positions.size()); + numPositions = unsigned int(positions.size()); NifStream( numPositions, out, version ); - for (uint i1 = 0; i1 < positions.size(); i1++) { + for (unsigned int i1 = 0; i1 < positions.size(); i1++) { NifStream( positions[i1].offset, out, version ); NifStream( positions[i1].orientation, out, version ); NifStream( positions[i1].positionRef1, out, version ); @@ -3767,12 +3767,12 @@ void BSFurnitureMarker::InternalWrite( ostream& out, const map<NiObjectRef,uint> std::string BSFurnitureMarker::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << NiExtraData::asString(); - numPositions = uint(positions.size()); + numPositions = unsigned int(positions.size()); out << " Num Positions: " << numPositions << endl; array_output_count = 0; - for (uint i1 = 0; i1 < positions.size(); i1++) { + for (unsigned int i1 = 0; i1 < positions.size(); i1++) { if ( !verbose && ( array_output_count > MAXARRAYDUMP ) ) { out << "<Data Truncated. Use verbose mode to see complete listing.>" << endl; break; @@ -3785,7 +3785,7 @@ std::string BSFurnitureMarker::InternalAsString( bool verbose ) const { return out.str(); } -void BSFurnitureMarker::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void BSFurnitureMarker::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiExtraData::FixLinks( objects, link_stack, version, user_version ); } @@ -3795,25 +3795,25 @@ std::list<NiObjectRef> BSFurnitureMarker::InternalGetRefs() const { return refs; } -void BSParentVelocityModifier::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void BSParentVelocityModifier::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiPSysModifier::Read( in, link_stack, version, user_version ); NifStream( unknownFloat, in, version ); } -void BSParentVelocityModifier::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void BSParentVelocityModifier::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { NiPSysModifier::Write( out, link_map, version, user_version ); NifStream( unknownFloat, out, version ); } std::string BSParentVelocityModifier::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << NiPSysModifier::asString(); out << " Unknown Float: " << unknownFloat << endl; return out.str(); } -void BSParentVelocityModifier::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void BSParentVelocityModifier::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiPSysModifier::FixLinks( objects, link_stack, version, user_version ); } @@ -3823,22 +3823,22 @@ std::list<NiObjectRef> BSParentVelocityModifier::InternalGetRefs() const { return refs; } -void BSPSysArrayEmitter::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void BSPSysArrayEmitter::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiPSysVolumeEmitter::Read( in, link_stack, version, user_version ); } -void BSPSysArrayEmitter::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void BSPSysArrayEmitter::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { NiPSysVolumeEmitter::Write( out, link_map, version, user_version ); } std::string BSPSysArrayEmitter::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << NiPSysVolumeEmitter::asString(); return out.str(); } -void BSPSysArrayEmitter::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void BSPSysArrayEmitter::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiPSysVolumeEmitter::FixLinks( objects, link_stack, version, user_version ); } @@ -3848,25 +3848,25 @@ std::list<NiObjectRef> BSPSysArrayEmitter::InternalGetRefs() const { return refs; } -void BSXFlags::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void BSXFlags::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiExtraData::Read( in, link_stack, version, user_version ); NifStream( flags, in, version ); } -void BSXFlags::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void BSXFlags::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { NiExtraData::Write( out, link_map, version, user_version ); NifStream( flags, out, version ); } std::string BSXFlags::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << NiExtraData::asString(); out << " Flags: " << flags << endl; return out.str(); } -void BSXFlags::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void BSXFlags::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiExtraData::FixLinks( objects, link_stack, version, user_version ); } @@ -3876,47 +3876,47 @@ std::list<NiObjectRef> BSXFlags::InternalGetRefs() const { return refs; } -void hkPackedNiTriStripsData::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void hkPackedNiTriStripsData::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { AbhkShapeCollection::Read( in, link_stack, version, user_version ); NifStream( numTriangles, in, version ); triangles.resize(numTriangles); - for (uint i1 = 0; i1 < triangles.size(); i1++) { + for (unsigned int i1 = 0; i1 < triangles.size(); i1++) { NifStream( triangles[i1].triangle, in, version ); NifStream( triangles[i1].unknownShort, in, version ); NifStream( triangles[i1].normal, in, version ); }; NifStream( numVertices, in, version ); vertices.resize(numVertices); - for (uint i1 = 0; i1 < vertices.size(); i1++) { + for (unsigned int i1 = 0; i1 < vertices.size(); i1++) { NifStream( vertices[i1], in, version ); }; } -void hkPackedNiTriStripsData::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void hkPackedNiTriStripsData::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { AbhkShapeCollection::Write( out, link_map, version, user_version ); - numVertices = uint(vertices.size()); - numTriangles = uint(triangles.size()); + numVertices = unsigned int(vertices.size()); + numTriangles = unsigned int(triangles.size()); NifStream( numTriangles, out, version ); - for (uint i1 = 0; i1 < triangles.size(); i1++) { + for (unsigned int i1 = 0; i1 < triangles.size(); i1++) { NifStream( triangles[i1].triangle, out, version ); NifStream( triangles[i1].unknownShort, out, version ); NifStream( triangles[i1].normal, out, version ); }; NifStream( numVertices, out, version ); - for (uint i1 = 0; i1 < vertices.size(); i1++) { + for (unsigned int i1 = 0; i1 < vertices.size(); i1++) { NifStream( vertices[i1], out, version ); }; } std::string hkPackedNiTriStripsData::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << AbhkShapeCollection::asString(); - numVertices = uint(vertices.size()); - numTriangles = uint(triangles.size()); + numVertices = unsigned int(vertices.size()); + numTriangles = unsigned int(triangles.size()); out << " Num Triangles: " << numTriangles << endl; array_output_count = 0; - for (uint i1 = 0; i1 < triangles.size(); i1++) { + for (unsigned int i1 = 0; i1 < triangles.size(); i1++) { if ( !verbose && ( array_output_count > MAXARRAYDUMP ) ) { out << "<Data Truncated. Use verbose mode to see complete listing.>" << endl; break; @@ -3927,7 +3927,7 @@ std::string hkPackedNiTriStripsData::InternalAsString( bool verbose ) const { }; out << " Num Vertices: " << numVertices << endl; array_output_count = 0; - for (uint i1 = 0; i1 < vertices.size(); i1++) { + for (unsigned int i1 = 0; i1 < vertices.size(); i1++) { if ( !verbose && ( array_output_count > MAXARRAYDUMP ) ) { out << "<Data Truncated. Use verbose mode to see complete listing.>" << endl; break; @@ -3941,7 +3941,7 @@ std::string hkPackedNiTriStripsData::InternalAsString( bool verbose ) const { return out.str(); } -void hkPackedNiTriStripsData::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void hkPackedNiTriStripsData::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { AbhkShapeCollection::FixLinks( objects, link_stack, version, user_version ); } @@ -3951,8 +3951,8 @@ std::list<NiObjectRef> hkPackedNiTriStripsData::InternalGetRefs() const { return refs; } -void NiAlphaController::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { - uint block_num; +void NiAlphaController::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { + unsigned int block_num; NiSingleInterpolatorController::Read( in, link_stack, version, user_version ); if ( version <= 0x0A010000 ) { NifStream( block_num, in, version ); @@ -3960,7 +3960,7 @@ void NiAlphaController::InternalRead( istream& in, list<uint> & link_stack, unsi }; } -void NiAlphaController::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiAlphaController::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { NiSingleInterpolatorController::Write( out, link_map, version, user_version ); if ( version <= 0x0A010000 ) { if ( data != NULL ) @@ -3972,13 +3972,13 @@ void NiAlphaController::InternalWrite( ostream& out, const map<NiObjectRef,uint> std::string NiAlphaController::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << NiSingleInterpolatorController::asString(); out << " Data: " << data << endl; return out.str(); } -void NiAlphaController::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiAlphaController::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiSingleInterpolatorController::FixLinks( objects, link_stack, version, user_version ); if ( version <= 0x0A010000 ) { data = FixLink<NiFloatData>( objects, link_stack, version ); @@ -3993,13 +3993,13 @@ std::list<NiObjectRef> NiAlphaController::InternalGetRefs() const { return refs; } -void NiAlphaProperty::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiAlphaProperty::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiProperty::Read( in, link_stack, version, user_version ); NifStream( flags, in, version ); NifStream( threshold, in, version ); } -void NiAlphaProperty::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiAlphaProperty::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { NiProperty::Write( out, link_map, version, user_version ); NifStream( flags, out, version ); NifStream( threshold, out, version ); @@ -4007,14 +4007,14 @@ void NiAlphaProperty::InternalWrite( ostream& out, const map<NiObjectRef,uint> & std::string NiAlphaProperty::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << NiProperty::asString(); out << " Flags: " << flags << endl; out << " Threshold: " << threshold << endl; return out.str(); } -void NiAlphaProperty::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiAlphaProperty::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiProperty::FixLinks( objects, link_stack, version, user_version ); } @@ -4024,22 +4024,22 @@ std::list<NiObjectRef> NiAlphaProperty::InternalGetRefs() const { return refs; } -void NiAmbientLight::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiAmbientLight::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiLight::Read( in, link_stack, version, user_version ); } -void NiAmbientLight::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiAmbientLight::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { NiLight::Write( out, link_map, version, user_version ); } std::string NiAmbientLight::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << NiLight::asString(); return out.str(); } -void NiAmbientLight::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiAmbientLight::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiLight::FixLinks( objects, link_stack, version, user_version ); } @@ -4049,7 +4049,7 @@ std::list<NiObjectRef> NiAmbientLight::InternalGetRefs() const { return refs; } -void NiAutoNormalParticlesData::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiAutoNormalParticlesData::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiGeometryData::Read( in, link_stack, version, user_version ); if ( version <= 0x04000002 ) { NifStream( numParticles, in, version ); @@ -4066,13 +4066,13 @@ void NiAutoNormalParticlesData::InternalRead( istream& in, list<uint> & link_sta NifStream( hasSizes, in, version ); if ( (hasSizes != 0) ) { sizes.resize(numVertices); - for (uint i2 = 0; i2 < sizes.size(); i2++) { + for (unsigned int i2 = 0; i2 < sizes.size(); i2++) { NifStream( sizes[i2], in, version ); }; }; } -void NiAutoNormalParticlesData::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiAutoNormalParticlesData::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { NiGeometryData::Write( out, link_map, version, user_version ); if ( version <= 0x04000002 ) { NifStream( numParticles, out, version ); @@ -4088,7 +4088,7 @@ void NiAutoNormalParticlesData::InternalWrite( ostream& out, const map<NiObjectR }; NifStream( hasSizes, out, version ); if ( (hasSizes != 0) ) { - for (uint i2 = 0; i2 < sizes.size(); i2++) { + for (unsigned int i2 = 0; i2 < sizes.size(); i2++) { NifStream( sizes[i2], out, version ); }; }; @@ -4096,7 +4096,7 @@ void NiAutoNormalParticlesData::InternalWrite( ostream& out, const map<NiObjectR std::string NiAutoNormalParticlesData::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << NiGeometryData::asString(); out << " Num Particles: " << numParticles << endl; out << " Size: " << size << endl; @@ -4105,7 +4105,7 @@ std::string NiAutoNormalParticlesData::InternalAsString( bool verbose ) const { out << " Has Sizes: " << hasSizes << endl; if ( (hasSizes != 0) ) { array_output_count = 0; - for (uint i2 = 0; i2 < sizes.size(); i2++) { + for (unsigned int i2 = 0; i2 < sizes.size(); i2++) { if ( !verbose && ( array_output_count > MAXARRAYDUMP ) ) { out << "<Data Truncated. Use verbose mode to see complete listing.>" << endl; break; @@ -4120,7 +4120,7 @@ std::string NiAutoNormalParticlesData::InternalAsString( bool verbose ) const { return out.str(); } -void NiAutoNormalParticlesData::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiAutoNormalParticlesData::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiGeometryData::FixLinks( objects, link_stack, version, user_version ); } @@ -4130,32 +4130,32 @@ std::list<NiObjectRef> NiAutoNormalParticlesData::InternalGetRefs() const { return refs; } -void NiBinaryExtraData::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiBinaryExtraData::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiExtraData::Read( in, link_stack, version, user_version ); NifStream( binaryData.dataSize, in, version ); binaryData.data.resize(binaryData.dataSize); - for (uint i1 = 0; i1 < binaryData.data.size(); i1++) { + for (unsigned int i1 = 0; i1 < binaryData.data.size(); i1++) { NifStream( binaryData.data[i1], in, version ); }; } -void NiBinaryExtraData::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiBinaryExtraData::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { NiExtraData::Write( out, link_map, version, user_version ); - binaryData.dataSize = uint(binaryData.data.size()); + binaryData.dataSize = unsigned int(binaryData.data.size()); NifStream( binaryData.dataSize, out, version ); - for (uint i1 = 0; i1 < binaryData.data.size(); i1++) { + for (unsigned int i1 = 0; i1 < binaryData.data.size(); i1++) { NifStream( binaryData.data[i1], out, version ); }; } std::string NiBinaryExtraData::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << NiExtraData::asString(); - binaryData.dataSize = uint(binaryData.data.size()); + binaryData.dataSize = unsigned int(binaryData.data.size()); out << " Data Size: " << binaryData.dataSize << endl; array_output_count = 0; - for (uint i1 = 0; i1 < binaryData.data.size(); i1++) { + for (unsigned int i1 = 0; i1 < binaryData.data.size(); i1++) { if ( !verbose && ( array_output_count > MAXARRAYDUMP ) ) { out << "<Data Truncated. Use verbose mode to see complete listing.>" << endl; break; @@ -4169,7 +4169,7 @@ std::string NiBinaryExtraData::InternalAsString( bool verbose ) const { return out.str(); } -void NiBinaryExtraData::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiBinaryExtraData::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiExtraData::FixLinks( objects, link_stack, version, user_version ); } @@ -4179,25 +4179,25 @@ std::list<NiObjectRef> NiBinaryExtraData::InternalGetRefs() const { return refs; } -void NiBlendBoolInterpolator::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiBlendBoolInterpolator::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiBlendInterpolator::Read( in, link_stack, version, user_version ); NifStream( boolValue, in, version ); } -void NiBlendBoolInterpolator::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiBlendBoolInterpolator::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { NiBlendInterpolator::Write( out, link_map, version, user_version ); NifStream( boolValue, out, version ); } std::string NiBlendBoolInterpolator::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << NiBlendInterpolator::asString(); out << " Bool Value: " << boolValue << endl; return out.str(); } -void NiBlendBoolInterpolator::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiBlendBoolInterpolator::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiBlendInterpolator::FixLinks( objects, link_stack, version, user_version ); } @@ -4207,25 +4207,25 @@ std::list<NiObjectRef> NiBlendBoolInterpolator::InternalGetRefs() const { return refs; } -void NiBlendFloatInterpolator::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiBlendFloatInterpolator::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiBlendInterpolator::Read( in, link_stack, version, user_version ); NifStream( floatValue, in, version ); } -void NiBlendFloatInterpolator::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiBlendFloatInterpolator::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { NiBlendInterpolator::Write( out, link_map, version, user_version ); NifStream( floatValue, out, version ); } std::string NiBlendFloatInterpolator::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << NiBlendInterpolator::asString(); out << " Float Value: " << floatValue << endl; return out.str(); } -void NiBlendFloatInterpolator::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiBlendFloatInterpolator::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiBlendInterpolator::FixLinks( objects, link_stack, version, user_version ); } @@ -4235,25 +4235,25 @@ std::list<NiObjectRef> NiBlendFloatInterpolator::InternalGetRefs() const { return refs; } -void NiBlendPoint3Interpolator::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiBlendPoint3Interpolator::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiBlendInterpolator::Read( in, link_stack, version, user_version ); NifStream( pointValue, in, version ); } -void NiBlendPoint3Interpolator::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiBlendPoint3Interpolator::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { NiBlendInterpolator::Write( out, link_map, version, user_version ); NifStream( pointValue, out, version ); } std::string NiBlendPoint3Interpolator::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << NiBlendInterpolator::asString(); out << " Point Value: " << pointValue << endl; return out.str(); } -void NiBlendPoint3Interpolator::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiBlendPoint3Interpolator::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiBlendInterpolator::FixLinks( objects, link_stack, version, user_version ); } @@ -4263,22 +4263,22 @@ std::list<NiObjectRef> NiBlendPoint3Interpolator::InternalGetRefs() const { return refs; } -void NiBlendTransformInterpolator::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiBlendTransformInterpolator::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiBlendInterpolator::Read( in, link_stack, version, user_version ); } -void NiBlendTransformInterpolator::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiBlendTransformInterpolator::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { NiBlendInterpolator::Write( out, link_map, version, user_version ); } std::string NiBlendTransformInterpolator::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << NiBlendInterpolator::asString(); return out.str(); } -void NiBlendTransformInterpolator::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiBlendTransformInterpolator::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiBlendInterpolator::FixLinks( objects, link_stack, version, user_version ); } @@ -4288,15 +4288,15 @@ std::list<NiObjectRef> NiBlendTransformInterpolator::InternalGetRefs() const { return refs; } -void NiBoneLODController::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { - uint block_num; +void NiBoneLODController::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { + unsigned int block_num; ABoneLODController::Read( in, link_stack, version, user_version ); NifStream( numShapeGroups, in, version ); shapeGroups1.resize(numShapeGroups); - for (uint i1 = 0; i1 < shapeGroups1.size(); i1++) { + for (unsigned int i1 = 0; i1 < shapeGroups1.size(); i1++) { NifStream( shapeGroups1[i1].numLinkPairs, in, version ); shapeGroups1[i1].linkPairs.resize(shapeGroups1[i1].numLinkPairs); - for (uint i2 = 0; i2 < shapeGroups1[i1].linkPairs.size(); i2++) { + for (unsigned int i2 = 0; i2 < shapeGroups1[i1].linkPairs.size(); i2++) { NifStream( block_num, in, version ); link_stack.push_back( block_num ); NifStream( block_num, in, version ); @@ -4305,21 +4305,21 @@ void NiBoneLODController::InternalRead( istream& in, list<uint> & link_stack, un }; NifStream( numShapeGroups2, in, version ); shapeGroups2.resize(numShapeGroups2); - for (uint i1 = 0; i1 < shapeGroups2.size(); i1++) { + for (unsigned int i1 = 0; i1 < shapeGroups2.size(); i1++) { NifStream( block_num, in, version ); link_stack.push_back( block_num ); }; } -void NiBoneLODController::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiBoneLODController::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { ABoneLODController::Write( out, link_map, version, user_version ); - numShapeGroups2 = uint(shapeGroups2.size()); - numShapeGroups = uint(shapeGroups1.size()); + numShapeGroups2 = unsigned int(shapeGroups2.size()); + numShapeGroups = unsigned int(shapeGroups1.size()); NifStream( numShapeGroups, out, version ); - for (uint i1 = 0; i1 < shapeGroups1.size(); i1++) { - shapeGroups1[i1].numLinkPairs = uint(shapeGroups1[i1].linkPairs.size()); + for (unsigned int i1 = 0; i1 < shapeGroups1.size(); i1++) { + shapeGroups1[i1].numLinkPairs = unsigned int(shapeGroups1[i1].linkPairs.size()); NifStream( shapeGroups1[i1].numLinkPairs, out, version ); - for (uint i2 = 0; i2 < shapeGroups1[i1].linkPairs.size(); i2++) { + for (unsigned int i2 = 0; i2 < shapeGroups1[i1].linkPairs.size(); i2++) { if ( shapeGroups1[i1].linkPairs[i2].shape != NULL ) NifStream( link_map.find( StaticCast<NiObject>(shapeGroups1[i1].linkPairs[i2].shape) )->second, out, version ); else @@ -4331,7 +4331,7 @@ void NiBoneLODController::InternalWrite( ostream& out, const map<NiObjectRef,uin }; }; NifStream( numShapeGroups2, out, version ); - for (uint i1 = 0; i1 < shapeGroups2.size(); i1++) { + for (unsigned int i1 = 0; i1 < shapeGroups2.size(); i1++) { if ( shapeGroups2[i1] != NULL ) NifStream( link_map.find( StaticCast<NiObject>(shapeGroups2[i1]) )->second, out, version ); else @@ -4341,21 +4341,21 @@ void NiBoneLODController::InternalWrite( ostream& out, const map<NiObjectRef,uin std::string NiBoneLODController::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << ABoneLODController::asString(); - numShapeGroups2 = uint(shapeGroups2.size()); - numShapeGroups = uint(shapeGroups1.size()); + numShapeGroups2 = unsigned int(shapeGroups2.size()); + numShapeGroups = unsigned int(shapeGroups1.size()); out << " Num Shape Groups: " << numShapeGroups << endl; array_output_count = 0; - for (uint i1 = 0; i1 < shapeGroups1.size(); i1++) { + for (unsigned int i1 = 0; i1 < shapeGroups1.size(); i1++) { if ( !verbose && ( array_output_count > MAXARRAYDUMP ) ) { out << "<Data Truncated. Use verbose mode to see complete listing.>" << endl; break; }; - shapeGroups1[i1].numLinkPairs = uint(shapeGroups1[i1].linkPairs.size()); + shapeGroups1[i1].numLinkPairs = unsigned int(shapeGroups1[i1].linkPairs.size()); out << " Num Link Pairs: " << shapeGroups1[i1].numLinkPairs << endl; array_output_count = 0; - for (uint i2 = 0; i2 < shapeGroups1[i1].linkPairs.size(); i2++) { + for (unsigned int i2 = 0; i2 < shapeGroups1[i1].linkPairs.size(); i2++) { if ( !verbose && ( array_output_count > MAXARRAYDUMP ) ) { out << "<Data Truncated. Use verbose mode to see complete listing.>" << endl; break; @@ -4366,7 +4366,7 @@ std::string NiBoneLODController::InternalAsString( bool verbose ) const { }; out << " Num Shape Groups 2: " << numShapeGroups2 << endl; array_output_count = 0; - for (uint i1 = 0; i1 < shapeGroups2.size(); i1++) { + for (unsigned int i1 = 0; i1 < shapeGroups2.size(); i1++) { if ( !verbose && ( array_output_count > MAXARRAYDUMP ) ) { out << "<Data Truncated. Use verbose mode to see complete listing.>" << endl; break; @@ -4380,15 +4380,15 @@ std::string NiBoneLODController::InternalAsString( bool verbose ) const { return out.str(); } -void NiBoneLODController::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiBoneLODController::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { ABoneLODController::FixLinks( objects, link_stack, version, user_version ); - for (uint i1 = 0; i1 < shapeGroups1.size(); i1++) { - for (uint i2 = 0; i2 < shapeGroups1[i1].linkPairs.size(); i2++) { + for (unsigned int i1 = 0; i1 < shapeGroups1.size(); i1++) { + for (unsigned int i2 = 0; i2 < shapeGroups1[i1].linkPairs.size(); i2++) { shapeGroups1[i1].linkPairs[i2].shape = FixLink<NiTriShape>( objects, link_stack, version ); shapeGroups1[i1].linkPairs[i2].skinInstance = FixLink<NiSkinInstance>( objects, link_stack, version ); }; }; - for (uint i1 = 0; i1 < shapeGroups2.size(); i1++) { + for (unsigned int i1 = 0; i1 < shapeGroups2.size(); i1++) { shapeGroups2[i1] = FixLink<NiTriShape>( objects, link_stack, version ); }; } @@ -4396,56 +4396,56 @@ void NiBoneLODController::InternalFixLinks( const map<unsigned int,NiObjectRef> std::list<NiObjectRef> NiBoneLODController::InternalGetRefs() const { list<Ref<NiObject> > refs; refs = ABoneLODController::GetRefs(); - for (uint i1 = 0; i1 < shapeGroups1.size(); i1++) { - for (uint i2 = 0; i2 < shapeGroups1[i1].linkPairs.size(); i2++) { + for (unsigned int i1 = 0; i1 < shapeGroups1.size(); i1++) { + for (unsigned int i2 = 0; i2 < shapeGroups1[i1].linkPairs.size(); i2++) { if ( shapeGroups1[i1].linkPairs[i2].shape != NULL ) refs.push_back(StaticCast<NiObject>(shapeGroups1[i1].linkPairs[i2].shape)); if ( shapeGroups1[i1].linkPairs[i2].skinInstance != NULL ) refs.push_back(StaticCast<NiObject>(shapeGroups1[i1].linkPairs[i2].skinInstance)); }; }; - for (uint i1 = 0; i1 < shapeGroups2.size(); i1++) { + for (unsigned int i1 = 0; i1 < shapeGroups2.size(); i1++) { if ( shapeGroups2[i1] != NULL ) refs.push_back(StaticCast<NiObject>(shapeGroups2[i1])); }; return refs; } -void NiBoolData::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiBoolData::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { AKeyedData::Read( in, link_stack, version, user_version ); NifStream( data.numKeys, in, version ); if ( (data.numKeys != 0) ) { NifStream( data.interpolation, in, version ); }; data.keys.resize(data.numKeys); - for (uint i1 = 0; i1 < data.keys.size(); i1++) { + for (unsigned int i1 = 0; i1 < data.keys.size(); i1++) { NifStream( data.keys[i1], in, version, data.interpolation ); }; } -void NiBoolData::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiBoolData::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { AKeyedData::Write( out, link_map, version, user_version ); - data.numKeys = uint(data.keys.size()); + data.numKeys = unsigned int(data.keys.size()); NifStream( data.numKeys, out, version ); if ( (data.numKeys != 0) ) { NifStream( data.interpolation, out, version ); }; - for (uint i1 = 0; i1 < data.keys.size(); i1++) { + for (unsigned int i1 = 0; i1 < data.keys.size(); i1++) { NifStream( data.keys[i1], out, version, data.interpolation ); }; } std::string NiBoolData::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << AKeyedData::asString(); - data.numKeys = uint(data.keys.size()); + data.numKeys = unsigned int(data.keys.size()); out << " Num Keys: " << data.numKeys << endl; if ( (data.numKeys != 0) ) { out << " Interpolation: " << data.interpolation << endl; }; array_output_count = 0; - for (uint i1 = 0; i1 < data.keys.size(); i1++) { + for (unsigned int i1 = 0; i1 < data.keys.size(); i1++) { if ( !verbose && ( array_output_count > MAXARRAYDUMP ) ) { out << "<Data Truncated. Use verbose mode to see complete listing.>" << endl; break; @@ -4459,7 +4459,7 @@ std::string NiBoolData::InternalAsString( bool verbose ) const { return out.str(); } -void NiBoolData::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiBoolData::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { AKeyedData::FixLinks( objects, link_stack, version, user_version ); } @@ -4469,25 +4469,25 @@ std::list<NiObjectRef> NiBoolData::InternalGetRefs() const { return refs; } -void NiBooleanExtraData::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiBooleanExtraData::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiExtraData::Read( in, link_stack, version, user_version ); NifStream( booleanData, in, version ); } -void NiBooleanExtraData::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiBooleanExtraData::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { NiExtraData::Write( out, link_map, version, user_version ); NifStream( booleanData, out, version ); } std::string NiBooleanExtraData::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << NiExtraData::asString(); out << " Boolean Data: " << booleanData << endl; return out.str(); } -void NiBooleanExtraData::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiBooleanExtraData::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiExtraData::FixLinks( objects, link_stack, version, user_version ); } @@ -4497,15 +4497,15 @@ std::list<NiObjectRef> NiBooleanExtraData::InternalGetRefs() const { return refs; } -void NiBoolInterpolator::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { - uint block_num; +void NiBoolInterpolator::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { + unsigned int block_num; NiInterpolator::Read( in, link_stack, version, user_version ); NifStream( boolValue, in, version ); NifStream( block_num, in, version ); link_stack.push_back( block_num ); } -void NiBoolInterpolator::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiBoolInterpolator::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { NiInterpolator::Write( out, link_map, version, user_version ); NifStream( boolValue, out, version ); if ( data != NULL ) @@ -4516,14 +4516,14 @@ void NiBoolInterpolator::InternalWrite( ostream& out, const map<NiObjectRef,uint std::string NiBoolInterpolator::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << NiInterpolator::asString(); out << " Bool Value: " << boolValue << endl; out << " Data: " << data << endl; return out.str(); } -void NiBoolInterpolator::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiBoolInterpolator::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiInterpolator::FixLinks( objects, link_stack, version, user_version ); data = FixLink<NiBoolData>( objects, link_stack, version ); } @@ -4536,15 +4536,15 @@ std::list<NiObjectRef> NiBoolInterpolator::InternalGetRefs() const { return refs; } -void NiBoolTimelineInterpolator::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { - uint block_num; +void NiBoolTimelineInterpolator::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { + unsigned int block_num; NiInterpolator::Read( in, link_stack, version, user_version ); NifStream( boolValue, in, version ); NifStream( block_num, in, version ); link_stack.push_back( block_num ); } -void NiBoolTimelineInterpolator::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiBoolTimelineInterpolator::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { NiInterpolator::Write( out, link_map, version, user_version ); NifStream( boolValue, out, version ); if ( data != NULL ) @@ -4555,14 +4555,14 @@ void NiBoolTimelineInterpolator::InternalWrite( ostream& out, const map<NiObject std::string NiBoolTimelineInterpolator::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << NiInterpolator::asString(); out << " Bool Value: " << boolValue << endl; out << " Data: " << data << endl; return out.str(); } -void NiBoolTimelineInterpolator::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiBoolTimelineInterpolator::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiInterpolator::FixLinks( objects, link_stack, version, user_version ); data = FixLink<NiBoolData>( objects, link_stack, version ); } @@ -4575,22 +4575,22 @@ std::list<NiObjectRef> NiBoolTimelineInterpolator::InternalGetRefs() const { return refs; } -void NiBSBoneLODController::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiBSBoneLODController::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { ABoneLODController::Read( in, link_stack, version, user_version ); } -void NiBSBoneLODController::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiBSBoneLODController::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { ABoneLODController::Write( out, link_map, version, user_version ); } std::string NiBSBoneLODController::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << ABoneLODController::asString(); return out.str(); } -void NiBSBoneLODController::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiBSBoneLODController::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { ABoneLODController::FixLinks( objects, link_stack, version, user_version ); } @@ -4600,25 +4600,25 @@ std::list<NiObjectRef> NiBSBoneLODController::InternalGetRefs() const { return refs; } -void NiBSplineBasisData::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiBSplineBasisData::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiObject::Read( in, link_stack, version, user_version ); NifStream( numControlPt, in, version ); } -void NiBSplineBasisData::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiBSplineBasisData::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { NiObject::Write( out, link_map, version, user_version ); NifStream( numControlPt, out, version ); } std::string NiBSplineBasisData::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << NiObject::asString(); out << " Num Control Pt: " << numControlPt << endl; return out.str(); } -void NiBSplineBasisData::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiBSplineBasisData::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiObject::FixLinks( objects, link_stack, version, user_version ); } @@ -4628,26 +4628,26 @@ std::list<NiObjectRef> NiBSplineBasisData::InternalGetRefs() const { return refs; } -void NiBSplineCompFloatInterpolator::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiBSplineCompFloatInterpolator::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiBSplineInterpolator::Read( in, link_stack, version, user_version ); - for (uint i1 = 0; i1 < 4; i1++) { + for (unsigned int i1 = 0; i1 < 4; i1++) { NifStream( unknownFloats[i1], in, version ); }; } -void NiBSplineCompFloatInterpolator::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiBSplineCompFloatInterpolator::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { NiBSplineInterpolator::Write( out, link_map, version, user_version ); - for (uint i1 = 0; i1 < 4; i1++) { + for (unsigned int i1 = 0; i1 < 4; i1++) { NifStream( unknownFloats[i1], out, version ); }; } std::string NiBSplineCompFloatInterpolator::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << NiBSplineInterpolator::asString(); array_output_count = 0; - for (uint i1 = 0; i1 < 4; i1++) { + for (unsigned int i1 = 0; i1 < 4; i1++) { if ( !verbose && ( array_output_count > MAXARRAYDUMP ) ) { out << "<Data Truncated. Use verbose mode to see complete listing.>" << endl; break; @@ -4661,7 +4661,7 @@ std::string NiBSplineCompFloatInterpolator::InternalAsString( bool verbose ) con return out.str(); } -void NiBSplineCompFloatInterpolator::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiBSplineCompFloatInterpolator::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiBSplineInterpolator::FixLinks( objects, link_stack, version, user_version ); } @@ -4671,26 +4671,26 @@ std::list<NiObjectRef> NiBSplineCompFloatInterpolator::InternalGetRefs() const { return refs; } -void NiBSplineCompPoint3Interpolator::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiBSplineCompPoint3Interpolator::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiBSplineInterpolator::Read( in, link_stack, version, user_version ); - for (uint i1 = 0; i1 < 6; i1++) { + for (unsigned int i1 = 0; i1 < 6; i1++) { NifStream( unknownFloats[i1], in, version ); }; } -void NiBSplineCompPoint3Interpolator::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiBSplineCompPoint3Interpolator::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { NiBSplineInterpolator::Write( out, link_map, version, user_version ); - for (uint i1 = 0; i1 < 6; i1++) { + for (unsigned int i1 = 0; i1 < 6; i1++) { NifStream( unknownFloats[i1], out, version ); }; } std::string NiBSplineCompPoint3Interpolator::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << NiBSplineInterpolator::asString(); array_output_count = 0; - for (uint i1 = 0; i1 < 6; i1++) { + for (unsigned int i1 = 0; i1 < 6; i1++) { if ( !verbose && ( array_output_count > MAXARRAYDUMP ) ) { out << "<Data Truncated. Use verbose mode to see complete listing.>" << endl; break; @@ -4704,7 +4704,7 @@ std::string NiBSplineCompPoint3Interpolator::InternalAsString( bool verbose ) co return out.str(); } -void NiBSplineCompPoint3Interpolator::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiBSplineCompPoint3Interpolator::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiBSplineInterpolator::FixLinks( objects, link_stack, version, user_version ); } @@ -4714,7 +4714,7 @@ std::list<NiObjectRef> NiBSplineCompPoint3Interpolator::InternalGetRefs() const return refs; } -void NiBSplineCompTransformInterpolator::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiBSplineCompTransformInterpolator::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiBSplineInterpolator::Read( in, link_stack, version, user_version ); NifStream( translation, in, version ); NifStream( rotation, in, version ); @@ -4730,7 +4730,7 @@ void NiBSplineCompTransformInterpolator::InternalRead( istream& in, list<uint> & NifStream( scaleMultiplier, in, version ); } -void NiBSplineCompTransformInterpolator::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiBSplineCompTransformInterpolator::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { NiBSplineInterpolator::Write( out, link_map, version, user_version ); NifStream( translation, out, version ); NifStream( rotation, out, version ); @@ -4748,7 +4748,7 @@ void NiBSplineCompTransformInterpolator::InternalWrite( ostream& out, const map< std::string NiBSplineCompTransformInterpolator::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << NiBSplineInterpolator::asString(); out << " Translation: " << translation << endl; out << " Rotation: " << rotation << endl; @@ -4765,7 +4765,7 @@ std::string NiBSplineCompTransformInterpolator::InternalAsString( bool verbose ) return out.str(); } -void NiBSplineCompTransformInterpolator::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiBSplineCompTransformInterpolator::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiBSplineInterpolator::FixLinks( objects, link_stack, version, user_version ); } @@ -4775,35 +4775,35 @@ std::list<NiObjectRef> NiBSplineCompTransformInterpolator::InternalGetRefs() con return refs; } -void NiBSplineData::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiBSplineData::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiObject::Read( in, link_stack, version, user_version ); NifStream( unknownInt, in, version ); NifStream( count, in, version ); controlPoints.resize(count); - for (uint i1 = 0; i1 < controlPoints.size(); i1++) { + for (unsigned int i1 = 0; i1 < controlPoints.size(); i1++) { NifStream( controlPoints[i1], in, version ); }; } -void NiBSplineData::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiBSplineData::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { NiObject::Write( out, link_map, version, user_version ); - count = uint(controlPoints.size()); + count = unsigned int(controlPoints.size()); NifStream( unknownInt, out, version ); NifStream( count, out, version ); - for (uint i1 = 0; i1 < controlPoints.size(); i1++) { + for (unsigned int i1 = 0; i1 < controlPoints.size(); i1++) { NifStream( controlPoints[i1], out, version ); }; } std::string NiBSplineData::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << NiObject::asString(); - count = uint(controlPoints.size()); + count = unsigned int(controlPoints.size()); out << " Unknown Int: " << unknownInt << endl; out << " Count: " << count << endl; array_output_count = 0; - for (uint i1 = 0; i1 < controlPoints.size(); i1++) { + for (unsigned int i1 = 0; i1 < controlPoints.size(); i1++) { if ( !verbose && ( array_output_count > MAXARRAYDUMP ) ) { out << "<Data Truncated. Use verbose mode to see complete listing.>" << endl; break; @@ -4817,7 +4817,7 @@ std::string NiBSplineData::InternalAsString( bool verbose ) const { return out.str(); } -void NiBSplineData::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiBSplineData::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiObject::FixLinks( objects, link_stack, version, user_version ); } @@ -4827,8 +4827,8 @@ std::list<NiObjectRef> NiBSplineData::InternalGetRefs() const { return refs; } -void NiCamera::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { - uint block_num; +void NiCamera::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { + unsigned int block_num; NiAVObject::Read( in, link_stack, version, user_version ); if ( version >= 0x0A010000 ) { NifStream( unknownShort, in, version ); @@ -4855,7 +4855,7 @@ void NiCamera::InternalRead( istream& in, list<uint> & link_stack, unsigned int }; } -void NiCamera::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiCamera::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { NiAVObject::Write( out, link_map, version, user_version ); if ( version >= 0x0A010000 ) { NifStream( unknownShort, out, version ); @@ -4886,7 +4886,7 @@ void NiCamera::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_m std::string NiCamera::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << NiAVObject::asString(); out << " Unknown Short: " << unknownShort << endl; out << " Frustum Left: " << frustumLeft << endl; @@ -4907,7 +4907,7 @@ std::string NiCamera::InternalAsString( bool verbose ) const { return out.str(); } -void NiCamera::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiCamera::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiAVObject::FixLinks( objects, link_stack, version, user_version ); unknownLink_ = FixLink<NiObject>( objects, link_stack, version ); } @@ -4920,8 +4920,8 @@ std::list<NiObjectRef> NiCamera::InternalGetRefs() const { return refs; } -void NiCollisionData::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { - uint block_num; +void NiCollisionData::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { + unsigned int block_num; NiObject::Read( in, link_stack, version, user_version ); NifStream( block_num, in, version ); link_stack.push_back( block_num ); @@ -4936,18 +4936,18 @@ void NiCollisionData::InternalRead( istream& in, list<uint> & link_stack, unsign NifStream( unknownVector, in, version ); }; if ( (collisionType == 2) ) { - for (uint i2 = 0; i2 < 8; i2++) { + for (unsigned int i2 = 0; i2 < 8; i2++) { NifStream( unknownFloat1[i2], in, version ); }; }; if ( (collisionType == 1) ) { - for (uint i2 = 0; i2 < 15; i2++) { + for (unsigned int i2 = 0; i2 < 15; i2++) { NifStream( unknownFloat2[i2], in, version ); }; }; } -void NiCollisionData::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiCollisionData::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { NiObject::Write( out, link_map, version, user_version ); if ( targetNode != NULL ) NifStream( link_map.find( StaticCast<NiObject>(targetNode) )->second, out, version ); @@ -4964,12 +4964,12 @@ void NiCollisionData::InternalWrite( ostream& out, const map<NiObjectRef,uint> & NifStream( unknownVector, out, version ); }; if ( (collisionType == 2) ) { - for (uint i2 = 0; i2 < 8; i2++) { + for (unsigned int i2 = 0; i2 < 8; i2++) { NifStream( unknownFloat1[i2], out, version ); }; }; if ( (collisionType == 1) ) { - for (uint i2 = 0; i2 < 15; i2++) { + for (unsigned int i2 = 0; i2 < 15; i2++) { NifStream( unknownFloat2[i2], out, version ); }; }; @@ -4977,7 +4977,7 @@ void NiCollisionData::InternalWrite( ostream& out, const map<NiObjectRef,uint> & std::string NiCollisionData::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << NiObject::asString(); out << " Target Node: " << targetNode << endl; out << " Unknown Int 1: " << unknownInt1 << endl; @@ -4989,7 +4989,7 @@ std::string NiCollisionData::InternalAsString( bool verbose ) const { }; if ( (collisionType == 2) ) { array_output_count = 0; - for (uint i2 = 0; i2 < 8; i2++) { + for (unsigned int i2 = 0; i2 < 8; i2++) { if ( !verbose && ( array_output_count > MAXARRAYDUMP ) ) { out << "<Data Truncated. Use verbose mode to see complete listing.>" << endl; break; @@ -5003,7 +5003,7 @@ std::string NiCollisionData::InternalAsString( bool verbose ) const { }; if ( (collisionType == 1) ) { array_output_count = 0; - for (uint i2 = 0; i2 < 15; i2++) { + for (unsigned int i2 = 0; i2 < 15; i2++) { if ( !verbose && ( array_output_count > MAXARRAYDUMP ) ) { out << "<Data Truncated. Use verbose mode to see complete listing.>" << endl; break; @@ -5018,7 +5018,7 @@ std::string NiCollisionData::InternalAsString( bool verbose ) const { return out.str(); } -void NiCollisionData::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiCollisionData::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiObject::FixLinks( objects, link_stack, version, user_version ); targetNode = FixLink<NiNode>( objects, link_stack, version ); } @@ -5029,41 +5029,41 @@ std::list<NiObjectRef> NiCollisionData::InternalGetRefs() const { return refs; } -void NiColorData::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiColorData::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { AKeyedData::Read( in, link_stack, version, user_version ); NifStream( data.numKeys, in, version ); if ( (data.numKeys != 0) ) { NifStream( data.interpolation, in, version ); }; data.keys.resize(data.numKeys); - for (uint i1 = 0; i1 < data.keys.size(); i1++) { + for (unsigned int i1 = 0; i1 < data.keys.size(); i1++) { NifStream( data.keys[i1], in, version, data.interpolation ); }; } -void NiColorData::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiColorData::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { AKeyedData::Write( out, link_map, version, user_version ); - data.numKeys = uint(data.keys.size()); + data.numKeys = unsigned int(data.keys.size()); NifStream( data.numKeys, out, version ); if ( (data.numKeys != 0) ) { NifStream( data.interpolation, out, version ); }; - for (uint i1 = 0; i1 < data.keys.size(); i1++) { + for (unsigned int i1 = 0; i1 < data.keys.size(); i1++) { NifStream( data.keys[i1], out, version, data.interpolation ); }; } std::string NiColorData::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << AKeyedData::asString(); - data.numKeys = uint(data.keys.size()); + data.numKeys = unsigned int(data.keys.size()); out << " Num Keys: " << data.numKeys << endl; if ( (data.numKeys != 0) ) { out << " Interpolation: " << data.interpolation << endl; }; array_output_count = 0; - for (uint i1 = 0; i1 < data.keys.size(); i1++) { + for (unsigned int i1 = 0; i1 < data.keys.size(); i1++) { if ( !verbose && ( array_output_count > MAXARRAYDUMP ) ) { out << "<Data Truncated. Use verbose mode to see complete listing.>" << endl; break; @@ -5077,7 +5077,7 @@ std::string NiColorData::InternalAsString( bool verbose ) const { return out.str(); } -void NiColorData::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiColorData::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { AKeyedData::FixLinks( objects, link_stack, version, user_version ); } @@ -5087,25 +5087,25 @@ std::list<NiObjectRef> NiColorData::InternalGetRefs() const { return refs; } -void NiColorExtraData::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiColorExtraData::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiExtraData::Read( in, link_stack, version, user_version ); NifStream( data, in, version ); } -void NiColorExtraData::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiColorExtraData::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { NiExtraData::Write( out, link_map, version, user_version ); NifStream( data, out, version ); } std::string NiColorExtraData::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << NiExtraData::asString(); out << " Data: " << data << endl; return out.str(); } -void NiColorExtraData::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiColorExtraData::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiExtraData::FixLinks( objects, link_stack, version, user_version ); } @@ -5115,13 +5115,13 @@ std::list<NiObjectRef> NiColorExtraData::InternalGetRefs() const { return refs; } -void NiControllerManager::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { - uint block_num; +void NiControllerManager::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { + unsigned int block_num; NiTimeController::Read( in, link_stack, version, user_version ); NifStream( cumulative, in, version ); NifStream( numControllerSequences, in, version ); controllerSequences.resize(numControllerSequences); - for (uint i1 = 0; i1 < controllerSequences.size(); i1++) { + for (unsigned int i1 = 0; i1 < controllerSequences.size(); i1++) { NifStream( block_num, in, version ); link_stack.push_back( block_num ); }; @@ -5129,12 +5129,12 @@ void NiControllerManager::InternalRead( istream& in, list<uint> & link_stack, un link_stack.push_back( block_num ); } -void NiControllerManager::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiControllerManager::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { NiTimeController::Write( out, link_map, version, user_version ); - numControllerSequences = uint(controllerSequences.size()); + numControllerSequences = unsigned int(controllerSequences.size()); NifStream( cumulative, out, version ); NifStream( numControllerSequences, out, version ); - for (uint i1 = 0; i1 < controllerSequences.size(); i1++) { + for (unsigned int i1 = 0; i1 < controllerSequences.size(); i1++) { if ( controllerSequences[i1] != NULL ) NifStream( link_map.find( StaticCast<NiObject>(controllerSequences[i1]) )->second, out, version ); else @@ -5148,13 +5148,13 @@ void NiControllerManager::InternalWrite( ostream& out, const map<NiObjectRef,uin std::string NiControllerManager::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << NiTimeController::asString(); - numControllerSequences = uint(controllerSequences.size()); + numControllerSequences = unsigned int(controllerSequences.size()); out << " Cumulative: " << cumulative << endl; out << " Num Controller Sequences: " << numControllerSequences << endl; array_output_count = 0; - for (uint i1 = 0; i1 < controllerSequences.size(); i1++) { + for (unsigned int i1 = 0; i1 < controllerSequences.size(); i1++) { if ( !verbose && ( array_output_count > MAXARRAYDUMP ) ) { out << "<Data Truncated. Use verbose mode to see complete listing.>" << endl; break; @@ -5169,9 +5169,9 @@ std::string NiControllerManager::InternalAsString( bool verbose ) const { return out.str(); } -void NiControllerManager::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiControllerManager::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiTimeController::FixLinks( objects, link_stack, version, user_version ); - for (uint i1 = 0; i1 < controllerSequences.size(); i1++) { + for (unsigned int i1 = 0; i1 < controllerSequences.size(); i1++) { controllerSequences[i1] = FixLink<NiControllerSequence>( objects, link_stack, version ); }; objectPalette = FixLink<NiDefaultAVObjectPalette>( objects, link_stack, version ); @@ -5180,7 +5180,7 @@ void NiControllerManager::InternalFixLinks( const map<unsigned int,NiObjectRef> std::list<NiObjectRef> NiControllerManager::InternalGetRefs() const { list<Ref<NiObject> > refs; refs = NiTimeController::GetRefs(); - for (uint i1 = 0; i1 < controllerSequences.size(); i1++) { + for (unsigned int i1 = 0; i1 < controllerSequences.size(); i1++) { if ( controllerSequences[i1] != NULL ) refs.push_back(StaticCast<NiObject>(controllerSequences[i1])); }; @@ -5189,8 +5189,8 @@ std::list<NiObjectRef> NiControllerManager::InternalGetRefs() const { return refs; } -void NiControllerSequence::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { - uint block_num; +void NiControllerSequence::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { + unsigned int block_num; NiObject::Read( in, link_stack, version, user_version ); NifStream( name, in, version ); if ( version <= 0x0A010000 ) { @@ -5203,7 +5203,7 @@ void NiControllerSequence::InternalRead( istream& in, list<uint> & link_stack, u NifStream( unknownInt1, in, version ); }; controlledBlocks.resize(numControlledBlocks); - for (uint i1 = 0; i1 < controlledBlocks.size(); i1++) { + for (unsigned int i1 = 0; i1 < controlledBlocks.size(); i1++) { if ( version <= 0x0A010000 ) { NifStream( controlledBlocks[i1].targetName, in, version ); NifStream( block_num, in, version ); @@ -5292,9 +5292,9 @@ void NiControllerSequence::InternalRead( istream& in, list<uint> & link_stack, u }; } -void NiControllerSequence::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiControllerSequence::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { NiObject::Write( out, link_map, version, user_version ); - numControlledBlocks = uint(controlledBlocks.size()); + numControlledBlocks = unsigned int(controlledBlocks.size()); NifStream( name, out, version ); if ( version <= 0x0A010000 ) { NifStream( textKeysName, out, version ); @@ -5307,7 +5307,7 @@ void NiControllerSequence::InternalWrite( ostream& out, const map<NiObjectRef,ui if ( version >= 0x0A01006A ) { NifStream( unknownInt1, out, version ); }; - for (uint i1 = 0; i1 < controlledBlocks.size(); i1++) { + for (unsigned int i1 = 0; i1 < controlledBlocks.size(); i1++) { if ( version <= 0x0A010000 ) { NifStream( controlledBlocks[i1].targetName, out, version ); if ( controlledBlocks[i1].controller != NULL ) @@ -5414,16 +5414,16 @@ void NiControllerSequence::InternalWrite( ostream& out, const map<NiObjectRef,ui std::string NiControllerSequence::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << NiObject::asString(); - numControlledBlocks = uint(controlledBlocks.size()); + numControlledBlocks = unsigned int(controlledBlocks.size()); out << " Name: " << name << endl; out << " Text Keys Name: " << textKeysName << endl; out << " Text Keys: " << textKeys << endl; out << " Num Controlled Blocks: " << numControlledBlocks << endl; out << " Unknown Int 1: " << unknownInt1 << endl; array_output_count = 0; - for (uint i1 = 0; i1 < controlledBlocks.size(); i1++) { + for (unsigned int i1 = 0; i1 < controlledBlocks.size(); i1++) { if ( !verbose && ( array_output_count > MAXARRAYDUMP ) ) { out << "<Data Truncated. Use verbose mode to see complete listing.>" << endl; break; @@ -5460,12 +5460,12 @@ std::string NiControllerSequence::InternalAsString( bool verbose ) const { return out.str(); } -void NiControllerSequence::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiControllerSequence::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiObject::FixLinks( objects, link_stack, version, user_version ); if ( version <= 0x0A010000 ) { textKeys = FixLink<NiTextKeyExtraData>( objects, link_stack, version ); }; - for (uint i1 = 0; i1 < controlledBlocks.size(); i1++) { + for (unsigned int i1 = 0; i1 < controlledBlocks.size(); i1++) { if ( version <= 0x0A010000 ) { controlledBlocks[i1].controller = FixLink<NiTimeController>( objects, link_stack, version ); }; @@ -5494,7 +5494,7 @@ std::list<NiObjectRef> NiControllerSequence::InternalGetRefs() const { refs = NiObject::GetRefs(); if ( textKeys != NULL ) refs.push_back(StaticCast<NiObject>(textKeys)); - for (uint i1 = 0; i1 < controlledBlocks.size(); i1++) { + for (unsigned int i1 = 0; i1 < controlledBlocks.size(); i1++) { if ( controlledBlocks[i1].controller != NULL ) refs.push_back(StaticCast<NiObject>(controlledBlocks[i1].controller)); if ( controlledBlocks[i1].interpolator != NULL ) @@ -5509,25 +5509,25 @@ std::list<NiObjectRef> NiControllerSequence::InternalGetRefs() const { return refs; } -void NiDefaultAVObjectPalette::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { - uint block_num; +void NiDefaultAVObjectPalette::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { + unsigned int block_num; NiObject::Read( in, link_stack, version, user_version ); NifStream( unknownInt, in, version ); NifStream( numObjs, in, version ); objs.resize(numObjs); - for (uint i1 = 0; i1 < objs.size(); i1++) { + for (unsigned int i1 = 0; i1 < objs.size(); i1++) { NifStream( objs[i1].name, in, version ); NifStream( block_num, in, version ); link_stack.push_back( block_num ); }; } -void NiDefaultAVObjectPalette::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiDefaultAVObjectPalette::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { NiObject::Write( out, link_map, version, user_version ); - numObjs = uint(objs.size()); + numObjs = unsigned int(objs.size()); NifStream( unknownInt, out, version ); NifStream( numObjs, out, version ); - for (uint i1 = 0; i1 < objs.size(); i1++) { + for (unsigned int i1 = 0; i1 < objs.size(); i1++) { NifStream( objs[i1].name, out, version ); if ( objs[i1].avObject != NULL ) NifStream( link_map.find( StaticCast<NiObject>(objs[i1].avObject) )->second, out, version ); @@ -5538,13 +5538,13 @@ void NiDefaultAVObjectPalette::InternalWrite( ostream& out, const map<NiObjectRe std::string NiDefaultAVObjectPalette::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << NiObject::asString(); - numObjs = uint(objs.size()); + numObjs = unsigned int(objs.size()); out << " Unknown Int: " << unknownInt << endl; out << " Num Objs: " << numObjs << endl; array_output_count = 0; - for (uint i1 = 0; i1 < objs.size(); i1++) { + for (unsigned int i1 = 0; i1 < objs.size(); i1++) { if ( !verbose && ( array_output_count > MAXARRAYDUMP ) ) { out << "<Data Truncated. Use verbose mode to see complete listing.>" << endl; break; @@ -5555,9 +5555,9 @@ std::string NiDefaultAVObjectPalette::InternalAsString( bool verbose ) const { return out.str(); } -void NiDefaultAVObjectPalette::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiDefaultAVObjectPalette::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiObject::FixLinks( objects, link_stack, version, user_version ); - for (uint i1 = 0; i1 < objs.size(); i1++) { + for (unsigned int i1 = 0; i1 < objs.size(); i1++) { objs[i1].avObject = FixLink<NiAVObject>( objects, link_stack, version ); }; } @@ -5565,27 +5565,27 @@ void NiDefaultAVObjectPalette::InternalFixLinks( const map<unsigned int,NiObject std::list<NiObjectRef> NiDefaultAVObjectPalette::InternalGetRefs() const { list<Ref<NiObject> > refs; refs = NiObject::GetRefs(); - for (uint i1 = 0; i1 < objs.size(); i1++) { + for (unsigned int i1 = 0; i1 < objs.size(); i1++) { }; return refs; } -void NiDirectionalLight::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiDirectionalLight::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiLight::Read( in, link_stack, version, user_version ); } -void NiDirectionalLight::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiDirectionalLight::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { NiLight::Write( out, link_map, version, user_version ); } std::string NiDirectionalLight::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << NiLight::asString(); return out.str(); } -void NiDirectionalLight::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiDirectionalLight::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiLight::FixLinks( objects, link_stack, version, user_version ); } @@ -5595,25 +5595,25 @@ std::list<NiObjectRef> NiDirectionalLight::InternalGetRefs() const { return refs; } -void NiDitherProperty::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiDitherProperty::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiProperty::Read( in, link_stack, version, user_version ); NifStream( flags, in, version ); } -void NiDitherProperty::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiDitherProperty::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { NiProperty::Write( out, link_map, version, user_version ); NifStream( flags, out, version ); } std::string NiDitherProperty::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << NiProperty::asString(); out << " Flags: " << flags << endl; return out.str(); } -void NiDitherProperty::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiDitherProperty::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiProperty::FixLinks( objects, link_stack, version, user_version ); } @@ -5623,8 +5623,8 @@ std::list<NiObjectRef> NiDitherProperty::InternalGetRefs() const { return refs; } -void NiFlipController::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { - uint block_num; +void NiFlipController::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { + unsigned int block_num; NiSingleInterpolatorController::Read( in, link_stack, version, user_version ); NifStream( textureSlot, in, version ); if ( version <= 0x0A010000 ) { @@ -5633,22 +5633,22 @@ void NiFlipController::InternalRead( istream& in, list<uint> & link_stack, unsig }; NifStream( numSources, in, version ); sources.resize(numSources); - for (uint i1 = 0; i1 < sources.size(); i1++) { + for (unsigned int i1 = 0; i1 < sources.size(); i1++) { NifStream( block_num, in, version ); link_stack.push_back( block_num ); }; } -void NiFlipController::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiFlipController::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { NiSingleInterpolatorController::Write( out, link_map, version, user_version ); - numSources = uint(sources.size()); + numSources = unsigned int(sources.size()); NifStream( textureSlot, out, version ); if ( version <= 0x0A010000 ) { NifStream( unknownInt2, out, version ); NifStream( delta, out, version ); }; NifStream( numSources, out, version ); - for (uint i1 = 0; i1 < sources.size(); i1++) { + for (unsigned int i1 = 0; i1 < sources.size(); i1++) { if ( sources[i1] != NULL ) NifStream( link_map.find( StaticCast<NiObject>(sources[i1]) )->second, out, version ); else @@ -5658,15 +5658,15 @@ void NiFlipController::InternalWrite( ostream& out, const map<NiObjectRef,uint> std::string NiFlipController::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << NiSingleInterpolatorController::asString(); - numSources = uint(sources.size()); + numSources = unsigned int(sources.size()); out << " Texture Slot: " << textureSlot << endl; out << " Unknown Int 2: " << unknownInt2 << endl; out << " Delta: " << delta << endl; out << " Num Sources: " << numSources << endl; array_output_count = 0; - for (uint i1 = 0; i1 < sources.size(); i1++) { + for (unsigned int i1 = 0; i1 < sources.size(); i1++) { if ( !verbose && ( array_output_count > MAXARRAYDUMP ) ) { out << "<Data Truncated. Use verbose mode to see complete listing.>" << endl; break; @@ -5680,9 +5680,9 @@ std::string NiFlipController::InternalAsString( bool verbose ) const { return out.str(); } -void NiFlipController::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiFlipController::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiSingleInterpolatorController::FixLinks( objects, link_stack, version, user_version ); - for (uint i1 = 0; i1 < sources.size(); i1++) { + for (unsigned int i1 = 0; i1 < sources.size(); i1++) { sources[i1] = FixLink<NiSourceTexture>( objects, link_stack, version ); }; } @@ -5690,48 +5690,48 @@ void NiFlipController::InternalFixLinks( const map<unsigned int,NiObjectRef> & o std::list<NiObjectRef> NiFlipController::InternalGetRefs() const { list<Ref<NiObject> > refs; refs = NiSingleInterpolatorController::GetRefs(); - for (uint i1 = 0; i1 < sources.size(); i1++) { + for (unsigned int i1 = 0; i1 < sources.size(); i1++) { if ( sources[i1] != NULL ) refs.push_back(StaticCast<NiObject>(sources[i1])); }; return refs; } -void NiFloatData::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiFloatData::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { AKeyedData::Read( in, link_stack, version, user_version ); NifStream( data.numKeys, in, version ); if ( (data.numKeys != 0) ) { NifStream( data.interpolation, in, version ); }; data.keys.resize(data.numKeys); - for (uint i1 = 0; i1 < data.keys.size(); i1++) { + for (unsigned int i1 = 0; i1 < data.keys.size(); i1++) { NifStream( data.keys[i1], in, version, data.interpolation ); }; } -void NiFloatData::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiFloatData::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { AKeyedData::Write( out, link_map, version, user_version ); - data.numKeys = uint(data.keys.size()); + data.numKeys = unsigned int(data.keys.size()); NifStream( data.numKeys, out, version ); if ( (data.numKeys != 0) ) { NifStream( data.interpolation, out, version ); }; - for (uint i1 = 0; i1 < data.keys.size(); i1++) { + for (unsigned int i1 = 0; i1 < data.keys.size(); i1++) { NifStream( data.keys[i1], out, version, data.interpolation ); }; } std::string NiFloatData::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << AKeyedData::asString(); - data.numKeys = uint(data.keys.size()); + data.numKeys = unsigned int(data.keys.size()); out << " Num Keys: " << data.numKeys << endl; if ( (data.numKeys != 0) ) { out << " Interpolation: " << data.interpolation << endl; }; array_output_count = 0; - for (uint i1 = 0; i1 < data.keys.size(); i1++) { + for (unsigned int i1 = 0; i1 < data.keys.size(); i1++) { if ( !verbose && ( array_output_count > MAXARRAYDUMP ) ) { out << "<Data Truncated. Use verbose mode to see complete listing.>" << endl; break; @@ -5745,7 +5745,7 @@ std::string NiFloatData::InternalAsString( bool verbose ) const { return out.str(); } -void NiFloatData::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiFloatData::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { AKeyedData::FixLinks( objects, link_stack, version, user_version ); } @@ -5755,25 +5755,25 @@ std::list<NiObjectRef> NiFloatData::InternalGetRefs() const { return refs; } -void NiFloatExtraData::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiFloatExtraData::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiExtraData::Read( in, link_stack, version, user_version ); NifStream( floatData, in, version ); } -void NiFloatExtraData::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiFloatExtraData::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { NiExtraData::Write( out, link_map, version, user_version ); NifStream( floatData, out, version ); } std::string NiFloatExtraData::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << NiExtraData::asString(); out << " Float Data: " << floatData << endl; return out.str(); } -void NiFloatExtraData::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiFloatExtraData::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiExtraData::FixLinks( objects, link_stack, version, user_version ); } @@ -5783,8 +5783,8 @@ std::list<NiObjectRef> NiFloatExtraData::InternalGetRefs() const { return refs; } -void NiFloatExtraDataController::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { - uint block_num; +void NiFloatExtraDataController::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { + unsigned int block_num; NiTimeController::Read( in, link_stack, version, user_version ); if ( version >= 0x14000004 ) { NifStream( block_num, in, version ); @@ -5793,7 +5793,7 @@ void NiFloatExtraDataController::InternalRead( istream& in, list<uint> & link_st }; } -void NiFloatExtraDataController::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiFloatExtraDataController::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { NiTimeController::Write( out, link_map, version, user_version ); if ( version >= 0x14000004 ) { if ( unknownLink != NULL ) @@ -5806,14 +5806,14 @@ void NiFloatExtraDataController::InternalWrite( ostream& out, const map<NiObject std::string NiFloatExtraDataController::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << NiTimeController::asString(); out << " Unknown Link: " << unknownLink << endl; out << " Unknown String: " << unknownString << endl; return out.str(); } -void NiFloatExtraDataController::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiFloatExtraDataController::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiTimeController::FixLinks( objects, link_stack, version, user_version ); if ( version >= 0x14000004 ) { unknownLink = FixLink<NiObject>( objects, link_stack, version ); @@ -5828,15 +5828,15 @@ std::list<NiObjectRef> NiFloatExtraDataController::InternalGetRefs() const { return refs; } -void NiFloatInterpolator::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { - uint block_num; +void NiFloatInterpolator::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { + unsigned int block_num; NiInterpolator::Read( in, link_stack, version, user_version ); NifStream( floatValue, in, version ); NifStream( block_num, in, version ); link_stack.push_back( block_num ); } -void NiFloatInterpolator::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiFloatInterpolator::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { NiInterpolator::Write( out, link_map, version, user_version ); NifStream( floatValue, out, version ); if ( data != NULL ) @@ -5847,14 +5847,14 @@ void NiFloatInterpolator::InternalWrite( ostream& out, const map<NiObjectRef,uin std::string NiFloatInterpolator::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << NiInterpolator::asString(); out << " Float Value: " << floatValue << endl; out << " Data: " << data << endl; return out.str(); } -void NiFloatInterpolator::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiFloatInterpolator::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiInterpolator::FixLinks( objects, link_stack, version, user_version ); data = FixLink<NiFloatData>( objects, link_stack, version ); } @@ -5867,32 +5867,32 @@ std::list<NiObjectRef> NiFloatInterpolator::InternalGetRefs() const { return refs; } -void NiFloatsExtraData::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiFloatsExtraData::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiExtraData::Read( in, link_stack, version, user_version ); NifStream( numFloats, in, version ); data.resize(numFloats); - for (uint i1 = 0; i1 < data.size(); i1++) { + for (unsigned int i1 = 0; i1 < data.size(); i1++) { NifStream( data[i1], in, version ); }; } -void NiFloatsExtraData::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiFloatsExtraData::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { NiExtraData::Write( out, link_map, version, user_version ); - numFloats = uint(data.size()); + numFloats = unsigned int(data.size()); NifStream( numFloats, out, version ); - for (uint i1 = 0; i1 < data.size(); i1++) { + for (unsigned int i1 = 0; i1 < data.size(); i1++) { NifStream( data[i1], out, version ); }; } std::string NiFloatsExtraData::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << NiExtraData::asString(); - numFloats = uint(data.size()); + numFloats = unsigned int(data.size()); out << " Num Floats: " << numFloats << endl; array_output_count = 0; - for (uint i1 = 0; i1 < data.size(); i1++) { + for (unsigned int i1 = 0; i1 < data.size(); i1++) { if ( !verbose && ( array_output_count > MAXARRAYDUMP ) ) { out << "<Data Truncated. Use verbose mode to see complete listing.>" << endl; break; @@ -5906,7 +5906,7 @@ std::string NiFloatsExtraData::InternalAsString( bool verbose ) const { return out.str(); } -void NiFloatsExtraData::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiFloatsExtraData::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiExtraData::FixLinks( objects, link_stack, version, user_version ); } @@ -5916,14 +5916,14 @@ std::list<NiObjectRef> NiFloatsExtraData::InternalGetRefs() const { return refs; } -void NiFogProperty::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiFogProperty::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiProperty::Read( in, link_stack, version, user_version ); NifStream( flags, in, version ); NifStream( fogDepth, in, version ); NifStream( fogColor, in, version ); } -void NiFogProperty::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiFogProperty::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { NiProperty::Write( out, link_map, version, user_version ); NifStream( flags, out, version ); NifStream( fogDepth, out, version ); @@ -5932,7 +5932,7 @@ void NiFogProperty::InternalWrite( ostream& out, const map<NiObjectRef,uint> & l std::string NiFogProperty::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << NiProperty::asString(); out << " Flags: " << flags << endl; out << " Fog Depth: " << fogDepth << endl; @@ -5940,7 +5940,7 @@ std::string NiFogProperty::InternalAsString( bool verbose ) const { return out.str(); } -void NiFogProperty::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiFogProperty::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiProperty::FixLinks( objects, link_stack, version, user_version ); } @@ -5950,8 +5950,8 @@ std::list<NiObjectRef> NiFogProperty::InternalGetRefs() const { return refs; } -void NiGeomMorpherController::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { - uint block_num; +void NiGeomMorpherController::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { + unsigned int block_num; NiTimeController::Read( in, link_stack, version, user_version ); if ( version >= 0x0A010000 ) { NifStream( unknown, in, version ); @@ -5965,7 +5965,7 @@ void NiGeomMorpherController::InternalRead( istream& in, list<uint> & link_stack if ( version >= 0x0A01006A ) { NifStream( numInterpolators, in, version ); interpolators.resize(numInterpolators); - for (uint i2 = 0; i2 < interpolators.size(); i2++) { + for (unsigned int i2 = 0; i2 < interpolators.size(); i2++) { NifStream( block_num, in, version ); link_stack.push_back( block_num ); }; @@ -5973,16 +5973,16 @@ void NiGeomMorpherController::InternalRead( istream& in, list<uint> & link_stack if ( version >= 0x0A020000 ) { NifStream( numUnknownInts, in, version ); unknownInts.resize(numUnknownInts); - for (uint i2 = 0; i2 < unknownInts.size(); i2++) { + for (unsigned int i2 = 0; i2 < unknownInts.size(); i2++) { NifStream( unknownInts[i2], in, version ); }; }; } -void NiGeomMorpherController::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiGeomMorpherController::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { NiTimeController::Write( out, link_map, version, user_version ); - numUnknownInts = uint(unknownInts.size()); - numInterpolators = uint(interpolators.size()); + numUnknownInts = unsigned int(unknownInts.size()); + numInterpolators = unsigned int(interpolators.size()); if ( version >= 0x0A010000 ) { NifStream( unknown, out, version ); }; @@ -5996,7 +5996,7 @@ void NiGeomMorpherController::InternalWrite( ostream& out, const map<NiObjectRef NifStream( unknownByte, out, version ); if ( version >= 0x0A01006A ) { NifStream( numInterpolators, out, version ); - for (uint i2 = 0; i2 < interpolators.size(); i2++) { + for (unsigned int i2 = 0; i2 < interpolators.size(); i2++) { if ( interpolators[i2] != NULL ) NifStream( link_map.find( StaticCast<NiObject>(interpolators[i2]) )->second, out, version ); else @@ -6005,7 +6005,7 @@ void NiGeomMorpherController::InternalWrite( ostream& out, const map<NiObjectRef }; if ( version >= 0x0A020000 ) { NifStream( numUnknownInts, out, version ); - for (uint i2 = 0; i2 < unknownInts.size(); i2++) { + for (unsigned int i2 = 0; i2 < unknownInts.size(); i2++) { NifStream( unknownInts[i2], out, version ); }; }; @@ -6013,17 +6013,17 @@ void NiGeomMorpherController::InternalWrite( ostream& out, const map<NiObjectRef std::string NiGeomMorpherController::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << NiTimeController::asString(); - numUnknownInts = uint(unknownInts.size()); - numInterpolators = uint(interpolators.size()); + numUnknownInts = unsigned int(unknownInts.size()); + numInterpolators = unsigned int(interpolators.size()); out << " Unknown: " << unknown << endl; out << " Unknown 2: " << unknown2 << endl; out << " Data: " << data << endl; out << " Unknown Byte: " << unknownByte << endl; out << " Num Interpolators: " << numInterpolators << endl; array_output_count = 0; - for (uint i1 = 0; i1 < interpolators.size(); i1++) { + for (unsigned int i1 = 0; i1 < interpolators.size(); i1++) { if ( !verbose && ( array_output_count > MAXARRAYDUMP ) ) { out << "<Data Truncated. Use verbose mode to see complete listing.>" << endl; break; @@ -6036,7 +6036,7 @@ std::string NiGeomMorpherController::InternalAsString( bool verbose ) const { }; out << " Num Unknown Ints: " << numUnknownInts << endl; array_output_count = 0; - for (uint i1 = 0; i1 < unknownInts.size(); i1++) { + for (unsigned int i1 = 0; i1 < unknownInts.size(); i1++) { if ( !verbose && ( array_output_count > MAXARRAYDUMP ) ) { out << "<Data Truncated. Use verbose mode to see complete listing.>" << endl; break; @@ -6050,11 +6050,11 @@ std::string NiGeomMorpherController::InternalAsString( bool verbose ) const { return out.str(); } -void NiGeomMorpherController::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiGeomMorpherController::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiTimeController::FixLinks( objects, link_stack, version, user_version ); data = FixLink<NiMorphData>( objects, link_stack, version ); if ( version >= 0x0A01006A ) { - for (uint i2 = 0; i2 < interpolators.size(); i2++) { + for (unsigned int i2 = 0; i2 < interpolators.size(); i2++) { interpolators[i2] = FixLink<NiInterpolator>( objects, link_stack, version ); }; }; @@ -6065,14 +6065,14 @@ std::list<NiObjectRef> NiGeomMorpherController::InternalGetRefs() const { refs = NiTimeController::GetRefs(); if ( data != NULL ) refs.push_back(StaticCast<NiObject>(data)); - for (uint i1 = 0; i1 < interpolators.size(); i1++) { + for (unsigned int i1 = 0; i1 < interpolators.size(); i1++) { if ( interpolators[i1] != NULL ) refs.push_back(StaticCast<NiObject>(interpolators[i1])); }; return refs; } -void NiGravity::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiGravity::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { AParticleModifier::Read( in, link_stack, version, user_version ); NifStream( unknownFloat1, in, version ); NifStream( force, in, version ); @@ -6081,7 +6081,7 @@ void NiGravity::InternalRead( istream& in, list<uint> & link_stack, unsigned int NifStream( direction, in, version ); } -void NiGravity::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiGravity::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { AParticleModifier::Write( out, link_map, version, user_version ); NifStream( unknownFloat1, out, version ); NifStream( force, out, version ); @@ -6092,7 +6092,7 @@ void NiGravity::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_ std::string NiGravity::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << AParticleModifier::asString(); out << " Unknown Float 1: " << unknownFloat1 << endl; out << " Force: " << force << endl; @@ -6102,7 +6102,7 @@ std::string NiGravity::InternalAsString( bool verbose ) const { return out.str(); } -void NiGravity::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiGravity::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { AParticleModifier::FixLinks( objects, link_stack, version, user_version ); } @@ -6112,25 +6112,25 @@ std::list<NiObjectRef> NiGravity::InternalGetRefs() const { return refs; } -void NiIntegerExtraData::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiIntegerExtraData::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiExtraData::Read( in, link_stack, version, user_version ); NifStream( integerData, in, version ); } -void NiIntegerExtraData::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiIntegerExtraData::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { NiExtraData::Write( out, link_map, version, user_version ); NifStream( integerData, out, version ); } std::string NiIntegerExtraData::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << NiExtraData::asString(); out << " Integer Data: " << integerData << endl; return out.str(); } -void NiIntegerExtraData::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiIntegerExtraData::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiExtraData::FixLinks( objects, link_stack, version, user_version ); } @@ -6140,32 +6140,32 @@ std::list<NiObjectRef> NiIntegerExtraData::InternalGetRefs() const { return refs; } -void NiIntegersExtraData::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiIntegersExtraData::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiExtraData::Read( in, link_stack, version, user_version ); NifStream( numIntegers, in, version ); data.resize(numIntegers); - for (uint i1 = 0; i1 < data.size(); i1++) { + for (unsigned int i1 = 0; i1 < data.size(); i1++) { NifStream( data[i1], in, version ); }; } -void NiIntegersExtraData::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiIntegersExtraData::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { NiExtraData::Write( out, link_map, version, user_version ); - numIntegers = uint(data.size()); + numIntegers = unsigned int(data.size()); NifStream( numIntegers, out, version ); - for (uint i1 = 0; i1 < data.size(); i1++) { + for (unsigned int i1 = 0; i1 < data.size(); i1++) { NifStream( data[i1], out, version ); }; } std::string NiIntegersExtraData::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << NiExtraData::asString(); - numIntegers = uint(data.size()); + numIntegers = unsigned int(data.size()); out << " Num Integers: " << numIntegers << endl; array_output_count = 0; - for (uint i1 = 0; i1 < data.size(); i1++) { + for (unsigned int i1 = 0; i1 < data.size(); i1++) { if ( !verbose && ( array_output_count > MAXARRAYDUMP ) ) { out << "<Data Truncated. Use verbose mode to see complete listing.>" << endl; break; @@ -6179,7 +6179,7 @@ std::string NiIntegersExtraData::InternalAsString( bool verbose ) const { return out.str(); } -void NiIntegersExtraData::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiIntegersExtraData::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiExtraData::FixLinks( objects, link_stack, version, user_version ); } @@ -6189,14 +6189,14 @@ std::list<NiObjectRef> NiIntegersExtraData::InternalGetRefs() const { return refs; } -void NiKeyframeController::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { - uint block_num; +void NiKeyframeController::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { + unsigned int block_num; NiTimeController::Read( in, link_stack, version, user_version ); NifStream( block_num, in, version ); link_stack.push_back( block_num ); } -void NiKeyframeController::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiKeyframeController::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { NiTimeController::Write( out, link_map, version, user_version ); if ( data != NULL ) NifStream( link_map.find( StaticCast<NiObject>(data) )->second, out, version ); @@ -6206,13 +6206,13 @@ void NiKeyframeController::InternalWrite( ostream& out, const map<NiObjectRef,ui std::string NiKeyframeController::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << NiTimeController::asString(); out << " Data: " << data << endl; return out.str(); } -void NiKeyframeController::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiKeyframeController::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiTimeController::FixLinks( objects, link_stack, version, user_version ); data = FixLink<NiKeyframeData>( objects, link_stack, version ); } @@ -6225,14 +6225,14 @@ std::list<NiObjectRef> NiKeyframeController::InternalGetRefs() const { return refs; } -void BSKeyframeController::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { - uint block_num; +void BSKeyframeController::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { + unsigned int block_num; NiKeyframeController::Read( in, link_stack, version, user_version ); NifStream( block_num, in, version ); link_stack.push_back( block_num ); } -void BSKeyframeController::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void BSKeyframeController::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { NiKeyframeController::Write( out, link_map, version, user_version ); if ( data2 != NULL ) NifStream( link_map.find( StaticCast<NiObject>(data2) )->second, out, version ); @@ -6242,13 +6242,13 @@ void BSKeyframeController::InternalWrite( ostream& out, const map<NiObjectRef,ui std::string BSKeyframeController::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << NiKeyframeController::asString(); out << " Data 2: " << data2 << endl; return out.str(); } -void BSKeyframeController::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void BSKeyframeController::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiKeyframeController::FixLinks( objects, link_stack, version, user_version ); data2 = FixLink<NiKeyframeData>( objects, link_stack, version ); } @@ -6261,7 +6261,7 @@ std::list<NiObjectRef> BSKeyframeController::InternalGetRefs() const { return refs; } -void NiKeyframeData::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiKeyframeData::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { AKeyedData::Read( in, link_stack, version, user_version ); NifStream( numRotationKeys, in, version ); if ( (numRotationKeys != 0) ) { @@ -6269,7 +6269,7 @@ void NiKeyframeData::InternalRead( istream& in, list<uint> & link_stack, unsigne }; if ( (rotationType != 4) ) { quaternionKeys.resize(numRotationKeys); - for (uint i2 = 0; i2 < quaternionKeys.size(); i2++) { + for (unsigned int i2 = 0; i2 < quaternionKeys.size(); i2++) { NifStream( quaternionKeys[i2], in, version, rotationType ); }; }; @@ -6279,13 +6279,13 @@ void NiKeyframeData::InternalRead( istream& in, list<uint> & link_stack, unsigne }; }; if ( (rotationType == 4) ) { - for (uint i2 = 0; i2 < 3; i2++) { + for (unsigned int i2 = 0; i2 < 3; i2++) { NifStream( xyzRotations[i2].numKeys, in, version ); if ( (xyzRotations[i2].numKeys != 0) ) { NifStream( xyzRotations[i2].interpolation, in, version ); }; xyzRotations[i2].keys.resize(xyzRotations[i2].numKeys); - for (uint i3 = 0; i3 < xyzRotations[i2].keys.size(); i3++) { + for (unsigned int i3 = 0; i3 < xyzRotations[i2].keys.size(); i3++) { NifStream( xyzRotations[i2].keys[i3], in, version, xyzRotations[i2].interpolation ); }; }; @@ -6295,7 +6295,7 @@ void NiKeyframeData::InternalRead( istream& in, list<uint> & link_stack, unsigne NifStream( translations.interpolation, in, version ); }; translations.keys.resize(translations.numKeys); - for (uint i1 = 0; i1 < translations.keys.size(); i1++) { + for (unsigned int i1 = 0; i1 < translations.keys.size(); i1++) { NifStream( translations.keys[i1], in, version, translations.interpolation ); }; NifStream( scales.numKeys, in, version ); @@ -6303,19 +6303,19 @@ void NiKeyframeData::InternalRead( istream& in, list<uint> & link_stack, unsigne NifStream( scales.interpolation, in, version ); }; scales.keys.resize(scales.numKeys); - for (uint i1 = 0; i1 < scales.keys.size(); i1++) { + for (unsigned int i1 = 0; i1 < scales.keys.size(); i1++) { NifStream( scales.keys[i1], in, version, scales.interpolation ); }; } -void NiKeyframeData::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiKeyframeData::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { AKeyedData::Write( out, link_map, version, user_version ); NifStream( numRotationKeys, out, version ); if ( (numRotationKeys != 0) ) { NifStream( rotationType, out, version ); }; if ( (rotationType != 4) ) { - for (uint i2 = 0; i2 < quaternionKeys.size(); i2++) { + for (unsigned int i2 = 0; i2 < quaternionKeys.size(); i2++) { NifStream( quaternionKeys[i2], out, version, rotationType ); }; }; @@ -6325,38 +6325,38 @@ void NiKeyframeData::InternalWrite( ostream& out, const map<NiObjectRef,uint> & }; }; if ( (rotationType == 4) ) { - for (uint i2 = 0; i2 < 3; i2++) { - xyzRotations[i2].numKeys = uint(xyzRotations[i2].keys.size()); + for (unsigned int i2 = 0; i2 < 3; i2++) { + xyzRotations[i2].numKeys = unsigned int(xyzRotations[i2].keys.size()); NifStream( xyzRotations[i2].numKeys, out, version ); if ( (xyzRotations[i2].numKeys != 0) ) { NifStream( xyzRotations[i2].interpolation, out, version ); }; - for (uint i3 = 0; i3 < xyzRotations[i2].keys.size(); i3++) { + for (unsigned int i3 = 0; i3 < xyzRotations[i2].keys.size(); i3++) { NifStream( xyzRotations[i2].keys[i3], out, version, xyzRotations[i2].interpolation ); }; }; }; - translations.numKeys = uint(translations.keys.size()); + translations.numKeys = unsigned int(translations.keys.size()); NifStream( translations.numKeys, out, version ); if ( (translations.numKeys != 0) ) { NifStream( translations.interpolation, out, version ); }; - for (uint i1 = 0; i1 < translations.keys.size(); i1++) { + for (unsigned int i1 = 0; i1 < translations.keys.size(); i1++) { NifStream( translations.keys[i1], out, version, translations.interpolation ); }; - scales.numKeys = uint(scales.keys.size()); + scales.numKeys = unsigned int(scales.keys.size()); NifStream( scales.numKeys, out, version ); if ( (scales.numKeys != 0) ) { NifStream( scales.interpolation, out, version ); }; - for (uint i1 = 0; i1 < scales.keys.size(); i1++) { + for (unsigned int i1 = 0; i1 < scales.keys.size(); i1++) { NifStream( scales.keys[i1], out, version, scales.interpolation ); }; } std::string NiKeyframeData::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << AKeyedData::asString(); out << " Num Rotation Keys: " << numRotationKeys << endl; if ( (numRotationKeys != 0) ) { @@ -6364,7 +6364,7 @@ std::string NiKeyframeData::InternalAsString( bool verbose ) const { }; if ( (rotationType != 4) ) { array_output_count = 0; - for (uint i2 = 0; i2 < quaternionKeys.size(); i2++) { + for (unsigned int i2 = 0; i2 < quaternionKeys.size(); i2++) { if ( !verbose && ( array_output_count > MAXARRAYDUMP ) ) { out << "<Data Truncated. Use verbose mode to see complete listing.>" << endl; break; @@ -6379,18 +6379,18 @@ std::string NiKeyframeData::InternalAsString( bool verbose ) const { if ( (rotationType == 4) ) { out << " Unknown Float: " << unknownFloat << endl; array_output_count = 0; - for (uint i2 = 0; i2 < 3; i2++) { + for (unsigned int i2 = 0; i2 < 3; i2++) { if ( !verbose && ( array_output_count > MAXARRAYDUMP ) ) { out << "<Data Truncated. Use verbose mode to see complete listing.>" << endl; break; }; - xyzRotations[i2].numKeys = uint(xyzRotations[i2].keys.size()); + xyzRotations[i2].numKeys = unsigned int(xyzRotations[i2].keys.size()); out << " Num Keys: " << xyzRotations[i2].numKeys << endl; if ( (xyzRotations[i2].numKeys != 0) ) { out << " Interpolation: " << xyzRotations[i2].interpolation << endl; }; array_output_count = 0; - for (uint i3 = 0; i3 < xyzRotations[i2].keys.size(); i3++) { + for (unsigned int i3 = 0; i3 < xyzRotations[i2].keys.size(); i3++) { if ( !verbose && ( array_output_count > MAXARRAYDUMP ) ) { out << "<Data Truncated. Use verbose mode to see complete listing.>" << endl; break; @@ -6403,13 +6403,13 @@ std::string NiKeyframeData::InternalAsString( bool verbose ) const { }; }; }; - translations.numKeys = uint(translations.keys.size()); + translations.numKeys = unsigned int(translations.keys.size()); out << " Num Keys: " << translations.numKeys << endl; if ( (translations.numKeys != 0) ) { out << " Interpolation: " << translations.interpolation << endl; }; array_output_count = 0; - for (uint i1 = 0; i1 < translations.keys.size(); i1++) { + for (unsigned int i1 = 0; i1 < translations.keys.size(); i1++) { if ( !verbose && ( array_output_count > MAXARRAYDUMP ) ) { out << "<Data Truncated. Use verbose mode to see complete listing.>" << endl; break; @@ -6420,13 +6420,13 @@ std::string NiKeyframeData::InternalAsString( bool verbose ) const { out << " Keys[" << i1 << "]: " << translations.keys[i1] << endl; array_output_count++; }; - scales.numKeys = uint(scales.keys.size()); + scales.numKeys = unsigned int(scales.keys.size()); out << " Num Keys: " << scales.numKeys << endl; if ( (scales.numKeys != 0) ) { out << " Interpolation: " << scales.interpolation << endl; }; array_output_count = 0; - for (uint i1 = 0; i1 < scales.keys.size(); i1++) { + for (unsigned int i1 = 0; i1 < scales.keys.size(); i1++) { if ( !verbose && ( array_output_count > MAXARRAYDUMP ) ) { out << "<Data Truncated. Use verbose mode to see complete listing.>" << endl; break; @@ -6440,7 +6440,7 @@ std::string NiKeyframeData::InternalAsString( bool verbose ) const { return out.str(); } -void NiKeyframeData::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiKeyframeData::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { AKeyedData::FixLinks( objects, link_stack, version, user_version ); } @@ -6450,8 +6450,8 @@ std::list<NiObjectRef> NiKeyframeData::InternalGetRefs() const { return refs; } -void NiLightColorController::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { - uint block_num; +void NiLightColorController::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { + unsigned int block_num; NiTimeController::Read( in, link_stack, version, user_version ); if ( ( version >= 0x0A010000 ) && ( version <= 0x0A010000 ) ) { NifStream( unknownShort, in, version ); @@ -6467,7 +6467,7 @@ void NiLightColorController::InternalRead( istream& in, list<uint> & link_stack, }; } -void NiLightColorController::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiLightColorController::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { NiTimeController::Write( out, link_map, version, user_version ); if ( ( version >= 0x0A010000 ) && ( version <= 0x0A010000 ) ) { NifStream( unknownShort, out, version ); @@ -6489,7 +6489,7 @@ void NiLightColorController::InternalWrite( ostream& out, const map<NiObjectRef, std::string NiLightColorController::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << NiTimeController::asString(); out << " Unknown Short: " << unknownShort << endl; out << " Data: " << data << endl; @@ -6497,7 +6497,7 @@ std::string NiLightColorController::InternalAsString( bool verbose ) const { return out.str(); } -void NiLightColorController::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiLightColorController::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiTimeController::FixLinks( objects, link_stack, version, user_version ); if ( version <= 0x0A010000 ) { data = FixLink<NiPosData>( objects, link_stack, version ); @@ -6517,14 +6517,14 @@ std::list<NiObjectRef> NiLightColorController::InternalGetRefs() const { return refs; } -void NiLightDimmerController::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { - uint block_num; +void NiLightDimmerController::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { + unsigned int block_num; NiTimeController::Read( in, link_stack, version, user_version ); NifStream( block_num, in, version ); link_stack.push_back( block_num ); } -void NiLightDimmerController::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiLightDimmerController::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { NiTimeController::Write( out, link_map, version, user_version ); if ( unknownLink != NULL ) NifStream( link_map.find( StaticCast<NiObject>(unknownLink) )->second, out, version ); @@ -6534,13 +6534,13 @@ void NiLightDimmerController::InternalWrite( ostream& out, const map<NiObjectRef std::string NiLightDimmerController::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << NiTimeController::asString(); out << " Unknown Link: " << unknownLink << endl; return out.str(); } -void NiLightDimmerController::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiLightDimmerController::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiTimeController::FixLinks( objects, link_stack, version, user_version ); unknownLink = FixLink<NiInterpolator>( objects, link_stack, version ); } @@ -6553,8 +6553,8 @@ std::list<NiObjectRef> NiLightDimmerController::InternalGetRefs() const { return refs; } -void NiLookAtController::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { - uint block_num; +void NiLookAtController::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { + unsigned int block_num; NiTimeController::Read( in, link_stack, version, user_version ); if ( version >= 0x0A010000 ) { NifStream( unknown1, in, version ); @@ -6563,7 +6563,7 @@ void NiLookAtController::InternalRead( istream& in, list<uint> & link_stack, uns link_stack.push_back( block_num ); } -void NiLookAtController::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiLookAtController::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { NiTimeController::Write( out, link_map, version, user_version ); if ( version >= 0x0A010000 ) { NifStream( unknown1, out, version ); @@ -6576,14 +6576,14 @@ void NiLookAtController::InternalWrite( ostream& out, const map<NiObjectRef,uint std::string NiLookAtController::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << NiTimeController::asString(); out << " Unknown1: " << unknown1 << endl; out << " Look At Node: " << lookAtNode << endl; return out.str(); } -void NiLookAtController::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiLookAtController::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiTimeController::FixLinks( objects, link_stack, version, user_version ); lookAtNode = FixLink<NiNode>( objects, link_stack, version ); } @@ -6596,8 +6596,8 @@ std::list<NiObjectRef> NiLookAtController::InternalGetRefs() const { return refs; } -void NiLookAtInterpolator::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { - uint block_num; +void NiLookAtInterpolator::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { + unsigned int block_num; NiInterpolator::Read( in, link_stack, version, user_version ); NifStream( unknownShort, in, version ); NifStream( block_num, in, version ); @@ -6614,7 +6614,7 @@ void NiLookAtInterpolator::InternalRead( istream& in, list<uint> & link_stack, u link_stack.push_back( block_num ); } -void NiLookAtInterpolator::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiLookAtInterpolator::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { NiInterpolator::Write( out, link_map, version, user_version ); NifStream( unknownShort, out, version ); if ( lookAt != NULL ) @@ -6641,7 +6641,7 @@ void NiLookAtInterpolator::InternalWrite( ostream& out, const map<NiObjectRef,ui std::string NiLookAtInterpolator::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << NiInterpolator::asString(); out << " Unknown Short: " << unknownShort << endl; out << " Look At: " << lookAt << endl; @@ -6655,7 +6655,7 @@ std::string NiLookAtInterpolator::InternalAsString( bool verbose ) const { return out.str(); } -void NiLookAtInterpolator::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiLookAtInterpolator::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiInterpolator::FixLinks( objects, link_stack, version, user_version ); lookAt = FixLink<NiNode>( objects, link_stack, version ); unknownLink1 = FixLink<NiPoint3Interpolator>( objects, link_stack, version ); @@ -6677,8 +6677,8 @@ std::list<NiObjectRef> NiLookAtInterpolator::InternalGetRefs() const { return refs; } -void NiMaterialColorController::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { - uint block_num; +void NiMaterialColorController::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { + unsigned int block_num; NiSingleInterpolatorController::Read( in, link_stack, version, user_version ); if ( version >= 0x0A010000 ) { NifStream( targetColor, in, version ); @@ -6689,7 +6689,7 @@ void NiMaterialColorController::InternalRead( istream& in, list<uint> & link_sta }; } -void NiMaterialColorController::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiMaterialColorController::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { NiSingleInterpolatorController::Write( out, link_map, version, user_version ); if ( version >= 0x0A010000 ) { NifStream( targetColor, out, version ); @@ -6704,14 +6704,14 @@ void NiMaterialColorController::InternalWrite( ostream& out, const map<NiObjectR std::string NiMaterialColorController::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << NiSingleInterpolatorController::asString(); out << " Target Color: " << targetColor << endl; out << " Data: " << data << endl; return out.str(); } -void NiMaterialColorController::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiMaterialColorController::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiSingleInterpolatorController::FixLinks( objects, link_stack, version, user_version ); if ( version <= 0x0A010000 ) { data = FixLink<NiPosData>( objects, link_stack, version ); @@ -6726,7 +6726,7 @@ std::list<NiObjectRef> NiMaterialColorController::InternalGetRefs() const { return refs; } -void NiMaterialProperty::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiMaterialProperty::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiProperty::Read( in, link_stack, version, user_version ); if ( version <= 0x0A000102 ) { NifStream( flags, in, version ); @@ -6739,7 +6739,7 @@ void NiMaterialProperty::InternalRead( istream& in, list<uint> & link_stack, uns NifStream( alpha, in, version ); } -void NiMaterialProperty::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiMaterialProperty::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { NiProperty::Write( out, link_map, version, user_version ); if ( version <= 0x0A000102 ) { NifStream( flags, out, version ); @@ -6754,7 +6754,7 @@ void NiMaterialProperty::InternalWrite( ostream& out, const map<NiObjectRef,uint std::string NiMaterialProperty::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << NiProperty::asString(); out << " Flags: " << flags << endl; out << " Ambient Color: " << ambientColor << endl; @@ -6766,7 +6766,7 @@ std::string NiMaterialProperty::InternalAsString( bool verbose ) const { return out.str(); } -void NiMaterialProperty::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiMaterialProperty::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiProperty::FixLinks( objects, link_stack, version, user_version ); } @@ -6776,24 +6776,24 @@ std::list<NiObjectRef> NiMaterialProperty::InternalGetRefs() const { return refs; } -void NiMeshPSysData::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { - uint block_num; +void NiMeshPSysData::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { + unsigned int block_num; APSysData::Read( in, link_stack, version, user_version ); if ( version >= 0x14000005 ) { NifStream( unknownByte11, in, version ); }; if ( version <= 0x14000004 ) { unknownFloats4.resize(numVertices); - for (uint i2 = 0; i2 < unknownFloats4.size(); i2++) { - for (uint i3 = 0; i3 < 10; i3++) { + for (unsigned int i2 = 0; i2 < unknownFloats4.size(); i2++) { + for (unsigned int i3 = 0; i3 < 10; i3++) { NifStream( unknownFloats4[i2][i3], in, version ); }; }; }; if ( version >= 0x14000005 ) { unknownFloats5.resize(numVertices); - for (uint i2 = 0; i2 < unknownFloats5.size(); i2++) { - for (uint i3 = 0; i3 < 12; i3++) { + for (unsigned int i2 = 0; i2 < unknownFloats5.size(); i2++) { + for (unsigned int i3 = 0; i3 < 12; i3++) { NifStream( unknownFloats5[i2][i3], in, version ); }; }; @@ -6807,7 +6807,7 @@ void NiMeshPSysData::InternalRead( istream& in, list<uint> & link_stack, unsigne NifStream( unknownByte2, in, version ); NifStream( numUnknownLinks, in, version ); unknownLinks.resize(numUnknownLinks); - for (uint i2 = 0; i2 < unknownLinks.size(); i2++) { + for (unsigned int i2 = 0; i2 < unknownLinks.size(); i2++) { NifStream( block_num, in, version ); link_stack.push_back( block_num ); }; @@ -6825,22 +6825,22 @@ void NiMeshPSysData::InternalRead( istream& in, list<uint> & link_stack, unsigne }; } -void NiMeshPSysData::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiMeshPSysData::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { APSysData::Write( out, link_map, version, user_version ); - numUnknownLinks = uint(unknownLinks.size()); + numUnknownLinks = unsigned int(unknownLinks.size()); if ( version >= 0x14000005 ) { NifStream( unknownByte11, out, version ); }; if ( version <= 0x14000004 ) { - for (uint i2 = 0; i2 < unknownFloats4.size(); i2++) { - for (uint i3 = 0; i3 < 10; i3++) { + for (unsigned int i2 = 0; i2 < unknownFloats4.size(); i2++) { + for (unsigned int i3 = 0; i3 < 10; i3++) { NifStream( unknownFloats4[i2][i3], out, version ); }; }; }; if ( version >= 0x14000005 ) { - for (uint i2 = 0; i2 < unknownFloats5.size(); i2++) { - for (uint i3 = 0; i3 < 12; i3++) { + for (unsigned int i2 = 0; i2 < unknownFloats5.size(); i2++) { + for (unsigned int i3 = 0; i3 < 12; i3++) { NifStream( unknownFloats5[i2][i3], out, version ); }; }; @@ -6855,7 +6855,7 @@ void NiMeshPSysData::InternalWrite( ostream& out, const map<NiObjectRef,uint> & if ( ( version >= 0x0A020000 ) && ( version <= 0x14000004 ) ) { NifStream( unknownByte2, out, version ); NifStream( numUnknownLinks, out, version ); - for (uint i2 = 0; i2 < unknownLinks.size(); i2++) { + for (unsigned int i2 = 0; i2 < unknownLinks.size(); i2++) { if ( unknownLinks[i2] != NULL ) NifStream( link_map.find( StaticCast<NiObject>(unknownLinks[i2]) )->second, out, version ); else @@ -6879,17 +6879,17 @@ void NiMeshPSysData::InternalWrite( ostream& out, const map<NiObjectRef,uint> & std::string NiMeshPSysData::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << APSysData::asString(); - numUnknownLinks = uint(unknownLinks.size()); + numUnknownLinks = unsigned int(unknownLinks.size()); out << " Unknown Byte 11: " << unknownByte11 << endl; array_output_count = 0; - for (uint i1 = 0; i1 < unknownFloats4.size(); i1++) { + for (unsigned int i1 = 0; i1 < unknownFloats4.size(); i1++) { if ( !verbose && ( array_output_count > MAXARRAYDUMP ) ) { out << "<Data Truncated. Use verbose mode to see complete listing.>" << endl; break; }; - for (uint i2 = 0; i2 < 10; i2++) { + for (unsigned int i2 = 0; i2 < 10; i2++) { if ( !verbose && ( array_output_count > MAXARRAYDUMP ) ) { break; }; @@ -6898,12 +6898,12 @@ std::string NiMeshPSysData::InternalAsString( bool verbose ) const { }; }; array_output_count = 0; - for (uint i1 = 0; i1 < unknownFloats5.size(); i1++) { + for (unsigned int i1 = 0; i1 < unknownFloats5.size(); i1++) { if ( !verbose && ( array_output_count > MAXARRAYDUMP ) ) { out << "<Data Truncated. Use verbose mode to see complete listing.>" << endl; break; }; - for (uint i2 = 0; i2 < 12; i2++) { + for (unsigned int i2 = 0; i2 < 12; i2++) { if ( !verbose && ( array_output_count > MAXARRAYDUMP ) ) { break; }; @@ -6916,7 +6916,7 @@ std::string NiMeshPSysData::InternalAsString( bool verbose ) const { out << " Unknown Byte 2: " << unknownByte2 << endl; out << " Num Unknown Links: " << numUnknownLinks << endl; array_output_count = 0; - for (uint i1 = 0; i1 < unknownLinks.size(); i1++) { + for (unsigned int i1 = 0; i1 < unknownLinks.size(); i1++) { if ( !verbose && ( array_output_count > MAXARRAYDUMP ) ) { out << "<Data Truncated. Use verbose mode to see complete listing.>" << endl; break; @@ -6936,13 +6936,13 @@ std::string NiMeshPSysData::InternalAsString( bool verbose ) const { return out.str(); } -void NiMeshPSysData::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiMeshPSysData::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { APSysData::FixLinks( objects, link_stack, version, user_version ); if ( version <= 0x14000004 ) { modifier = FixLink<NiObject>( objects, link_stack, version ); }; if ( ( version >= 0x0A020000 ) && ( version <= 0x14000004 ) ) { - for (uint i2 = 0; i2 < unknownLinks.size(); i2++) { + for (unsigned int i2 = 0; i2 < unknownLinks.size(); i2++) { unknownLinks[i2] = FixLink<NiObject>( objects, link_stack, version ); }; }; @@ -6956,7 +6956,7 @@ std::list<NiObjectRef> NiMeshPSysData::InternalGetRefs() const { refs = APSysData::GetRefs(); if ( modifier != NULL ) refs.push_back(StaticCast<NiObject>(modifier)); - for (uint i1 = 0; i1 < unknownLinks.size(); i1++) { + for (unsigned int i1 = 0; i1 < unknownLinks.size(); i1++) { if ( unknownLinks[i1] != NULL ) refs.push_back(StaticCast<NiObject>(unknownLinks[i1])); }; @@ -6965,13 +6965,13 @@ std::list<NiObjectRef> NiMeshPSysData::InternalGetRefs() const { return refs; } -void NiMorphData::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiMorphData::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiObject::Read( in, link_stack, version, user_version ); NifStream( numMorphs, in, version ); NifStream( numVertices, in, version ); NifStream( unknownByte, in, version ); morphs.resize(numMorphs); - for (uint i1 = 0; i1 < morphs.size(); i1++) { + for (unsigned int i1 = 0; i1 < morphs.size(); i1++) { if ( version >= 0x0A01006A ) { NifStream( morphs[i1].frameName, in, version ); }; @@ -6979,7 +6979,7 @@ void NiMorphData::InternalRead( istream& in, list<uint> & link_stack, unsigned i NifStream( morphs[i1].numKeys, in, version ); NifStream( morphs[i1].interpolation, in, version ); morphs[i1].keys.resize(morphs[i1].numKeys); - for (uint i3 = 0; i3 < morphs[i1].keys.size(); i3++) { + for (unsigned int i3 = 0; i3 < morphs[i1].keys.size(); i3++) { NifStream( morphs[i1].keys[i3], in, version, morphs[i1].interpolation ); }; }; @@ -6987,34 +6987,34 @@ void NiMorphData::InternalRead( istream& in, list<uint> & link_stack, unsigned i NifStream( morphs[i1].unknownInt, in, version ); }; morphs[i1].vectors.resize(numVertices); - for (uint i2 = 0; i2 < morphs[i1].vectors.size(); i2++) { + for (unsigned int i2 = 0; i2 < morphs[i1].vectors.size(); i2++) { NifStream( morphs[i1].vectors[i2], in, version ); }; }; } -void NiMorphData::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiMorphData::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { NiObject::Write( out, link_map, version, user_version ); - numMorphs = uint(morphs.size()); + numMorphs = unsigned int(morphs.size()); NifStream( numMorphs, out, version ); NifStream( numVertices, out, version ); NifStream( unknownByte, out, version ); - for (uint i1 = 0; i1 < morphs.size(); i1++) { - morphs[i1].numKeys = uint(morphs[i1].keys.size()); + for (unsigned int i1 = 0; i1 < morphs.size(); i1++) { + morphs[i1].numKeys = unsigned int(morphs[i1].keys.size()); if ( version >= 0x0A01006A ) { NifStream( morphs[i1].frameName, out, version ); }; if ( version <= 0x0A010000 ) { NifStream( morphs[i1].numKeys, out, version ); NifStream( morphs[i1].interpolation, out, version ); - for (uint i3 = 0; i3 < morphs[i1].keys.size(); i3++) { + for (unsigned int i3 = 0; i3 < morphs[i1].keys.size(); i3++) { NifStream( morphs[i1].keys[i3], out, version, morphs[i1].interpolation ); }; }; if ( ( version >= 0x0A01006A ) && ( version <= 0x0A01006A ) ) { NifStream( morphs[i1].unknownInt, out, version ); }; - for (uint i2 = 0; i2 < morphs[i1].vectors.size(); i2++) { + for (unsigned int i2 = 0; i2 < morphs[i1].vectors.size(); i2++) { NifStream( morphs[i1].vectors[i2], out, version ); }; }; @@ -7022,24 +7022,24 @@ void NiMorphData::InternalWrite( ostream& out, const map<NiObjectRef,uint> & lin std::string NiMorphData::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << NiObject::asString(); - numMorphs = uint(morphs.size()); + numMorphs = unsigned int(morphs.size()); out << " Num Morphs: " << numMorphs << endl; out << " Num Vertices: " << numVertices << endl; out << " Unknown Byte: " << unknownByte << endl; array_output_count = 0; - for (uint i1 = 0; i1 < morphs.size(); i1++) { + for (unsigned int i1 = 0; i1 < morphs.size(); i1++) { if ( !verbose && ( array_output_count > MAXARRAYDUMP ) ) { out << "<Data Truncated. Use verbose mode to see complete listing.>" << endl; break; }; - morphs[i1].numKeys = uint(morphs[i1].keys.size()); + morphs[i1].numKeys = unsigned int(morphs[i1].keys.size()); out << " Frame Name: " << morphs[i1].frameName << endl; out << " Num Keys: " << morphs[i1].numKeys << endl; out << " Interpolation: " << morphs[i1].interpolation << endl; array_output_count = 0; - for (uint i2 = 0; i2 < morphs[i1].keys.size(); i2++) { + for (unsigned int i2 = 0; i2 < morphs[i1].keys.size(); i2++) { if ( !verbose && ( array_output_count > MAXARRAYDUMP ) ) { out << "<Data Truncated. Use verbose mode to see complete listing.>" << endl; break; @@ -7052,7 +7052,7 @@ std::string NiMorphData::InternalAsString( bool verbose ) const { }; out << " Unknown Int: " << morphs[i1].unknownInt << endl; array_output_count = 0; - for (uint i2 = 0; i2 < morphs[i1].vectors.size(); i2++) { + for (unsigned int i2 = 0; i2 < morphs[i1].vectors.size(); i2++) { if ( !verbose && ( array_output_count > MAXARRAYDUMP ) ) { out << "<Data Truncated. Use verbose mode to see complete listing.>" << endl; break; @@ -7067,7 +7067,7 @@ std::string NiMorphData::InternalAsString( bool verbose ) const { return out.str(); } -void NiMorphData::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiMorphData::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiObject::FixLinks( objects, link_stack, version, user_version ); } @@ -7077,22 +7077,22 @@ std::list<NiObjectRef> NiMorphData::InternalGetRefs() const { return refs; } -void NiMultiTargetTransformController::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { - uint block_num; +void NiMultiTargetTransformController::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { + unsigned int block_num; NiTimeController::Read( in, link_stack, version, user_version ); NifStream( numExtraTargets, in, version ); extraTargets.resize(numExtraTargets); - for (uint i1 = 0; i1 < extraTargets.size(); i1++) { + for (unsigned int i1 = 0; i1 < extraTargets.size(); i1++) { NifStream( block_num, in, version ); link_stack.push_back( block_num ); }; } -void NiMultiTargetTransformController::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiMultiTargetTransformController::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { NiTimeController::Write( out, link_map, version, user_version ); - numExtraTargets = ushort(extraTargets.size()); + numExtraTargets = unsigned short(extraTargets.size()); NifStream( numExtraTargets, out, version ); - for (uint i1 = 0; i1 < extraTargets.size(); i1++) { + for (unsigned int i1 = 0; i1 < extraTargets.size(); i1++) { if ( extraTargets[i1] != NULL ) NifStream( link_map.find( StaticCast<NiObject>(extraTargets[i1]) )->second, out, version ); else @@ -7102,12 +7102,12 @@ void NiMultiTargetTransformController::InternalWrite( ostream& out, const map<Ni std::string NiMultiTargetTransformController::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << NiTimeController::asString(); - numExtraTargets = ushort(extraTargets.size()); + numExtraTargets = unsigned short(extraTargets.size()); out << " Num Extra Targets: " << numExtraTargets << endl; array_output_count = 0; - for (uint i1 = 0; i1 < extraTargets.size(); i1++) { + for (unsigned int i1 = 0; i1 < extraTargets.size(); i1++) { if ( !verbose && ( array_output_count > MAXARRAYDUMP ) ) { out << "<Data Truncated. Use verbose mode to see complete listing.>" << endl; break; @@ -7121,9 +7121,9 @@ std::string NiMultiTargetTransformController::InternalAsString( bool verbose ) c return out.str(); } -void NiMultiTargetTransformController::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiMultiTargetTransformController::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiTimeController::FixLinks( objects, link_stack, version, user_version ); - for (uint i1 = 0; i1 < extraTargets.size(); i1++) { + for (unsigned int i1 = 0; i1 < extraTargets.size(); i1++) { extraTargets[i1] = FixLink<NiNode>( objects, link_stack, version ); }; } @@ -7131,41 +7131,41 @@ void NiMultiTargetTransformController::InternalFixLinks( const map<unsigned int, std::list<NiObjectRef> NiMultiTargetTransformController::InternalGetRefs() const { list<Ref<NiObject> > refs; refs = NiTimeController::GetRefs(); - for (uint i1 = 0; i1 < extraTargets.size(); i1++) { + for (unsigned int i1 = 0; i1 < extraTargets.size(); i1++) { }; return refs; } -void NiNode::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { - uint block_num; +void NiNode::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { + unsigned int block_num; NiAVObject::Read( in, link_stack, version, user_version ); NifStream( numChildren, in, version ); children.resize(numChildren); - for (uint i1 = 0; i1 < children.size(); i1++) { + for (unsigned int i1 = 0; i1 < children.size(); i1++) { NifStream( block_num, in, version ); link_stack.push_back( block_num ); }; NifStream( numEffects, in, version ); effects.resize(numEffects); - for (uint i1 = 0; i1 < effects.size(); i1++) { + for (unsigned int i1 = 0; i1 < effects.size(); i1++) { NifStream( block_num, in, version ); link_stack.push_back( block_num ); }; } -void NiNode::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiNode::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { NiAVObject::Write( out, link_map, version, user_version ); - numEffects = uint(effects.size()); - numChildren = uint(children.size()); + numEffects = unsigned int(effects.size()); + numChildren = unsigned int(children.size()); NifStream( numChildren, out, version ); - for (uint i1 = 0; i1 < children.size(); i1++) { + for (unsigned int i1 = 0; i1 < children.size(); i1++) { if ( children[i1] != NULL ) NifStream( link_map.find( StaticCast<NiObject>(children[i1]) )->second, out, version ); else NifStream( 0xffffffff, out, version ); }; NifStream( numEffects, out, version ); - for (uint i1 = 0; i1 < effects.size(); i1++) { + for (unsigned int i1 = 0; i1 < effects.size(); i1++) { if ( effects[i1] != NULL ) NifStream( link_map.find( StaticCast<NiObject>(effects[i1]) )->second, out, version ); else @@ -7175,13 +7175,13 @@ void NiNode::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map std::string NiNode::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << NiAVObject::asString(); - numEffects = uint(effects.size()); - numChildren = uint(children.size()); + numEffects = unsigned int(effects.size()); + numChildren = unsigned int(children.size()); out << " Num Children: " << numChildren << endl; array_output_count = 0; - for (uint i1 = 0; i1 < children.size(); i1++) { + for (unsigned int i1 = 0; i1 < children.size(); i1++) { if ( !verbose && ( array_output_count > MAXARRAYDUMP ) ) { out << "<Data Truncated. Use verbose mode to see complete listing.>" << endl; break; @@ -7194,7 +7194,7 @@ std::string NiNode::InternalAsString( bool verbose ) const { }; out << " Num Effects: " << numEffects << endl; array_output_count = 0; - for (uint i1 = 0; i1 < effects.size(); i1++) { + for (unsigned int i1 = 0; i1 < effects.size(); i1++) { if ( !verbose && ( array_output_count > MAXARRAYDUMP ) ) { out << "<Data Truncated. Use verbose mode to see complete listing.>" << endl; break; @@ -7208,12 +7208,12 @@ std::string NiNode::InternalAsString( bool verbose ) const { return out.str(); } -void NiNode::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiNode::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiAVObject::FixLinks( objects, link_stack, version, user_version ); - for (uint i1 = 0; i1 < children.size(); i1++) { + for (unsigned int i1 = 0; i1 < children.size(); i1++) { children[i1] = FixLink<NiAVObject>( objects, link_stack, version ); }; - for (uint i1 = 0; i1 < effects.size(); i1++) { + for (unsigned int i1 = 0; i1 < effects.size(); i1++) { effects[i1] = FixLink<NiDynamicEffect>( objects, link_stack, version ); }; } @@ -7221,33 +7221,33 @@ void NiNode::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, li std::list<NiObjectRef> NiNode::InternalGetRefs() const { list<Ref<NiObject> > refs; refs = NiAVObject::GetRefs(); - for (uint i1 = 0; i1 < children.size(); i1++) { + for (unsigned int i1 = 0; i1 < children.size(); i1++) { if ( children[i1] != NULL ) refs.push_back(StaticCast<NiObject>(children[i1])); }; - for (uint i1 = 0; i1 < effects.size(); i1++) { + for (unsigned int i1 = 0; i1 < effects.size(); i1++) { if ( effects[i1] != NULL ) refs.push_back(StaticCast<NiObject>(effects[i1])); }; return refs; } -void AvoidNode::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void AvoidNode::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiNode::Read( in, link_stack, version, user_version ); } -void AvoidNode::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void AvoidNode::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { NiNode::Write( out, link_map, version, user_version ); } std::string AvoidNode::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << NiNode::asString(); return out.str(); } -void AvoidNode::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void AvoidNode::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiNode::FixLinks( objects, link_stack, version, user_version ); } @@ -7257,29 +7257,29 @@ std::list<NiObjectRef> AvoidNode::InternalGetRefs() const { return refs; } -void FxWidget::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void FxWidget::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiNode::Read( in, link_stack, version, user_version ); NifStream( unknown1, in, version ); - for (uint i1 = 0; i1 < 292; i1++) { + for (unsigned int i1 = 0; i1 < 292; i1++) { NifStream( unknown292Bytes[i1], in, version ); }; } -void FxWidget::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void FxWidget::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { NiNode::Write( out, link_map, version, user_version ); NifStream( unknown1, out, version ); - for (uint i1 = 0; i1 < 292; i1++) { + for (unsigned int i1 = 0; i1 < 292; i1++) { NifStream( unknown292Bytes[i1], out, version ); }; } std::string FxWidget::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << NiNode::asString(); out << " Unknown1: " << unknown1 << endl; array_output_count = 0; - for (uint i1 = 0; i1 < 292; i1++) { + for (unsigned int i1 = 0; i1 < 292; i1++) { if ( !verbose && ( array_output_count > MAXARRAYDUMP ) ) { out << "<Data Truncated. Use verbose mode to see complete listing.>" << endl; break; @@ -7293,7 +7293,7 @@ std::string FxWidget::InternalAsString( bool verbose ) const { return out.str(); } -void FxWidget::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void FxWidget::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiNode::FixLinks( objects, link_stack, version, user_version ); } @@ -7303,22 +7303,22 @@ std::list<NiObjectRef> FxWidget::InternalGetRefs() const { return refs; } -void FxButton::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void FxButton::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { FxWidget::Read( in, link_stack, version, user_version ); } -void FxButton::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void FxButton::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { FxWidget::Write( out, link_map, version, user_version ); } std::string FxButton::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << FxWidget::asString(); return out.str(); } -void FxButton::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void FxButton::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { FxWidget::FixLinks( objects, link_stack, version, user_version ); } @@ -7328,28 +7328,28 @@ std::list<NiObjectRef> FxButton::InternalGetRefs() const { return refs; } -void FxRadioButton::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { - uint block_num; +void FxRadioButton::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { + unsigned int block_num; FxWidget::Read( in, link_stack, version, user_version ); NifStream( unknownInt1, in, version ); NifStream( unknownInt2, in, version ); NifStream( unknownInt3, in, version ); NifStream( numButtons, in, version ); buttons.resize(numButtons); - for (uint i1 = 0; i1 < buttons.size(); i1++) { + for (unsigned int i1 = 0; i1 < buttons.size(); i1++) { NifStream( block_num, in, version ); link_stack.push_back( block_num ); }; } -void FxRadioButton::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void FxRadioButton::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { FxWidget::Write( out, link_map, version, user_version ); - numButtons = uint(buttons.size()); + numButtons = unsigned int(buttons.size()); NifStream( unknownInt1, out, version ); NifStream( unknownInt2, out, version ); NifStream( unknownInt3, out, version ); NifStream( numButtons, out, version ); - for (uint i1 = 0; i1 < buttons.size(); i1++) { + for (unsigned int i1 = 0; i1 < buttons.size(); i1++) { if ( buttons[i1] != NULL ) NifStream( link_map.find( StaticCast<NiObject>(buttons[i1]) )->second, out, version ); else @@ -7359,15 +7359,15 @@ void FxRadioButton::InternalWrite( ostream& out, const map<NiObjectRef,uint> & l std::string FxRadioButton::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << FxWidget::asString(); - numButtons = uint(buttons.size()); + numButtons = unsigned int(buttons.size()); out << " Unknown Int 1: " << unknownInt1 << endl; out << " Unknown Int 2: " << unknownInt2 << endl; out << " Unknown Int 3: " << unknownInt3 << endl; out << " Num Buttons: " << numButtons << endl; array_output_count = 0; - for (uint i1 = 0; i1 < buttons.size(); i1++) { + for (unsigned int i1 = 0; i1 < buttons.size(); i1++) { if ( !verbose && ( array_output_count > MAXARRAYDUMP ) ) { out << "<Data Truncated. Use verbose mode to see complete listing.>" << endl; break; @@ -7381,9 +7381,9 @@ std::string FxRadioButton::InternalAsString( bool verbose ) const { return out.str(); } -void FxRadioButton::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void FxRadioButton::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { FxWidget::FixLinks( objects, link_stack, version, user_version ); - for (uint i1 = 0; i1 < buttons.size(); i1++) { + for (unsigned int i1 = 0; i1 < buttons.size(); i1++) { buttons[i1] = FixLink<FxRadioButton>( objects, link_stack, version ); }; } @@ -7391,19 +7391,19 @@ void FxRadioButton::InternalFixLinks( const map<unsigned int,NiObjectRef> & obje std::list<NiObjectRef> FxRadioButton::InternalGetRefs() const { list<Ref<NiObject> > refs; refs = FxWidget::GetRefs(); - for (uint i1 = 0; i1 < buttons.size(); i1++) { + for (unsigned int i1 = 0; i1 < buttons.size(); i1++) { }; return refs; } -void NiBillboardNode::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiBillboardNode::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiNode::Read( in, link_stack, version, user_version ); if ( version >= 0x0A010000 ) { NifStream( billboardMode, in, version ); }; } -void NiBillboardNode::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiBillboardNode::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { NiNode::Write( out, link_map, version, user_version ); if ( version >= 0x0A010000 ) { NifStream( billboardMode, out, version ); @@ -7412,13 +7412,13 @@ void NiBillboardNode::InternalWrite( ostream& out, const map<NiObjectRef,uint> & std::string NiBillboardNode::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << NiNode::asString(); out << " Billboard Mode: " << billboardMode << endl; return out.str(); } -void NiBillboardNode::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiBillboardNode::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiNode::FixLinks( objects, link_stack, version, user_version ); } @@ -7428,22 +7428,22 @@ std::list<NiObjectRef> NiBillboardNode::InternalGetRefs() const { return refs; } -void NiBSAnimationNode::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiBSAnimationNode::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiNode::Read( in, link_stack, version, user_version ); } -void NiBSAnimationNode::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiBSAnimationNode::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { NiNode::Write( out, link_map, version, user_version ); } std::string NiBSAnimationNode::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << NiNode::asString(); return out.str(); } -void NiBSAnimationNode::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiBSAnimationNode::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiNode::FixLinks( objects, link_stack, version, user_version ); } @@ -7453,22 +7453,22 @@ std::list<NiObjectRef> NiBSAnimationNode::InternalGetRefs() const { return refs; } -void NiBSParticleNode::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiBSParticleNode::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiNode::Read( in, link_stack, version, user_version ); } -void NiBSParticleNode::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiBSParticleNode::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { NiNode::Write( out, link_map, version, user_version ); } std::string NiBSParticleNode::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << NiNode::asString(); return out.str(); } -void NiBSParticleNode::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiBSParticleNode::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiNode::FixLinks( objects, link_stack, version, user_version ); } @@ -7478,17 +7478,17 @@ std::list<NiObjectRef> NiBSParticleNode::InternalGetRefs() const { return refs; } -void NiLODNode::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { - uint block_num; +void NiLODNode::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { + unsigned int block_num; NiNode::Read( in, link_stack, version, user_version ); - for (uint i1 = 0; i1 < 4; i1++) { + for (unsigned int i1 = 0; i1 < 4; i1++) { NifStream( unknown4Bytes[i1], in, version ); }; if ( version <= 0x0A000100 ) { NifStream( lodCenter, in, version ); NifStream( numLodLevels, in, version ); lodLevels.resize(numLodLevels); - for (uint i2 = 0; i2 < lodLevels.size(); i2++) { + for (unsigned int i2 = 0; i2 < lodLevels.size(); i2++) { NifStream( lodLevels[i2].nearExtent, in, version ); NifStream( lodLevels[i2].farExtent, in, version ); }; @@ -7500,16 +7500,16 @@ void NiLODNode::InternalRead( istream& in, list<uint> & link_stack, unsigned int }; } -void NiLODNode::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiLODNode::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { NiNode::Write( out, link_map, version, user_version ); - numLodLevels = uint(lodLevels.size()); - for (uint i1 = 0; i1 < 4; i1++) { + numLodLevels = unsigned int(lodLevels.size()); + for (unsigned int i1 = 0; i1 < 4; i1++) { NifStream( unknown4Bytes[i1], out, version ); }; if ( version <= 0x0A000100 ) { NifStream( lodCenter, out, version ); NifStream( numLodLevels, out, version ); - for (uint i2 = 0; i2 < lodLevels.size(); i2++) { + for (unsigned int i2 = 0; i2 < lodLevels.size(); i2++) { NifStream( lodLevels[i2].nearExtent, out, version ); NifStream( lodLevels[i2].farExtent, out, version ); }; @@ -7525,11 +7525,11 @@ void NiLODNode::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_ std::string NiLODNode::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << NiNode::asString(); - numLodLevels = uint(lodLevels.size()); + numLodLevels = unsigned int(lodLevels.size()); array_output_count = 0; - for (uint i1 = 0; i1 < 4; i1++) { + for (unsigned int i1 = 0; i1 < 4; i1++) { if ( !verbose && ( array_output_count > MAXARRAYDUMP ) ) { out << "<Data Truncated. Use verbose mode to see complete listing.>" << endl; break; @@ -7543,7 +7543,7 @@ std::string NiLODNode::InternalAsString( bool verbose ) const { out << " LOD Center: " << lodCenter << endl; out << " Num LOD Levels: " << numLodLevels << endl; array_output_count = 0; - for (uint i1 = 0; i1 < lodLevels.size(); i1++) { + for (unsigned int i1 = 0; i1 < lodLevels.size(); i1++) { if ( !verbose && ( array_output_count > MAXARRAYDUMP ) ) { out << "<Data Truncated. Use verbose mode to see complete listing.>" << endl; break; @@ -7556,7 +7556,7 @@ std::string NiLODNode::InternalAsString( bool verbose ) const { return out.str(); } -void NiLODNode::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiLODNode::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiNode::FixLinks( objects, link_stack, version, user_version ); if ( version >= 0x0A010000 ) { lodLevelData = FixLink<NiLODData>( objects, link_stack, version ); @@ -7571,23 +7571,23 @@ std::list<NiObjectRef> NiLODNode::InternalGetRefs() const { return refs; } -void NiPalette::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiPalette::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiObject::Read( in, link_stack, version, user_version ); NifStream( unknownByte, in, version ); NifStream( numEntries_, in, version ); - for (uint i1 = 0; i1 < 256; i1++) { - for (uint i2 = 0; i2 < 4; i2++) { + for (unsigned int i1 = 0; i1 < 256; i1++) { + for (unsigned int i2 = 0; i2 < 4; i2++) { NifStream( palette[i1][i2], in, version ); }; }; } -void NiPalette::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiPalette::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { NiObject::Write( out, link_map, version, user_version ); NifStream( unknownByte, out, version ); NifStream( numEntries_, out, version ); - for (uint i1 = 0; i1 < 256; i1++) { - for (uint i2 = 0; i2 < 4; i2++) { + for (unsigned int i1 = 0; i1 < 256; i1++) { + for (unsigned int i2 = 0; i2 < 4; i2++) { NifStream( palette[i1][i2], out, version ); }; }; @@ -7595,17 +7595,17 @@ void NiPalette::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_ std::string NiPalette::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << NiObject::asString(); out << " Unknown Byte: " << unknownByte << endl; out << " Num Entries?: " << numEntries_ << endl; array_output_count = 0; - for (uint i1 = 0; i1 < 256; i1++) { + for (unsigned int i1 = 0; i1 < 256; i1++) { if ( !verbose && ( array_output_count > MAXARRAYDUMP ) ) { out << "<Data Truncated. Use verbose mode to see complete listing.>" << endl; break; }; - for (uint i2 = 0; i2 < 4; i2++) { + for (unsigned int i2 = 0; i2 < 4; i2++) { if ( !verbose && ( array_output_count > MAXARRAYDUMP ) ) { break; }; @@ -7616,7 +7616,7 @@ std::string NiPalette::InternalAsString( bool verbose ) const { return out.str(); } -void NiPalette::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiPalette::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiObject::FixLinks( objects, link_stack, version, user_version ); } @@ -7626,7 +7626,7 @@ std::list<NiObjectRef> NiPalette::InternalGetRefs() const { return refs; } -void NiParticleBomb::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiParticleBomb::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { AParticleModifier::Read( in, link_stack, version, user_version ); NifStream( unknownFloat1, in, version ); NifStream( unknownFloat2, in, version ); @@ -7642,7 +7642,7 @@ void NiParticleBomb::InternalRead( istream& in, list<uint> & link_stack, unsigne NifStream( unknownFloat10, in, version ); } -void NiParticleBomb::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiParticleBomb::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { AParticleModifier::Write( out, link_map, version, user_version ); NifStream( unknownFloat1, out, version ); NifStream( unknownFloat2, out, version ); @@ -7660,7 +7660,7 @@ void NiParticleBomb::InternalWrite( ostream& out, const map<NiObjectRef,uint> & std::string NiParticleBomb::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << AParticleModifier::asString(); out << " Unknown Float 1: " << unknownFloat1 << endl; out << " Unknown Float 2: " << unknownFloat2 << endl; @@ -7677,7 +7677,7 @@ std::string NiParticleBomb::InternalAsString( bool verbose ) const { return out.str(); } -void NiParticleBomb::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiParticleBomb::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { AParticleModifier::FixLinks( objects, link_stack, version, user_version ); } @@ -7687,14 +7687,14 @@ std::list<NiObjectRef> NiParticleBomb::InternalGetRefs() const { return refs; } -void NiParticleColorModifier::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { - uint block_num; +void NiParticleColorModifier::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { + unsigned int block_num; AParticleModifier::Read( in, link_stack, version, user_version ); NifStream( block_num, in, version ); link_stack.push_back( block_num ); } -void NiParticleColorModifier::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiParticleColorModifier::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { AParticleModifier::Write( out, link_map, version, user_version ); if ( colorData != NULL ) NifStream( link_map.find( StaticCast<NiObject>(colorData) )->second, out, version ); @@ -7704,13 +7704,13 @@ void NiParticleColorModifier::InternalWrite( ostream& out, const map<NiObjectRef std::string NiParticleColorModifier::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << AParticleModifier::asString(); out << " Color Data: " << colorData << endl; return out.str(); } -void NiParticleColorModifier::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiParticleColorModifier::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { AParticleModifier::FixLinks( objects, link_stack, version, user_version ); colorData = FixLink<NiColorData>( objects, link_stack, version ); } @@ -7723,13 +7723,13 @@ std::list<NiObjectRef> NiParticleColorModifier::InternalGetRefs() const { return refs; } -void NiParticleGrowFade::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiParticleGrowFade::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { AParticleModifier::Read( in, link_stack, version, user_version ); NifStream( grow, in, version ); NifStream( fade, in, version ); } -void NiParticleGrowFade::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiParticleGrowFade::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { AParticleModifier::Write( out, link_map, version, user_version ); NifStream( grow, out, version ); NifStream( fade, out, version ); @@ -7737,14 +7737,14 @@ void NiParticleGrowFade::InternalWrite( ostream& out, const map<NiObjectRef,uint std::string NiParticleGrowFade::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << AParticleModifier::asString(); out << " Grow: " << grow << endl; out << " Fade: " << fade << endl; return out.str(); } -void NiParticleGrowFade::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiParticleGrowFade::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { AParticleModifier::FixLinks( objects, link_stack, version, user_version ); } @@ -7754,22 +7754,22 @@ std::list<NiObjectRef> NiParticleGrowFade::InternalGetRefs() const { return refs; } -void NiParticleMeshModifier::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { - uint block_num; +void NiParticleMeshModifier::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { + unsigned int block_num; AParticleModifier::Read( in, link_stack, version, user_version ); NifStream( numParticleMeshes, in, version ); particleMeshes.resize(numParticleMeshes); - for (uint i1 = 0; i1 < particleMeshes.size(); i1++) { + for (unsigned int i1 = 0; i1 < particleMeshes.size(); i1++) { NifStream( block_num, in, version ); link_stack.push_back( block_num ); }; } -void NiParticleMeshModifier::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiParticleMeshModifier::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { AParticleModifier::Write( out, link_map, version, user_version ); - numParticleMeshes = uint(particleMeshes.size()); + numParticleMeshes = unsigned int(particleMeshes.size()); NifStream( numParticleMeshes, out, version ); - for (uint i1 = 0; i1 < particleMeshes.size(); i1++) { + for (unsigned int i1 = 0; i1 < particleMeshes.size(); i1++) { if ( particleMeshes[i1] != NULL ) NifStream( link_map.find( StaticCast<NiObject>(particleMeshes[i1]) )->second, out, version ); else @@ -7779,12 +7779,12 @@ void NiParticleMeshModifier::InternalWrite( ostream& out, const map<NiObjectRef, std::string NiParticleMeshModifier::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << AParticleModifier::asString(); - numParticleMeshes = uint(particleMeshes.size()); + numParticleMeshes = unsigned int(particleMeshes.size()); out << " Num Particle Meshes: " << numParticleMeshes << endl; array_output_count = 0; - for (uint i1 = 0; i1 < particleMeshes.size(); i1++) { + for (unsigned int i1 = 0; i1 < particleMeshes.size(); i1++) { if ( !verbose && ( array_output_count > MAXARRAYDUMP ) ) { out << "<Data Truncated. Use verbose mode to see complete listing.>" << endl; break; @@ -7798,9 +7798,9 @@ std::string NiParticleMeshModifier::InternalAsString( bool verbose ) const { return out.str(); } -void NiParticleMeshModifier::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiParticleMeshModifier::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { AParticleModifier::FixLinks( objects, link_stack, version, user_version ); - for (uint i1 = 0; i1 < particleMeshes.size(); i1++) { + for (unsigned int i1 = 0; i1 < particleMeshes.size(); i1++) { particleMeshes[i1] = FixLink<NiAVObject>( objects, link_stack, version ); }; } @@ -7808,14 +7808,14 @@ void NiParticleMeshModifier::InternalFixLinks( const map<unsigned int,NiObjectRe std::list<NiObjectRef> NiParticleMeshModifier::InternalGetRefs() const { list<Ref<NiObject> > refs; refs = AParticleModifier::GetRefs(); - for (uint i1 = 0; i1 < particleMeshes.size(); i1++) { + for (unsigned int i1 = 0; i1 < particleMeshes.size(); i1++) { if ( particleMeshes[i1] != NULL ) refs.push_back(StaticCast<NiObject>(particleMeshes[i1])); }; return refs; } -void NiParticleRotation::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiParticleRotation::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { AParticleModifier::Read( in, link_stack, version, user_version ); NifStream( unknownByte, in, version ); NifStream( unknownFloat1, in, version ); @@ -7824,7 +7824,7 @@ void NiParticleRotation::InternalRead( istream& in, list<uint> & link_stack, uns NifStream( unknownFloat4, in, version ); } -void NiParticleRotation::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiParticleRotation::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { AParticleModifier::Write( out, link_map, version, user_version ); NifStream( unknownByte, out, version ); NifStream( unknownFloat1, out, version ); @@ -7835,7 +7835,7 @@ void NiParticleRotation::InternalWrite( ostream& out, const map<NiObjectRef,uint std::string NiParticleRotation::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << AParticleModifier::asString(); out << " Unknown Byte: " << unknownByte << endl; out << " Unknown Float 1: " << unknownFloat1 << endl; @@ -7845,7 +7845,7 @@ std::string NiParticleRotation::InternalAsString( bool verbose ) const { return out.str(); } -void NiParticleRotation::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiParticleRotation::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { AParticleModifier::FixLinks( objects, link_stack, version, user_version ); } @@ -7855,22 +7855,22 @@ std::list<NiObjectRef> NiParticleRotation::InternalGetRefs() const { return refs; } -void NiParticles::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiParticles::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiGeometry::Read( in, link_stack, version, user_version ); } -void NiParticles::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiParticles::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { NiGeometry::Write( out, link_map, version, user_version ); } std::string NiParticles::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << NiGeometry::asString(); return out.str(); } -void NiParticles::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiParticles::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiGeometry::FixLinks( objects, link_stack, version, user_version ); } @@ -7880,22 +7880,22 @@ std::list<NiObjectRef> NiParticles::InternalGetRefs() const { return refs; } -void NiAutoNormalParticles::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiAutoNormalParticles::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiParticles::Read( in, link_stack, version, user_version ); } -void NiAutoNormalParticles::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiAutoNormalParticles::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { NiParticles::Write( out, link_map, version, user_version ); } std::string NiAutoNormalParticles::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << NiParticles::asString(); return out.str(); } -void NiAutoNormalParticles::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiAutoNormalParticles::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiParticles::FixLinks( objects, link_stack, version, user_version ); } @@ -7905,22 +7905,22 @@ std::list<NiObjectRef> NiAutoNormalParticles::InternalGetRefs() const { return refs; } -void NiParticleMeshes::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiParticleMeshes::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiParticles::Read( in, link_stack, version, user_version ); } -void NiParticleMeshes::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiParticleMeshes::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { NiParticles::Write( out, link_map, version, user_version ); } std::string NiParticleMeshes::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << NiParticles::asString(); return out.str(); } -void NiParticleMeshes::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiParticleMeshes::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiParticles::FixLinks( objects, link_stack, version, user_version ); } @@ -7930,14 +7930,14 @@ std::list<NiObjectRef> NiParticleMeshes::InternalGetRefs() const { return refs; } -void NiParticlesData::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiParticlesData::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiAutoNormalParticlesData::Read( in, link_stack, version, user_version ); if ( version >= 0x0A010000 ) { NifStream( numActive, in, version ); NifStream( hasUnknownFloats, in, version ); if ( (hasUnknownFloats != 0) ) { unknownFloats.resize(numVertices); - for (uint i3 = 0; i3 < unknownFloats.size(); i3++) { + for (unsigned int i3 = 0; i3 < unknownFloats.size(); i3++) { NifStream( unknownFloats[i3], in, version ); }; }; @@ -7945,26 +7945,26 @@ void NiParticlesData::InternalRead( istream& in, list<uint> & link_stack, unsign NifStream( hasRotations, in, version ); if ( (hasRotations != 0) ) { rotations.resize(numVertices); - for (uint i2 = 0; i2 < rotations.size(); i2++) { + for (unsigned int i2 = 0; i2 < rotations.size(); i2++) { NifStream( rotations[i2], in, version ); }; }; } -void NiParticlesData::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiParticlesData::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { NiAutoNormalParticlesData::Write( out, link_map, version, user_version ); if ( version >= 0x0A010000 ) { NifStream( numActive, out, version ); NifStream( hasUnknownFloats, out, version ); if ( (hasUnknownFloats != 0) ) { - for (uint i3 = 0; i3 < unknownFloats.size(); i3++) { + for (unsigned int i3 = 0; i3 < unknownFloats.size(); i3++) { NifStream( unknownFloats[i3], out, version ); }; }; }; NifStream( hasRotations, out, version ); if ( (hasRotations != 0) ) { - for (uint i2 = 0; i2 < rotations.size(); i2++) { + for (unsigned int i2 = 0; i2 < rotations.size(); i2++) { NifStream( rotations[i2], out, version ); }; }; @@ -7972,13 +7972,13 @@ void NiParticlesData::InternalWrite( ostream& out, const map<NiObjectRef,uint> & std::string NiParticlesData::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << NiAutoNormalParticlesData::asString(); out << " Num Active: " << numActive << endl; out << " Has Unknown Floats: " << hasUnknownFloats << endl; if ( (hasUnknownFloats != 0) ) { array_output_count = 0; - for (uint i2 = 0; i2 < unknownFloats.size(); i2++) { + for (unsigned int i2 = 0; i2 < unknownFloats.size(); i2++) { if ( !verbose && ( array_output_count > MAXARRAYDUMP ) ) { out << "<Data Truncated. Use verbose mode to see complete listing.>" << endl; break; @@ -7993,7 +7993,7 @@ std::string NiParticlesData::InternalAsString( bool verbose ) const { out << " Has Rotations: " << hasRotations << endl; if ( (hasRotations != 0) ) { array_output_count = 0; - for (uint i2 = 0; i2 < rotations.size(); i2++) { + for (unsigned int i2 = 0; i2 < rotations.size(); i2++) { if ( !verbose && ( array_output_count > MAXARRAYDUMP ) ) { out << "<Data Truncated. Use verbose mode to see complete listing.>" << endl; break; @@ -8008,7 +8008,7 @@ std::string NiParticlesData::InternalAsString( bool verbose ) const { return out.str(); } -void NiParticlesData::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiParticlesData::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiAutoNormalParticlesData::FixLinks( objects, link_stack, version, user_version ); } @@ -8018,14 +8018,14 @@ std::list<NiObjectRef> NiParticlesData::InternalGetRefs() const { return refs; } -void NiParticleMeshesData::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { - uint block_num; +void NiParticleMeshesData::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { + unsigned int block_num; NiParticlesData::Read( in, link_stack, version, user_version ); NifStream( block_num, in, version ); link_stack.push_back( block_num ); } -void NiParticleMeshesData::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiParticleMeshesData::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { NiParticlesData::Write( out, link_map, version, user_version ); if ( unknownLink2 != NULL ) NifStream( link_map.find( StaticCast<NiObject>(unknownLink2) )->second, out, version ); @@ -8035,13 +8035,13 @@ void NiParticleMeshesData::InternalWrite( ostream& out, const map<NiObjectRef,ui std::string NiParticleMeshesData::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << NiParticlesData::asString(); out << " Unknown Link 2: " << unknownLink2 << endl; return out.str(); } -void NiParticleMeshesData::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiParticleMeshesData::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiParticlesData::FixLinks( objects, link_stack, version, user_version ); unknownLink2 = FixLink<NiAVObject>( objects, link_stack, version ); } @@ -8054,27 +8054,27 @@ std::list<NiObjectRef> NiParticleMeshesData::InternalGetRefs() const { return refs; } -void NiParticleSystem::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { - uint block_num; +void NiParticleSystem::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { + unsigned int block_num; NiParticles::Read( in, link_stack, version, user_version ); if ( version >= 0x0A010000 ) { NifStream( unknownBool, in, version ); NifStream( numModifiers, in, version ); modifiers.resize(numModifiers); - for (uint i2 = 0; i2 < modifiers.size(); i2++) { + for (unsigned int i2 = 0; i2 < modifiers.size(); i2++) { NifStream( block_num, in, version ); link_stack.push_back( block_num ); }; }; } -void NiParticleSystem::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiParticleSystem::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { NiParticles::Write( out, link_map, version, user_version ); - numModifiers = uint(modifiers.size()); + numModifiers = unsigned int(modifiers.size()); if ( version >= 0x0A010000 ) { NifStream( unknownBool, out, version ); NifStream( numModifiers, out, version ); - for (uint i2 = 0; i2 < modifiers.size(); i2++) { + for (unsigned int i2 = 0; i2 < modifiers.size(); i2++) { if ( modifiers[i2] != NULL ) NifStream( link_map.find( StaticCast<NiObject>(modifiers[i2]) )->second, out, version ); else @@ -8085,13 +8085,13 @@ void NiParticleSystem::InternalWrite( ostream& out, const map<NiObjectRef,uint> std::string NiParticleSystem::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << NiParticles::asString(); - numModifiers = uint(modifiers.size()); + numModifiers = unsigned int(modifiers.size()); out << " Unknown Bool: " << unknownBool << endl; out << " Num Modifiers: " << numModifiers << endl; array_output_count = 0; - for (uint i1 = 0; i1 < modifiers.size(); i1++) { + for (unsigned int i1 = 0; i1 < modifiers.size(); i1++) { if ( !verbose && ( array_output_count > MAXARRAYDUMP ) ) { out << "<Data Truncated. Use verbose mode to see complete listing.>" << endl; break; @@ -8105,10 +8105,10 @@ std::string NiParticleSystem::InternalAsString( bool verbose ) const { return out.str(); } -void NiParticleSystem::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiParticleSystem::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiParticles::FixLinks( objects, link_stack, version, user_version ); if ( version >= 0x0A010000 ) { - for (uint i2 = 0; i2 < modifiers.size(); i2++) { + for (unsigned int i2 = 0; i2 < modifiers.size(); i2++) { modifiers[i2] = FixLink<NiPSysModifier>( objects, link_stack, version ); }; }; @@ -8117,29 +8117,29 @@ void NiParticleSystem::InternalFixLinks( const map<unsigned int,NiObjectRef> & o std::list<NiObjectRef> NiParticleSystem::InternalGetRefs() const { list<Ref<NiObject> > refs; refs = NiParticles::GetRefs(); - for (uint i1 = 0; i1 < modifiers.size(); i1++) { + for (unsigned int i1 = 0; i1 < modifiers.size(); i1++) { if ( modifiers[i1] != NULL ) refs.push_back(StaticCast<NiObject>(modifiers[i1])); }; return refs; } -void NiMeshParticleSystem::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiMeshParticleSystem::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiParticleSystem::Read( in, link_stack, version, user_version ); } -void NiMeshParticleSystem::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiMeshParticleSystem::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { NiParticleSystem::Write( out, link_map, version, user_version ); } std::string NiMeshParticleSystem::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << NiParticleSystem::asString(); return out.str(); } -void NiMeshParticleSystem::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiMeshParticleSystem::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiParticleSystem::FixLinks( objects, link_stack, version, user_version ); } @@ -8149,8 +8149,8 @@ std::list<NiObjectRef> NiMeshParticleSystem::InternalGetRefs() const { return refs; } -void NiParticleSystemController::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { - uint block_num; +void NiParticleSystemController::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { + unsigned int block_num; NiTimeController::Read( in, link_stack, version, user_version ); NifStream( speed, in, version ); NifStream( speedRandom, in, version ); @@ -8184,7 +8184,7 @@ void NiParticleSystemController::InternalRead( istream& in, list<uint> & link_st NifStream( numParticles, in, version ); NifStream( numValid, in, version ); particles.resize(numParticles); - for (uint i1 = 0; i1 < particles.size(); i1++) { + for (unsigned int i1 = 0; i1 < particles.size(); i1++) { NifStream( particles[i1].velocity, in, version ); NifStream( particles[i1].unknownVector, in, version ); NifStream( particles[i1].lifetime, in, version ); @@ -8202,9 +8202,9 @@ void NiParticleSystemController::InternalRead( istream& in, list<uint> & link_st NifStream( trailer, in, version ); } -void NiParticleSystemController::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiParticleSystemController::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { NiTimeController::Write( out, link_map, version, user_version ); - numParticles = ushort(particles.size()); + numParticles = unsigned short(particles.size()); NifStream( speed, out, version ); NifStream( speedRandom, out, version ); NifStream( verticalDirection, out, version ); @@ -8238,7 +8238,7 @@ void NiParticleSystemController::InternalWrite( ostream& out, const map<NiObject NifStream( unknownShort3_, out, version ); NifStream( numParticles, out, version ); NifStream( numValid, out, version ); - for (uint i1 = 0; i1 < particles.size(); i1++) { + for (unsigned int i1 = 0; i1 < particles.size(); i1++) { NifStream( particles[i1].velocity, out, version ); NifStream( particles[i1].unknownVector, out, version ); NifStream( particles[i1].lifetime, out, version ); @@ -8264,9 +8264,9 @@ void NiParticleSystemController::InternalWrite( ostream& out, const map<NiObject std::string NiParticleSystemController::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << NiTimeController::asString(); - numParticles = ushort(particles.size()); + numParticles = unsigned short(particles.size()); out << " Speed: " << speed << endl; out << " Speed Random: " << speedRandom << endl; out << " Vertical Direction: " << verticalDirection << endl; @@ -8298,7 +8298,7 @@ std::string NiParticleSystemController::InternalAsString( bool verbose ) const { out << " Num Particles: " << numParticles << endl; out << " Num Valid: " << numValid << endl; array_output_count = 0; - for (uint i1 = 0; i1 < particles.size(); i1++) { + for (unsigned int i1 = 0; i1 < particles.size(); i1++) { if ( !verbose && ( array_output_count > MAXARRAYDUMP ) ) { out << "<Data Truncated. Use verbose mode to see complete listing.>" << endl; break; @@ -8318,7 +8318,7 @@ std::string NiParticleSystemController::InternalAsString( bool verbose ) const { return out.str(); } -void NiParticleSystemController::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiParticleSystemController::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiTimeController::FixLinks( objects, link_stack, version, user_version ); emitter = FixLink<NiObject>( objects, link_stack, version ); unknownLink = FixLink<NiObject>( objects, link_stack, version ); @@ -8338,22 +8338,22 @@ std::list<NiObjectRef> NiParticleSystemController::InternalGetRefs() const { return refs; } -void NiBSPArrayController::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiBSPArrayController::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiParticleSystemController::Read( in, link_stack, version, user_version ); } -void NiBSPArrayController::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiBSPArrayController::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { NiParticleSystemController::Write( out, link_map, version, user_version ); } std::string NiBSPArrayController::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << NiParticleSystemController::asString(); return out.str(); } -void NiBSPArrayController::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiBSPArrayController::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiParticleSystemController::FixLinks( objects, link_stack, version, user_version ); } @@ -8363,8 +8363,8 @@ std::list<NiObjectRef> NiBSPArrayController::InternalGetRefs() const { return refs; } -void NiPathController::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { - uint block_num; +void NiPathController::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { + unsigned int block_num; NiTimeController::Read( in, link_stack, version, user_version ); if ( version >= 0x0A010000 ) { NifStream( unknownShort2, in, version ); @@ -8379,7 +8379,7 @@ void NiPathController::InternalRead( istream& in, list<uint> & link_stack, unsig link_stack.push_back( block_num ); } -void NiPathController::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiPathController::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { NiTimeController::Write( out, link_map, version, user_version ); if ( version >= 0x0A010000 ) { NifStream( unknownShort2, out, version ); @@ -8400,7 +8400,7 @@ void NiPathController::InternalWrite( ostream& out, const map<NiObjectRef,uint> std::string NiPathController::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << NiTimeController::asString(); out << " Unknown Short 2: " << unknownShort2 << endl; out << " Unknown Int 1: " << unknownInt1 << endl; @@ -8412,7 +8412,7 @@ std::string NiPathController::InternalAsString( bool verbose ) const { return out.str(); } -void NiPathController::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiPathController::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiTimeController::FixLinks( objects, link_stack, version, user_version ); posData = FixLink<NiPosData>( objects, link_stack, version ); floatData = FixLink<NiFloatData>( objects, link_stack, version ); @@ -8428,8 +8428,8 @@ std::list<NiObjectRef> NiPathController::InternalGetRefs() const { return refs; } -void NiPathInterpolator::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { - uint block_num; +void NiPathInterpolator::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { + unsigned int block_num; NiBlendInterpolator::Read( in, link_stack, version, user_version ); NifStream( unknownFloat1, in, version ); NifStream( unknownFloat2, in, version ); @@ -8440,7 +8440,7 @@ void NiPathInterpolator::InternalRead( istream& in, list<uint> & link_stack, uns link_stack.push_back( block_num ); } -void NiPathInterpolator::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiPathInterpolator::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { NiBlendInterpolator::Write( out, link_map, version, user_version ); NifStream( unknownFloat1, out, version ); NifStream( unknownFloat2, out, version ); @@ -8457,7 +8457,7 @@ void NiPathInterpolator::InternalWrite( ostream& out, const map<NiObjectRef,uint std::string NiPathInterpolator::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << NiBlendInterpolator::asString(); out << " Unknown Float 1: " << unknownFloat1 << endl; out << " Unknown Float 2: " << unknownFloat2 << endl; @@ -8467,7 +8467,7 @@ std::string NiPathInterpolator::InternalAsString( bool verbose ) const { return out.str(); } -void NiPathInterpolator::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiPathInterpolator::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiBlendInterpolator::FixLinks( objects, link_stack, version, user_version ); posData = FixLink<NiPosData>( objects, link_stack, version ); floatData = FixLink<NiFloatData>( objects, link_stack, version ); @@ -8483,8 +8483,8 @@ std::list<NiObjectRef> NiPathInterpolator::InternalGetRefs() const { return refs; } -void NiPixelData::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { - uint block_num; +void NiPixelData::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { + unsigned int block_num; NiObject::Read( in, link_stack, version, user_version ); NifStream( pixelFormat, in, version ); if ( version <= 0x0A020000 ) { @@ -8493,7 +8493,7 @@ void NiPixelData::InternalRead( istream& in, list<uint> & link_stack, unsigned i NifStream( blueMask, in, version ); NifStream( alphaMask, in, version ); NifStream( bitsPerPixel, in, version ); - for (uint i2 = 0; i2 < 8; i2++) { + for (unsigned int i2 = 0; i2 < 8; i2++) { NifStream( unknown8Bytes[i2], in, version ); }; }; @@ -8501,7 +8501,7 @@ void NiPixelData::InternalRead( istream& in, list<uint> & link_stack, unsigned i NifStream( unknownInt, in, version ); }; if ( version >= 0x14000004 ) { - for (uint i2 = 0; i2 < 54; i2++) { + for (unsigned int i2 = 0; i2 < 54; i2++) { NifStream( unknown54Bytes[i2], in, version ); }; }; @@ -8510,14 +8510,14 @@ void NiPixelData::InternalRead( istream& in, list<uint> & link_stack, unsigned i NifStream( numMipmaps, in, version ); NifStream( bytesPerPixel, in, version ); mipmaps.resize(numMipmaps); - for (uint i1 = 0; i1 < mipmaps.size(); i1++) { + for (unsigned int i1 = 0; i1 < mipmaps.size(); i1++) { NifStream( mipmaps[i1].width, in, version ); NifStream( mipmaps[i1].height, in, version ); NifStream( mipmaps[i1].offset, in, version ); }; NifStream( pixelData.dataSize, in, version ); pixelData.data.resize(pixelData.dataSize); - for (uint i1 = 0; i1 < pixelData.data.size(); i1++) { + for (unsigned int i1 = 0; i1 < pixelData.data.size(); i1++) { NifStream( pixelData.data[i1], in, version ); }; if ( version >= 0x14000004 ) { @@ -8525,9 +8525,9 @@ void NiPixelData::InternalRead( istream& in, list<uint> & link_stack, unsigned i }; } -void NiPixelData::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiPixelData::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { NiObject::Write( out, link_map, version, user_version ); - numMipmaps = uint(mipmaps.size()); + numMipmaps = unsigned int(mipmaps.size()); NifStream( pixelFormat, out, version ); if ( version <= 0x0A020000 ) { NifStream( redMask, out, version ); @@ -8535,7 +8535,7 @@ void NiPixelData::InternalWrite( ostream& out, const map<NiObjectRef,uint> & lin NifStream( blueMask, out, version ); NifStream( alphaMask, out, version ); NifStream( bitsPerPixel, out, version ); - for (uint i2 = 0; i2 < 8; i2++) { + for (unsigned int i2 = 0; i2 < 8; i2++) { NifStream( unknown8Bytes[i2], out, version ); }; }; @@ -8543,7 +8543,7 @@ void NiPixelData::InternalWrite( ostream& out, const map<NiObjectRef,uint> & lin NifStream( unknownInt, out, version ); }; if ( version >= 0x14000004 ) { - for (uint i2 = 0; i2 < 54; i2++) { + for (unsigned int i2 = 0; i2 < 54; i2++) { NifStream( unknown54Bytes[i2], out, version ); }; }; @@ -8553,14 +8553,14 @@ void NiPixelData::InternalWrite( ostream& out, const map<NiObjectRef,uint> & lin NifStream( 0xffffffff, out, version ); NifStream( numMipmaps, out, version ); NifStream( bytesPerPixel, out, version ); - for (uint i1 = 0; i1 < mipmaps.size(); i1++) { + for (unsigned int i1 = 0; i1 < mipmaps.size(); i1++) { NifStream( mipmaps[i1].width, out, version ); NifStream( mipmaps[i1].height, out, version ); NifStream( mipmaps[i1].offset, out, version ); }; - pixelData.dataSize = uint(pixelData.data.size()); + pixelData.dataSize = unsigned int(pixelData.data.size()); NifStream( pixelData.dataSize, out, version ); - for (uint i1 = 0; i1 < pixelData.data.size(); i1++) { + for (unsigned int i1 = 0; i1 < pixelData.data.size(); i1++) { NifStream( pixelData.data[i1], out, version ); }; if ( version >= 0x14000004 ) { @@ -8570,9 +8570,9 @@ void NiPixelData::InternalWrite( ostream& out, const map<NiObjectRef,uint> & lin std::string NiPixelData::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << NiObject::asString(); - numMipmaps = uint(mipmaps.size()); + numMipmaps = unsigned int(mipmaps.size()); out << " Pixel Format: " << pixelFormat << endl; out << " Red Mask: " << redMask << endl; out << " Green Mask: " << greenMask << endl; @@ -8580,7 +8580,7 @@ std::string NiPixelData::InternalAsString( bool verbose ) const { out << " Alpha Mask: " << alphaMask << endl; out << " Bits Per Pixel: " << bitsPerPixel << endl; array_output_count = 0; - for (uint i1 = 0; i1 < 8; i1++) { + for (unsigned int i1 = 0; i1 < 8; i1++) { if ( !verbose && ( array_output_count > MAXARRAYDUMP ) ) { out << "<Data Truncated. Use verbose mode to see complete listing.>" << endl; break; @@ -8593,7 +8593,7 @@ std::string NiPixelData::InternalAsString( bool verbose ) const { }; out << " Unknown Int: " << unknownInt << endl; array_output_count = 0; - for (uint i1 = 0; i1 < 54; i1++) { + for (unsigned int i1 = 0; i1 < 54; i1++) { if ( !verbose && ( array_output_count > MAXARRAYDUMP ) ) { out << "<Data Truncated. Use verbose mode to see complete listing.>" << endl; break; @@ -8608,7 +8608,7 @@ std::string NiPixelData::InternalAsString( bool verbose ) const { out << " Num Mipmaps: " << numMipmaps << endl; out << " Bytes Per Pixel: " << bytesPerPixel << endl; array_output_count = 0; - for (uint i1 = 0; i1 < mipmaps.size(); i1++) { + for (unsigned int i1 = 0; i1 < mipmaps.size(); i1++) { if ( !verbose && ( array_output_count > MAXARRAYDUMP ) ) { out << "<Data Truncated. Use verbose mode to see complete listing.>" << endl; break; @@ -8617,10 +8617,10 @@ std::string NiPixelData::InternalAsString( bool verbose ) const { out << " Height: " << mipmaps[i1].height << endl; out << " Offset: " << mipmaps[i1].offset << endl; }; - pixelData.dataSize = uint(pixelData.data.size()); + pixelData.dataSize = unsigned int(pixelData.data.size()); out << " Data Size: " << pixelData.dataSize << endl; array_output_count = 0; - for (uint i1 = 0; i1 < pixelData.data.size(); i1++) { + for (unsigned int i1 = 0; i1 < pixelData.data.size(); i1++) { if ( !verbose && ( array_output_count > MAXARRAYDUMP ) ) { out << "<Data Truncated. Use verbose mode to see complete listing.>" << endl; break; @@ -8635,7 +8635,7 @@ std::string NiPixelData::InternalAsString( bool verbose ) const { return out.str(); } -void NiPixelData::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiPixelData::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiObject::FixLinks( objects, link_stack, version, user_version ); palette = FixLink<NiPalette>( objects, link_stack, version ); } @@ -8648,7 +8648,7 @@ std::list<NiObjectRef> NiPixelData::InternalGetRefs() const { return refs; } -void NiPlanarCollider::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiPlanarCollider::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { AParticleModifier::Read( in, link_stack, version, user_version ); if ( version >= 0x0A000100 ) { NifStream( unknownShort, in, version ); @@ -8674,7 +8674,7 @@ void NiPlanarCollider::InternalRead( istream& in, list<uint> & link_stack, unsig NifStream( unknownFloat16, in, version ); } -void NiPlanarCollider::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiPlanarCollider::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { AParticleModifier::Write( out, link_map, version, user_version ); if ( version >= 0x0A000100 ) { NifStream( unknownShort, out, version ); @@ -8702,7 +8702,7 @@ void NiPlanarCollider::InternalWrite( ostream& out, const map<NiObjectRef,uint> std::string NiPlanarCollider::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << AParticleModifier::asString(); out << " Unknown Short: " << unknownShort << endl; out << " Unknown Float 1: " << unknownFloat1 << endl; @@ -8725,7 +8725,7 @@ std::string NiPlanarCollider::InternalAsString( bool verbose ) const { return out.str(); } -void NiPlanarCollider::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiPlanarCollider::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { AParticleModifier::FixLinks( objects, link_stack, version, user_version ); } @@ -8735,15 +8735,15 @@ std::list<NiObjectRef> NiPlanarCollider::InternalGetRefs() const { return refs; } -void NiPoint3Interpolator::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { - uint block_num; +void NiPoint3Interpolator::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { + unsigned int block_num; NiInterpolator::Read( in, link_stack, version, user_version ); NifStream( point3Value, in, version ); NifStream( block_num, in, version ); link_stack.push_back( block_num ); } -void NiPoint3Interpolator::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiPoint3Interpolator::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { NiInterpolator::Write( out, link_map, version, user_version ); NifStream( point3Value, out, version ); if ( data != NULL ) @@ -8754,14 +8754,14 @@ void NiPoint3Interpolator::InternalWrite( ostream& out, const map<NiObjectRef,ui std::string NiPoint3Interpolator::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << NiInterpolator::asString(); out << " Point 3 Value: " << point3Value << endl; out << " Data: " << data << endl; return out.str(); } -void NiPoint3Interpolator::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiPoint3Interpolator::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiInterpolator::FixLinks( objects, link_stack, version, user_version ); data = FixLink<NiPosData>( objects, link_stack, version ); } @@ -8774,14 +8774,14 @@ std::list<NiObjectRef> NiPoint3Interpolator::InternalGetRefs() const { return refs; } -void NiPointLight::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiPointLight::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiLight::Read( in, link_stack, version, user_version ); NifStream( constantAttenuation, in, version ); NifStream( linearAttenuation, in, version ); NifStream( quadraticAttenuation, in, version ); } -void NiPointLight::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiPointLight::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { NiLight::Write( out, link_map, version, user_version ); NifStream( constantAttenuation, out, version ); NifStream( linearAttenuation, out, version ); @@ -8790,7 +8790,7 @@ void NiPointLight::InternalWrite( ostream& out, const map<NiObjectRef,uint> & li std::string NiPointLight::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << NiLight::asString(); out << " Constant Attenuation: " << constantAttenuation << endl; out << " Linear Attenuation: " << linearAttenuation << endl; @@ -8798,7 +8798,7 @@ std::string NiPointLight::InternalAsString( bool verbose ) const { return out.str(); } -void NiPointLight::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiPointLight::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiLight::FixLinks( objects, link_stack, version, user_version ); } @@ -8808,41 +8808,41 @@ std::list<NiObjectRef> NiPointLight::InternalGetRefs() const { return refs; } -void NiPosData::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiPosData::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { AKeyedData::Read( in, link_stack, version, user_version ); NifStream( data.numKeys, in, version ); if ( (data.numKeys != 0) ) { NifStream( data.interpolation, in, version ); }; data.keys.resize(data.numKeys); - for (uint i1 = 0; i1 < data.keys.size(); i1++) { + for (unsigned int i1 = 0; i1 < data.keys.size(); i1++) { NifStream( data.keys[i1], in, version, data.interpolation ); }; } -void NiPosData::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiPosData::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { AKeyedData::Write( out, link_map, version, user_version ); - data.numKeys = uint(data.keys.size()); + data.numKeys = unsigned int(data.keys.size()); NifStream( data.numKeys, out, version ); if ( (data.numKeys != 0) ) { NifStream( data.interpolation, out, version ); }; - for (uint i1 = 0; i1 < data.keys.size(); i1++) { + for (unsigned int i1 = 0; i1 < data.keys.size(); i1++) { NifStream( data.keys[i1], out, version, data.interpolation ); }; } std::string NiPosData::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << AKeyedData::asString(); - data.numKeys = uint(data.keys.size()); + data.numKeys = unsigned int(data.keys.size()); out << " Num Keys: " << data.numKeys << endl; if ( (data.numKeys != 0) ) { out << " Interpolation: " << data.interpolation << endl; }; array_output_count = 0; - for (uint i1 = 0; i1 < data.keys.size(); i1++) { + for (unsigned int i1 = 0; i1 < data.keys.size(); i1++) { if ( !verbose && ( array_output_count > MAXARRAYDUMP ) ) { out << "<Data Truncated. Use verbose mode to see complete listing.>" << endl; break; @@ -8856,7 +8856,7 @@ std::string NiPosData::InternalAsString( bool verbose ) const { return out.str(); } -void NiPosData::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiPosData::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { AKeyedData::FixLinks( objects, link_stack, version, user_version ); } @@ -8866,15 +8866,15 @@ std::list<NiObjectRef> NiPosData::InternalGetRefs() const { return refs; } -void NiPSysAgeDeathModifier::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { - uint block_num; +void NiPSysAgeDeathModifier::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { + unsigned int block_num; NiPSysModifier::Read( in, link_stack, version, user_version ); NifStream( spawnOnDeath, in, version ); NifStream( block_num, in, version ); link_stack.push_back( block_num ); } -void NiPSysAgeDeathModifier::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiPSysAgeDeathModifier::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { NiPSysModifier::Write( out, link_map, version, user_version ); NifStream( spawnOnDeath, out, version ); if ( spawnModifier != NULL ) @@ -8885,14 +8885,14 @@ void NiPSysAgeDeathModifier::InternalWrite( ostream& out, const map<NiObjectRef, std::string NiPSysAgeDeathModifier::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << NiPSysModifier::asString(); out << " Spawn on Death: " << spawnOnDeath << endl; out << " Spawn Modifier: " << spawnModifier << endl; return out.str(); } -void NiPSysAgeDeathModifier::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiPSysAgeDeathModifier::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiPSysModifier::FixLinks( objects, link_stack, version, user_version ); spawnModifier = FixLink<NiPSysSpawnModifier>( objects, link_stack, version ); } @@ -8905,46 +8905,46 @@ std::list<NiObjectRef> NiPSysAgeDeathModifier::InternalGetRefs() const { return refs; } -void NiPSysBombModifier::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { - uint block_num; +void NiPSysBombModifier::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { + unsigned int block_num; NiPSysModifier::Read( in, link_stack, version, user_version ); NifStream( block_num, in, version ); link_stack.push_back( block_num ); - for (uint i1 = 0; i1 < 2; i1++) { + for (unsigned int i1 = 0; i1 < 2; i1++) { NifStream( unknownInts1[i1], in, version ); }; - for (uint i1 = 0; i1 < 3; i1++) { + for (unsigned int i1 = 0; i1 < 3; i1++) { NifStream( unknownFloats[i1], in, version ); }; - for (uint i1 = 0; i1 < 2; i1++) { + for (unsigned int i1 = 0; i1 < 2; i1++) { NifStream( unknownInts2[i1], in, version ); }; } -void NiPSysBombModifier::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiPSysBombModifier::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { NiPSysModifier::Write( out, link_map, version, user_version ); if ( unknownLink != NULL ) NifStream( link_map.find( StaticCast<NiObject>(unknownLink) )->second, out, version ); else NifStream( 0xffffffff, out, version ); - for (uint i1 = 0; i1 < 2; i1++) { + for (unsigned int i1 = 0; i1 < 2; i1++) { NifStream( unknownInts1[i1], out, version ); }; - for (uint i1 = 0; i1 < 3; i1++) { + for (unsigned int i1 = 0; i1 < 3; i1++) { NifStream( unknownFloats[i1], out, version ); }; - for (uint i1 = 0; i1 < 2; i1++) { + for (unsigned int i1 = 0; i1 < 2; i1++) { NifStream( unknownInts2[i1], out, version ); }; } std::string NiPSysBombModifier::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << NiPSysModifier::asString(); out << " Unknown Link: " << unknownLink << endl; array_output_count = 0; - for (uint i1 = 0; i1 < 2; i1++) { + for (unsigned int i1 = 0; i1 < 2; i1++) { if ( !verbose && ( array_output_count > MAXARRAYDUMP ) ) { out << "<Data Truncated. Use verbose mode to see complete listing.>" << endl; break; @@ -8956,7 +8956,7 @@ std::string NiPSysBombModifier::InternalAsString( bool verbose ) const { array_output_count++; }; array_output_count = 0; - for (uint i1 = 0; i1 < 3; i1++) { + for (unsigned int i1 = 0; i1 < 3; i1++) { if ( !verbose && ( array_output_count > MAXARRAYDUMP ) ) { out << "<Data Truncated. Use verbose mode to see complete listing.>" << endl; break; @@ -8968,7 +8968,7 @@ std::string NiPSysBombModifier::InternalAsString( bool verbose ) const { array_output_count++; }; array_output_count = 0; - for (uint i1 = 0; i1 < 2; i1++) { + for (unsigned int i1 = 0; i1 < 2; i1++) { if ( !verbose && ( array_output_count > MAXARRAYDUMP ) ) { out << "<Data Truncated. Use verbose mode to see complete listing.>" << endl; break; @@ -8982,7 +8982,7 @@ std::string NiPSysBombModifier::InternalAsString( bool verbose ) const { return out.str(); } -void NiPSysBombModifier::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiPSysBombModifier::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiPSysModifier::FixLinks( objects, link_stack, version, user_version ); unknownLink = FixLink<NiNode>( objects, link_stack, version ); } @@ -8993,25 +8993,25 @@ std::list<NiObjectRef> NiPSysBombModifier::InternalGetRefs() const { return refs; } -void NiPSysBoundUpdateModifier::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiPSysBoundUpdateModifier::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiPSysModifier::Read( in, link_stack, version, user_version ); NifStream( updateSkip, in, version ); } -void NiPSysBoundUpdateModifier::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiPSysBoundUpdateModifier::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { NiPSysModifier::Write( out, link_map, version, user_version ); NifStream( updateSkip, out, version ); } std::string NiPSysBoundUpdateModifier::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << NiPSysModifier::asString(); out << " Update Skip: " << updateSkip << endl; return out.str(); } -void NiPSysBoundUpdateModifier::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiPSysBoundUpdateModifier::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiPSysModifier::FixLinks( objects, link_stack, version, user_version ); } @@ -9021,14 +9021,14 @@ std::list<NiObjectRef> NiPSysBoundUpdateModifier::InternalGetRefs() const { return refs; } -void NiPSysBoxEmitter::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiPSysBoxEmitter::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiPSysVolumeEmitter::Read( in, link_stack, version, user_version ); NifStream( width, in, version ); NifStream( height, in, version ); NifStream( depth, in, version ); } -void NiPSysBoxEmitter::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiPSysBoxEmitter::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { NiPSysVolumeEmitter::Write( out, link_map, version, user_version ); NifStream( width, out, version ); NifStream( height, out, version ); @@ -9037,7 +9037,7 @@ void NiPSysBoxEmitter::InternalWrite( ostream& out, const map<NiObjectRef,uint> std::string NiPSysBoxEmitter::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << NiPSysVolumeEmitter::asString(); out << " Width: " << width << endl; out << " Height: " << height << endl; @@ -9045,7 +9045,7 @@ std::string NiPSysBoxEmitter::InternalAsString( bool verbose ) const { return out.str(); } -void NiPSysBoxEmitter::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiPSysBoxEmitter::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiPSysVolumeEmitter::FixLinks( objects, link_stack, version, user_version ); } @@ -9055,14 +9055,14 @@ std::list<NiObjectRef> NiPSysBoxEmitter::InternalGetRefs() const { return refs; } -void NiPSysColliderManager::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { - uint block_num; +void NiPSysColliderManager::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { + unsigned int block_num; NiPSysModifier::Read( in, link_stack, version, user_version ); NifStream( block_num, in, version ); link_stack.push_back( block_num ); } -void NiPSysColliderManager::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiPSysColliderManager::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { NiPSysModifier::Write( out, link_map, version, user_version ); if ( collider != NULL ) NifStream( link_map.find( StaticCast<NiObject>(collider) )->second, out, version ); @@ -9072,13 +9072,13 @@ void NiPSysColliderManager::InternalWrite( ostream& out, const map<NiObjectRef,u std::string NiPSysColliderManager::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << NiPSysModifier::asString(); out << " Collider: " << collider << endl; return out.str(); } -void NiPSysColliderManager::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiPSysColliderManager::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiPSysModifier::FixLinks( objects, link_stack, version, user_version ); collider = FixLink<NiPSysPlanarCollider>( objects, link_stack, version ); } @@ -9091,14 +9091,14 @@ std::list<NiObjectRef> NiPSysColliderManager::InternalGetRefs() const { return refs; } -void NiPSysColorModifier::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { - uint block_num; +void NiPSysColorModifier::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { + unsigned int block_num; NiPSysModifier::Read( in, link_stack, version, user_version ); NifStream( block_num, in, version ); link_stack.push_back( block_num ); } -void NiPSysColorModifier::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiPSysColorModifier::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { NiPSysModifier::Write( out, link_map, version, user_version ); if ( data != NULL ) NifStream( link_map.find( StaticCast<NiObject>(data) )->second, out, version ); @@ -9108,13 +9108,13 @@ void NiPSysColorModifier::InternalWrite( ostream& out, const map<NiObjectRef,uin std::string NiPSysColorModifier::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << NiPSysModifier::asString(); out << " Data: " << data << endl; return out.str(); } -void NiPSysColorModifier::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiPSysColorModifier::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiPSysModifier::FixLinks( objects, link_stack, version, user_version ); data = FixLink<NiColorData>( objects, link_stack, version ); } @@ -9127,13 +9127,13 @@ std::list<NiObjectRef> NiPSysColorModifier::InternalGetRefs() const { return refs; } -void NiPSysCylinderEmitter::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiPSysCylinderEmitter::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiPSysVolumeEmitter::Read( in, link_stack, version, user_version ); NifStream( radius, in, version ); NifStream( height, in, version ); } -void NiPSysCylinderEmitter::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiPSysCylinderEmitter::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { NiPSysVolumeEmitter::Write( out, link_map, version, user_version ); NifStream( radius, out, version ); NifStream( height, out, version ); @@ -9141,14 +9141,14 @@ void NiPSysCylinderEmitter::InternalWrite( ostream& out, const map<NiObjectRef,u std::string NiPSysCylinderEmitter::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << NiPSysVolumeEmitter::asString(); out << " Radius: " << radius << endl; out << " Height: " << height << endl; return out.str(); } -void NiPSysCylinderEmitter::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiPSysCylinderEmitter::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiPSysVolumeEmitter::FixLinks( objects, link_stack, version, user_version ); } @@ -9158,12 +9158,12 @@ std::list<NiObjectRef> NiPSysCylinderEmitter::InternalGetRefs() const { return refs; } -void NiPSysData::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiPSysData::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { APSysData::Read( in, link_stack, version, user_version ); if ( version <= 0x0A020000 ) { unknownFloats4.resize(numVertices); - for (uint i2 = 0; i2 < unknownFloats4.size(); i2++) { - for (uint i3 = 0; i3 < 10; i3++) { + for (unsigned int i2 = 0; i2 < unknownFloats4.size(); i2++) { + for (unsigned int i3 = 0; i3 < 10; i3++) { NifStream( unknownFloats4[i2][i3], in, version ); }; }; @@ -9172,16 +9172,16 @@ void NiPSysData::InternalRead( istream& in, list<uint> & link_stack, unsigned in NifStream( unknownBool1, in, version ); if ( (unknownBool1 != 0) ) { unknownBytes.resize(numVertices); - for (uint i3 = 0; i3 < unknownBytes.size(); i3++) { - for (uint i4 = 0; i4 < 32; i4++) { + for (unsigned int i3 = 0; i3 < unknownBytes.size(); i3++) { + for (unsigned int i4 = 0; i4 < 32; i4++) { NifStream( unknownBytes[i3][i4], in, version ); }; }; }; if ( (unknownBool1 == 0) ) { unknownBytesAlt.resize(numVertices); - for (uint i3 = 0; i3 < unknownBytesAlt.size(); i3++) { - for (uint i4 = 0; i4 < 28; i4++) { + for (unsigned int i3 = 0; i3 < unknownBytesAlt.size(); i3++) { + for (unsigned int i4 = 0; i4 < 28; i4++) { NifStream( unknownBytesAlt[i3][i4], in, version ); }; }; @@ -9190,8 +9190,8 @@ void NiPSysData::InternalRead( istream& in, list<uint> & link_stack, unsigned in NifStream( unknownBool2, in, version ); if ( (unknownBool2 != 0) ) { unknownBytes2.resize(numVertices); - for (uint i3 = 0; i3 < unknownBytes2.size(); i3++) { - for (uint i4 = 0; i4 < 4; i4++) { + for (unsigned int i3 = 0; i3 < unknownBytes2.size(); i3++) { + for (unsigned int i4 = 0; i4 < 4; i4++) { NifStream( unknownBytes2[i3][i4], in, version ); }; }; @@ -9200,11 +9200,11 @@ void NiPSysData::InternalRead( istream& in, list<uint> & link_stack, unsigned in NifStream( unknownInt1, in, version ); } -void NiPSysData::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiPSysData::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { APSysData::Write( out, link_map, version, user_version ); if ( version <= 0x0A020000 ) { - for (uint i2 = 0; i2 < unknownFloats4.size(); i2++) { - for (uint i3 = 0; i3 < 10; i3++) { + for (unsigned int i2 = 0; i2 < unknownFloats4.size(); i2++) { + for (unsigned int i3 = 0; i3 < 10; i3++) { NifStream( unknownFloats4[i2][i3], out, version ); }; }; @@ -9212,15 +9212,15 @@ void NiPSysData::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link if ( version >= 0x14000004 ) { NifStream( unknownBool1, out, version ); if ( (unknownBool1 != 0) ) { - for (uint i3 = 0; i3 < unknownBytes.size(); i3++) { - for (uint i4 = 0; i4 < 32; i4++) { + for (unsigned int i3 = 0; i3 < unknownBytes.size(); i3++) { + for (unsigned int i4 = 0; i4 < 32; i4++) { NifStream( unknownBytes[i3][i4], out, version ); }; }; }; if ( (unknownBool1 == 0) ) { - for (uint i3 = 0; i3 < unknownBytesAlt.size(); i3++) { - for (uint i4 = 0; i4 < 28; i4++) { + for (unsigned int i3 = 0; i3 < unknownBytesAlt.size(); i3++) { + for (unsigned int i4 = 0; i4 < 28; i4++) { NifStream( unknownBytesAlt[i3][i4], out, version ); }; }; @@ -9228,8 +9228,8 @@ void NiPSysData::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link NifStream( unknownByte3, out, version ); NifStream( unknownBool2, out, version ); if ( (unknownBool2 != 0) ) { - for (uint i3 = 0; i3 < unknownBytes2.size(); i3++) { - for (uint i4 = 0; i4 < 4; i4++) { + for (unsigned int i3 = 0; i3 < unknownBytes2.size(); i3++) { + for (unsigned int i4 = 0; i4 < 4; i4++) { NifStream( unknownBytes2[i3][i4], out, version ); }; }; @@ -9240,15 +9240,15 @@ void NiPSysData::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link std::string NiPSysData::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << APSysData::asString(); array_output_count = 0; - for (uint i1 = 0; i1 < unknownFloats4.size(); i1++) { + for (unsigned int i1 = 0; i1 < unknownFloats4.size(); i1++) { if ( !verbose && ( array_output_count > MAXARRAYDUMP ) ) { out << "<Data Truncated. Use verbose mode to see complete listing.>" << endl; break; }; - for (uint i2 = 0; i2 < 10; i2++) { + for (unsigned int i2 = 0; i2 < 10; i2++) { if ( !verbose && ( array_output_count > MAXARRAYDUMP ) ) { break; }; @@ -9259,12 +9259,12 @@ std::string NiPSysData::InternalAsString( bool verbose ) const { out << " Unknown Bool 1: " << unknownBool1 << endl; if ( (unknownBool1 != 0) ) { array_output_count = 0; - for (uint i2 = 0; i2 < unknownBytes.size(); i2++) { + for (unsigned int i2 = 0; i2 < unknownBytes.size(); i2++) { if ( !verbose && ( array_output_count > MAXARRAYDUMP ) ) { out << "<Data Truncated. Use verbose mode to see complete listing.>" << endl; break; }; - for (uint i3 = 0; i3 < 32; i3++) { + for (unsigned int i3 = 0; i3 < 32; i3++) { if ( !verbose && ( array_output_count > MAXARRAYDUMP ) ) { break; }; @@ -9275,12 +9275,12 @@ std::string NiPSysData::InternalAsString( bool verbose ) const { }; if ( (unknownBool1 == 0) ) { array_output_count = 0; - for (uint i2 = 0; i2 < unknownBytesAlt.size(); i2++) { + for (unsigned int i2 = 0; i2 < unknownBytesAlt.size(); i2++) { if ( !verbose && ( array_output_count > MAXARRAYDUMP ) ) { out << "<Data Truncated. Use verbose mode to see complete listing.>" << endl; break; }; - for (uint i3 = 0; i3 < 28; i3++) { + for (unsigned int i3 = 0; i3 < 28; i3++) { if ( !verbose && ( array_output_count > MAXARRAYDUMP ) ) { break; }; @@ -9293,12 +9293,12 @@ std::string NiPSysData::InternalAsString( bool verbose ) const { out << " Unknown Bool 2: " << unknownBool2 << endl; if ( (unknownBool2 != 0) ) { array_output_count = 0; - for (uint i2 = 0; i2 < unknownBytes2.size(); i2++) { + for (unsigned int i2 = 0; i2 < unknownBytes2.size(); i2++) { if ( !verbose && ( array_output_count > MAXARRAYDUMP ) ) { out << "<Data Truncated. Use verbose mode to see complete listing.>" << endl; break; }; - for (uint i3 = 0; i3 < 4; i3++) { + for (unsigned int i3 = 0; i3 < 4; i3++) { if ( !verbose && ( array_output_count > MAXARRAYDUMP ) ) { break; }; @@ -9311,7 +9311,7 @@ std::string NiPSysData::InternalAsString( bool verbose ) const { return out.str(); } -void NiPSysData::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiPSysData::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { APSysData::FixLinks( objects, link_stack, version, user_version ); } @@ -9321,8 +9321,8 @@ std::list<NiObjectRef> NiPSysData::InternalGetRefs() const { return refs; } -void NiPSysDragModifier::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { - uint block_num; +void NiPSysDragModifier::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { + unsigned int block_num; NiPSysModifier::Read( in, link_stack, version, user_version ); NifStream( block_num, in, version ); link_stack.push_back( block_num ); @@ -9332,7 +9332,7 @@ void NiPSysDragModifier::InternalRead( istream& in, list<uint> & link_stack, uns NifStream( rangeFalloff, in, version ); } -void NiPSysDragModifier::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiPSysDragModifier::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { NiPSysModifier::Write( out, link_map, version, user_version ); if ( parent != NULL ) NifStream( link_map.find( StaticCast<NiObject>(parent) )->second, out, version ); @@ -9346,7 +9346,7 @@ void NiPSysDragModifier::InternalWrite( ostream& out, const map<NiObjectRef,uint std::string NiPSysDragModifier::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << NiPSysModifier::asString(); out << " Parent: " << parent << endl; out << " Drag Axis: " << dragAxis << endl; @@ -9356,7 +9356,7 @@ std::string NiPSysDragModifier::InternalAsString( bool verbose ) const { return out.str(); } -void NiPSysDragModifier::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiPSysDragModifier::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiPSysModifier::FixLinks( objects, link_stack, version, user_version ); parent = FixLink<NiObject>( objects, link_stack, version ); } @@ -9367,8 +9367,8 @@ std::list<NiObjectRef> NiPSysDragModifier::InternalGetRefs() const { return refs; } -void NiPSysEmitterCtlr::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { - uint block_num; +void NiPSysEmitterCtlr::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { + unsigned int block_num; APSysCtlr::Read( in, link_stack, version, user_version ); if ( version <= 0x0A010000 ) { NifStream( block_num, in, version ); @@ -9380,7 +9380,7 @@ void NiPSysEmitterCtlr::InternalRead( istream& in, list<uint> & link_stack, unsi }; } -void NiPSysEmitterCtlr::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiPSysEmitterCtlr::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { APSysCtlr::Write( out, link_map, version, user_version ); if ( version <= 0x0A010000 ) { if ( data != NULL ) @@ -9398,14 +9398,14 @@ void NiPSysEmitterCtlr::InternalWrite( ostream& out, const map<NiObjectRef,uint> std::string NiPSysEmitterCtlr::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << APSysCtlr::asString(); out << " Data: " << data << endl; out << " Visibility Interpolator: " << visibilityInterpolator << endl; return out.str(); } -void NiPSysEmitterCtlr::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiPSysEmitterCtlr::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { APSysCtlr::FixLinks( objects, link_stack, version, user_version ); if ( version <= 0x0A010000 ) { data = FixLink<NiPSysEmitterCtlrData>( objects, link_stack, version ); @@ -9425,52 +9425,52 @@ std::list<NiObjectRef> NiPSysEmitterCtlr::InternalGetRefs() const { return refs; } -void NiPSysEmitterCtlrData::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiPSysEmitterCtlrData::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiObject::Read( in, link_stack, version, user_version ); NifStream( floatKeys_.numKeys, in, version ); if ( (floatKeys_.numKeys != 0) ) { NifStream( floatKeys_.interpolation, in, version ); }; floatKeys_.keys.resize(floatKeys_.numKeys); - for (uint i1 = 0; i1 < floatKeys_.keys.size(); i1++) { + for (unsigned int i1 = 0; i1 < floatKeys_.keys.size(); i1++) { NifStream( floatKeys_.keys[i1], in, version, floatKeys_.interpolation ); }; NifStream( numVisibilityKeys_, in, version ); visibilityKeys_.resize(numVisibilityKeys_); - for (uint i1 = 0; i1 < visibilityKeys_.size(); i1++) { + for (unsigned int i1 = 0; i1 < visibilityKeys_.size(); i1++) { NifStream( visibilityKeys_[i1], in, version, 1 ); }; } -void NiPSysEmitterCtlrData::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiPSysEmitterCtlrData::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { NiObject::Write( out, link_map, version, user_version ); - numVisibilityKeys_ = uint(visibilityKeys_.size()); - floatKeys_.numKeys = uint(floatKeys_.keys.size()); + numVisibilityKeys_ = unsigned int(visibilityKeys_.size()); + floatKeys_.numKeys = unsigned int(floatKeys_.keys.size()); NifStream( floatKeys_.numKeys, out, version ); if ( (floatKeys_.numKeys != 0) ) { NifStream( floatKeys_.interpolation, out, version ); }; - for (uint i1 = 0; i1 < floatKeys_.keys.size(); i1++) { + for (unsigned int i1 = 0; i1 < floatKeys_.keys.size(); i1++) { NifStream( floatKeys_.keys[i1], out, version, floatKeys_.interpolation ); }; NifStream( numVisibilityKeys_, out, version ); - for (uint i1 = 0; i1 < visibilityKeys_.size(); i1++) { + for (unsigned int i1 = 0; i1 < visibilityKeys_.size(); i1++) { NifStream( visibilityKeys_[i1], out, version, 1 ); }; } std::string NiPSysEmitterCtlrData::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << NiObject::asString(); - numVisibilityKeys_ = uint(visibilityKeys_.size()); - floatKeys_.numKeys = uint(floatKeys_.keys.size()); + numVisibilityKeys_ = unsigned int(visibilityKeys_.size()); + floatKeys_.numKeys = unsigned int(floatKeys_.keys.size()); out << " Num Keys: " << floatKeys_.numKeys << endl; if ( (floatKeys_.numKeys != 0) ) { out << " Interpolation: " << floatKeys_.interpolation << endl; }; array_output_count = 0; - for (uint i1 = 0; i1 < floatKeys_.keys.size(); i1++) { + for (unsigned int i1 = 0; i1 < floatKeys_.keys.size(); i1++) { if ( !verbose && ( array_output_count > MAXARRAYDUMP ) ) { out << "<Data Truncated. Use verbose mode to see complete listing.>" << endl; break; @@ -9483,7 +9483,7 @@ std::string NiPSysEmitterCtlrData::InternalAsString( bool verbose ) const { }; out << " Num Visibility Keys?: " << numVisibilityKeys_ << endl; array_output_count = 0; - for (uint i1 = 0; i1 < visibilityKeys_.size(); i1++) { + for (unsigned int i1 = 0; i1 < visibilityKeys_.size(); i1++) { if ( !verbose && ( array_output_count > MAXARRAYDUMP ) ) { out << "<Data Truncated. Use verbose mode to see complete listing.>" << endl; break; @@ -9497,7 +9497,7 @@ std::string NiPSysEmitterCtlrData::InternalAsString( bool verbose ) const { return out.str(); } -void NiPSysEmitterCtlrData::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiPSysEmitterCtlrData::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiObject::FixLinks( objects, link_stack, version, user_version ); } @@ -9507,22 +9507,22 @@ std::list<NiObjectRef> NiPSysEmitterCtlrData::InternalGetRefs() const { return refs; } -void NiPSysEmitterDeclinationCtlr::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiPSysEmitterDeclinationCtlr::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { APSysCtlr::Read( in, link_stack, version, user_version ); } -void NiPSysEmitterDeclinationCtlr::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiPSysEmitterDeclinationCtlr::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { APSysCtlr::Write( out, link_map, version, user_version ); } std::string NiPSysEmitterDeclinationCtlr::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << APSysCtlr::asString(); return out.str(); } -void NiPSysEmitterDeclinationCtlr::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiPSysEmitterDeclinationCtlr::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { APSysCtlr::FixLinks( objects, link_stack, version, user_version ); } @@ -9532,22 +9532,22 @@ std::list<NiObjectRef> NiPSysEmitterDeclinationCtlr::InternalGetRefs() const { return refs; } -void NiPSysEmitterDeclinationVarCtlr::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiPSysEmitterDeclinationVarCtlr::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { APSysCtlr::Read( in, link_stack, version, user_version ); } -void NiPSysEmitterDeclinationVarCtlr::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiPSysEmitterDeclinationVarCtlr::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { APSysCtlr::Write( out, link_map, version, user_version ); } std::string NiPSysEmitterDeclinationVarCtlr::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << APSysCtlr::asString(); return out.str(); } -void NiPSysEmitterDeclinationVarCtlr::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiPSysEmitterDeclinationVarCtlr::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { APSysCtlr::FixLinks( objects, link_stack, version, user_version ); } @@ -9557,22 +9557,22 @@ std::list<NiObjectRef> NiPSysEmitterDeclinationVarCtlr::InternalGetRefs() const return refs; } -void NiPSysEmitterInitialRadiusCtlr::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiPSysEmitterInitialRadiusCtlr::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { APSysCtlr::Read( in, link_stack, version, user_version ); } -void NiPSysEmitterInitialRadiusCtlr::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiPSysEmitterInitialRadiusCtlr::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { APSysCtlr::Write( out, link_map, version, user_version ); } std::string NiPSysEmitterInitialRadiusCtlr::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << APSysCtlr::asString(); return out.str(); } -void NiPSysEmitterInitialRadiusCtlr::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiPSysEmitterInitialRadiusCtlr::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { APSysCtlr::FixLinks( objects, link_stack, version, user_version ); } @@ -9582,8 +9582,8 @@ std::list<NiObjectRef> NiPSysEmitterInitialRadiusCtlr::InternalGetRefs() const { return refs; } -void NiPSysEmitterLifeSpanCtlr::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { - uint block_num; +void NiPSysEmitterLifeSpanCtlr::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { + unsigned int block_num; APSysCtlr::Read( in, link_stack, version, user_version ); if ( version <= 0x0A010000 ) { NifStream( block_num, in, version ); @@ -9591,7 +9591,7 @@ void NiPSysEmitterLifeSpanCtlr::InternalRead( istream& in, list<uint> & link_sta }; } -void NiPSysEmitterLifeSpanCtlr::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiPSysEmitterLifeSpanCtlr::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { APSysCtlr::Write( out, link_map, version, user_version ); if ( version <= 0x0A010000 ) { if ( unknownLink != NULL ) @@ -9603,13 +9603,13 @@ void NiPSysEmitterLifeSpanCtlr::InternalWrite( ostream& out, const map<NiObjectR std::string NiPSysEmitterLifeSpanCtlr::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << APSysCtlr::asString(); out << " Unknown Link: " << unknownLink << endl; return out.str(); } -void NiPSysEmitterLifeSpanCtlr::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiPSysEmitterLifeSpanCtlr::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { APSysCtlr::FixLinks( objects, link_stack, version, user_version ); if ( version <= 0x0A010000 ) { unknownLink = FixLink<NiFloatData>( objects, link_stack, version ); @@ -9624,8 +9624,8 @@ std::list<NiObjectRef> NiPSysEmitterLifeSpanCtlr::InternalGetRefs() const { return refs; } -void NiPSysEmitterSpeedCtlr::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { - uint block_num; +void NiPSysEmitterSpeedCtlr::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { + unsigned int block_num; APSysCtlr::Read( in, link_stack, version, user_version ); if ( version <= 0x0A010000 ) { NifStream( block_num, in, version ); @@ -9633,7 +9633,7 @@ void NiPSysEmitterSpeedCtlr::InternalRead( istream& in, list<uint> & link_stack, }; } -void NiPSysEmitterSpeedCtlr::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiPSysEmitterSpeedCtlr::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { APSysCtlr::Write( out, link_map, version, user_version ); if ( version <= 0x0A010000 ) { if ( unknownLink != NULL ) @@ -9645,13 +9645,13 @@ void NiPSysEmitterSpeedCtlr::InternalWrite( ostream& out, const map<NiObjectRef, std::string NiPSysEmitterSpeedCtlr::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << APSysCtlr::asString(); out << " Unknown Link: " << unknownLink << endl; return out.str(); } -void NiPSysEmitterSpeedCtlr::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiPSysEmitterSpeedCtlr::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { APSysCtlr::FixLinks( objects, link_stack, version, user_version ); if ( version <= 0x0A010000 ) { unknownLink = FixLink<NiFloatData>( objects, link_stack, version ); @@ -9666,8 +9666,8 @@ std::list<NiObjectRef> NiPSysEmitterSpeedCtlr::InternalGetRefs() const { return refs; } -void NiPSysGravityModifier::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { - uint block_num; +void NiPSysGravityModifier::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { + unsigned int block_num; NiPSysModifier::Read( in, link_stack, version, user_version ); NifStream( block_num, in, version ); link_stack.push_back( block_num ); @@ -9679,7 +9679,7 @@ void NiPSysGravityModifier::InternalRead( istream& in, list<uint> & link_stack, NifStream( turbulenceScale, in, version ); } -void NiPSysGravityModifier::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiPSysGravityModifier::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { NiPSysModifier::Write( out, link_map, version, user_version ); if ( gravityObject != NULL ) NifStream( link_map.find( StaticCast<NiObject>(gravityObject) )->second, out, version ); @@ -9695,7 +9695,7 @@ void NiPSysGravityModifier::InternalWrite( ostream& out, const map<NiObjectRef,u std::string NiPSysGravityModifier::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << NiPSysModifier::asString(); out << " Gravity Object: " << gravityObject << endl; out << " Gravity Axis: " << gravityAxis << endl; @@ -9707,7 +9707,7 @@ std::string NiPSysGravityModifier::InternalAsString( bool verbose ) const { return out.str(); } -void NiPSysGravityModifier::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiPSysGravityModifier::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiPSysModifier::FixLinks( objects, link_stack, version, user_version ); gravityObject = FixLink<NiNode>( objects, link_stack, version ); } @@ -9718,8 +9718,8 @@ std::list<NiObjectRef> NiPSysGravityModifier::InternalGetRefs() const { return refs; } -void NiPSysGravityStrengthCtlr::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { - uint block_num; +void NiPSysGravityStrengthCtlr::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { + unsigned int block_num; APSysCtlr::Read( in, link_stack, version, user_version ); if ( version <= 0x0A010000 ) { NifStream( block_num, in, version ); @@ -9727,7 +9727,7 @@ void NiPSysGravityStrengthCtlr::InternalRead( istream& in, list<uint> & link_sta }; } -void NiPSysGravityStrengthCtlr::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiPSysGravityStrengthCtlr::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { APSysCtlr::Write( out, link_map, version, user_version ); if ( version <= 0x0A010000 ) { if ( unknownLink != NULL ) @@ -9739,13 +9739,13 @@ void NiPSysGravityStrengthCtlr::InternalWrite( ostream& out, const map<NiObjectR std::string NiPSysGravityStrengthCtlr::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << APSysCtlr::asString(); out << " Unknown Link: " << unknownLink << endl; return out.str(); } -void NiPSysGravityStrengthCtlr::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiPSysGravityStrengthCtlr::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { APSysCtlr::FixLinks( objects, link_stack, version, user_version ); if ( version <= 0x0A010000 ) { unknownLink = FixLink<NiFloatData>( objects, link_stack, version ); @@ -9760,7 +9760,7 @@ std::list<NiObjectRef> NiPSysGravityStrengthCtlr::InternalGetRefs() const { return refs; } -void NiPSysGrowFadeModifier::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiPSysGrowFadeModifier::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiPSysModifier::Read( in, link_stack, version, user_version ); NifStream( growTime, in, version ); NifStream( growGeneration, in, version ); @@ -9768,7 +9768,7 @@ void NiPSysGrowFadeModifier::InternalRead( istream& in, list<uint> & link_stack, NifStream( fadeGeneration, in, version ); } -void NiPSysGrowFadeModifier::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiPSysGrowFadeModifier::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { NiPSysModifier::Write( out, link_map, version, user_version ); NifStream( growTime, out, version ); NifStream( growGeneration, out, version ); @@ -9778,7 +9778,7 @@ void NiPSysGrowFadeModifier::InternalWrite( ostream& out, const map<NiObjectRef, std::string NiPSysGrowFadeModifier::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << NiPSysModifier::asString(); out << " Grow Time: " << growTime << endl; out << " Grow Generation: " << growGeneration << endl; @@ -9787,7 +9787,7 @@ std::string NiPSysGrowFadeModifier::InternalAsString( bool verbose ) const { return out.str(); } -void NiPSysGrowFadeModifier::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiPSysGrowFadeModifier::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiPSysModifier::FixLinks( objects, link_stack, version, user_version ); } @@ -9797,12 +9797,12 @@ std::list<NiObjectRef> NiPSysGrowFadeModifier::InternalGetRefs() const { return refs; } -void NiPSysMeshEmitter::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { - uint block_num; +void NiPSysMeshEmitter::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { + unsigned int block_num; NiPSysEmitter::Read( in, link_stack, version, user_version ); NifStream( numEmitterMeshes, in, version ); emitterMeshes.resize(numEmitterMeshes); - for (uint i1 = 0; i1 < emitterMeshes.size(); i1++) { + for (unsigned int i1 = 0; i1 < emitterMeshes.size(); i1++) { NifStream( block_num, in, version ); link_stack.push_back( block_num ); }; @@ -9811,11 +9811,11 @@ void NiPSysMeshEmitter::InternalRead( istream& in, list<uint> & link_stack, unsi NifStream( emissionAxis, in, version ); } -void NiPSysMeshEmitter::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiPSysMeshEmitter::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { NiPSysEmitter::Write( out, link_map, version, user_version ); - numEmitterMeshes = uint(emitterMeshes.size()); + numEmitterMeshes = unsigned int(emitterMeshes.size()); NifStream( numEmitterMeshes, out, version ); - for (uint i1 = 0; i1 < emitterMeshes.size(); i1++) { + for (unsigned int i1 = 0; i1 < emitterMeshes.size(); i1++) { if ( emitterMeshes[i1] != NULL ) NifStream( link_map.find( StaticCast<NiObject>(emitterMeshes[i1]) )->second, out, version ); else @@ -9828,12 +9828,12 @@ void NiPSysMeshEmitter::InternalWrite( ostream& out, const map<NiObjectRef,uint> std::string NiPSysMeshEmitter::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << NiPSysEmitter::asString(); - numEmitterMeshes = uint(emitterMeshes.size()); + numEmitterMeshes = unsigned int(emitterMeshes.size()); out << " Num Emitter Meshes: " << numEmitterMeshes << endl; array_output_count = 0; - for (uint i1 = 0; i1 < emitterMeshes.size(); i1++) { + for (unsigned int i1 = 0; i1 < emitterMeshes.size(); i1++) { if ( !verbose && ( array_output_count > MAXARRAYDUMP ) ) { out << "<Data Truncated. Use verbose mode to see complete listing.>" << endl; break; @@ -9850,9 +9850,9 @@ std::string NiPSysMeshEmitter::InternalAsString( bool verbose ) const { return out.str(); } -void NiPSysMeshEmitter::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiPSysMeshEmitter::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiPSysEmitter::FixLinks( objects, link_stack, version, user_version ); - for (uint i1 = 0; i1 < emitterMeshes.size(); i1++) { + for (unsigned int i1 = 0; i1 < emitterMeshes.size(); i1++) { emitterMeshes[i1] = FixLink<NiTriBasedGeom>( objects, link_stack, version ); }; } @@ -9860,29 +9860,29 @@ void NiPSysMeshEmitter::InternalFixLinks( const map<unsigned int,NiObjectRef> & std::list<NiObjectRef> NiPSysMeshEmitter::InternalGetRefs() const { list<Ref<NiObject> > refs; refs = NiPSysEmitter::GetRefs(); - for (uint i1 = 0; i1 < emitterMeshes.size(); i1++) { + for (unsigned int i1 = 0; i1 < emitterMeshes.size(); i1++) { if ( emitterMeshes[i1] != NULL ) refs.push_back(StaticCast<NiObject>(emitterMeshes[i1])); }; return refs; } -void NiPSysMeshUpdateModifier::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { - uint block_num; +void NiPSysMeshUpdateModifier::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { + unsigned int block_num; NiPSysModifier::Read( in, link_stack, version, user_version ); NifStream( numMeshes, in, version ); meshes.resize(numMeshes); - for (uint i1 = 0; i1 < meshes.size(); i1++) { + for (unsigned int i1 = 0; i1 < meshes.size(); i1++) { NifStream( block_num, in, version ); link_stack.push_back( block_num ); }; } -void NiPSysMeshUpdateModifier::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiPSysMeshUpdateModifier::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { NiPSysModifier::Write( out, link_map, version, user_version ); - numMeshes = uint(meshes.size()); + numMeshes = unsigned int(meshes.size()); NifStream( numMeshes, out, version ); - for (uint i1 = 0; i1 < meshes.size(); i1++) { + for (unsigned int i1 = 0; i1 < meshes.size(); i1++) { if ( meshes[i1] != NULL ) NifStream( link_map.find( StaticCast<NiObject>(meshes[i1]) )->second, out, version ); else @@ -9892,12 +9892,12 @@ void NiPSysMeshUpdateModifier::InternalWrite( ostream& out, const map<NiObjectRe std::string NiPSysMeshUpdateModifier::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << NiPSysModifier::asString(); - numMeshes = uint(meshes.size()); + numMeshes = unsigned int(meshes.size()); out << " Num Meshes: " << numMeshes << endl; array_output_count = 0; - for (uint i1 = 0; i1 < meshes.size(); i1++) { + for (unsigned int i1 = 0; i1 < meshes.size(); i1++) { if ( !verbose && ( array_output_count > MAXARRAYDUMP ) ) { out << "<Data Truncated. Use verbose mode to see complete listing.>" << endl; break; @@ -9911,9 +9911,9 @@ std::string NiPSysMeshUpdateModifier::InternalAsString( bool verbose ) const { return out.str(); } -void NiPSysMeshUpdateModifier::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiPSysMeshUpdateModifier::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiPSysModifier::FixLinks( objects, link_stack, version, user_version ); - for (uint i1 = 0; i1 < meshes.size(); i1++) { + for (unsigned int i1 = 0; i1 < meshes.size(); i1++) { meshes[i1] = FixLink<NiNode>( objects, link_stack, version ); }; } @@ -9921,21 +9921,21 @@ void NiPSysMeshUpdateModifier::InternalFixLinks( const map<unsigned int,NiObject std::list<NiObjectRef> NiPSysMeshUpdateModifier::InternalGetRefs() const { list<Ref<NiObject> > refs; refs = NiPSysModifier::GetRefs(); - for (uint i1 = 0; i1 < meshes.size(); i1++) { + for (unsigned int i1 = 0; i1 < meshes.size(); i1++) { if ( meshes[i1] != NULL ) refs.push_back(StaticCast<NiObject>(meshes[i1])); }; return refs; } -void NiPSysModifierActiveCtlr::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiPSysModifierActiveCtlr::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { APSysCtlr::Read( in, link_stack, version, user_version ); if ( version <= 0x0A010000 ) { NifStream( unknownInt, in, version ); }; } -void NiPSysModifierActiveCtlr::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiPSysModifierActiveCtlr::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { APSysCtlr::Write( out, link_map, version, user_version ); if ( version <= 0x0A010000 ) { NifStream( unknownInt, out, version ); @@ -9944,13 +9944,13 @@ void NiPSysModifierActiveCtlr::InternalWrite( ostream& out, const map<NiObjectRe std::string NiPSysModifierActiveCtlr::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << APSysCtlr::asString(); out << " Unknown Int: " << unknownInt << endl; return out.str(); } -void NiPSysModifierActiveCtlr::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiPSysModifierActiveCtlr::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { APSysCtlr::FixLinks( objects, link_stack, version, user_version ); } @@ -9960,8 +9960,8 @@ std::list<NiObjectRef> NiPSysModifierActiveCtlr::InternalGetRefs() const { return refs; } -void NiPSysPlanarCollider::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { - uint block_num; +void NiPSysPlanarCollider::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { + unsigned int block_num; NiObject::Read( in, link_stack, version, user_version ); NifStream( bounce, in, version ); NifStream( spawnOnCollide, in, version ); @@ -9980,7 +9980,7 @@ void NiPSysPlanarCollider::InternalRead( istream& in, list<uint> & link_stack, u NifStream( yAxis, in, version ); } -void NiPSysPlanarCollider::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiPSysPlanarCollider::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { NiObject::Write( out, link_map, version, user_version ); NifStream( bounce, out, version ); NifStream( spawnOnCollide, out, version ); @@ -10009,7 +10009,7 @@ void NiPSysPlanarCollider::InternalWrite( ostream& out, const map<NiObjectRef,ui std::string NiPSysPlanarCollider::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << NiObject::asString(); out << " Bounce: " << bounce << endl; out << " Spawn on Collide: " << spawnOnCollide << endl; @@ -10025,7 +10025,7 @@ std::string NiPSysPlanarCollider::InternalAsString( bool verbose ) const { return out.str(); } -void NiPSysPlanarCollider::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiPSysPlanarCollider::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiObject::FixLinks( objects, link_stack, version, user_version ); spawnModifier = FixLink<NiPSysSpawnModifier>( objects, link_stack, version ); parent = FixLink<NiObject>( objects, link_stack, version ); @@ -10045,22 +10045,22 @@ std::list<NiObjectRef> NiPSysPlanarCollider::InternalGetRefs() const { return refs; } -void NiPSysPositionModifier::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiPSysPositionModifier::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiPSysModifier::Read( in, link_stack, version, user_version ); } -void NiPSysPositionModifier::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiPSysPositionModifier::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { NiPSysModifier::Write( out, link_map, version, user_version ); } std::string NiPSysPositionModifier::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << NiPSysModifier::asString(); return out.str(); } -void NiPSysPositionModifier::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiPSysPositionModifier::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiPSysModifier::FixLinks( objects, link_stack, version, user_version ); } @@ -10070,22 +10070,22 @@ std::list<NiObjectRef> NiPSysPositionModifier::InternalGetRefs() const { return refs; } -void NiPSysResetOnLoopCtlr::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiPSysResetOnLoopCtlr::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiTimeController::Read( in, link_stack, version, user_version ); } -void NiPSysResetOnLoopCtlr::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiPSysResetOnLoopCtlr::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { NiTimeController::Write( out, link_map, version, user_version ); } std::string NiPSysResetOnLoopCtlr::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << NiTimeController::asString(); return out.str(); } -void NiPSysResetOnLoopCtlr::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiPSysResetOnLoopCtlr::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiTimeController::FixLinks( objects, link_stack, version, user_version ); } @@ -10095,7 +10095,7 @@ std::list<NiObjectRef> NiPSysResetOnLoopCtlr::InternalGetRefs() const { return refs; } -void NiPSysRotationModifier::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiPSysRotationModifier::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiPSysModifier::Read( in, link_stack, version, user_version ); NifStream( initialRotationSpeed, in, version ); if ( version >= 0x14000004 ) { @@ -10108,7 +10108,7 @@ void NiPSysRotationModifier::InternalRead( istream& in, list<uint> & link_stack, NifStream( initialAxis, in, version ); } -void NiPSysRotationModifier::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiPSysRotationModifier::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { NiPSysModifier::Write( out, link_map, version, user_version ); NifStream( initialRotationSpeed, out, version ); if ( version >= 0x14000004 ) { @@ -10123,7 +10123,7 @@ void NiPSysRotationModifier::InternalWrite( ostream& out, const map<NiObjectRef, std::string NiPSysRotationModifier::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << NiPSysModifier::asString(); out << " Initial Rotation Speed: " << initialRotationSpeed << endl; out << " Initial Rotation Speed Variation: " << initialRotationSpeedVariation << endl; @@ -10135,7 +10135,7 @@ std::string NiPSysRotationModifier::InternalAsString( bool verbose ) const { return out.str(); } -void NiPSysRotationModifier::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiPSysRotationModifier::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiPSysModifier::FixLinks( objects, link_stack, version, user_version ); } @@ -10145,7 +10145,7 @@ std::list<NiObjectRef> NiPSysRotationModifier::InternalGetRefs() const { return refs; } -void NiPSysSpawnModifier::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiPSysSpawnModifier::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiPSysModifier::Read( in, link_stack, version, user_version ); NifStream( numSpawnGenerations, in, version ); NifStream( percentageSpawned, in, version ); @@ -10157,7 +10157,7 @@ void NiPSysSpawnModifier::InternalRead( istream& in, list<uint> & link_stack, un NifStream( lifeSpanVariation, in, version ); } -void NiPSysSpawnModifier::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiPSysSpawnModifier::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { NiPSysModifier::Write( out, link_map, version, user_version ); NifStream( numSpawnGenerations, out, version ); NifStream( percentageSpawned, out, version ); @@ -10171,7 +10171,7 @@ void NiPSysSpawnModifier::InternalWrite( ostream& out, const map<NiObjectRef,uin std::string NiPSysSpawnModifier::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << NiPSysModifier::asString(); out << " Num Spawn Generations: " << numSpawnGenerations << endl; out << " Percentage Spawned: " << percentageSpawned << endl; @@ -10184,7 +10184,7 @@ std::string NiPSysSpawnModifier::InternalAsString( bool verbose ) const { return out.str(); } -void NiPSysSpawnModifier::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiPSysSpawnModifier::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiPSysModifier::FixLinks( objects, link_stack, version, user_version ); } @@ -10194,25 +10194,25 @@ std::list<NiObjectRef> NiPSysSpawnModifier::InternalGetRefs() const { return refs; } -void NiPSysSphereEmitter::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiPSysSphereEmitter::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiPSysVolumeEmitter::Read( in, link_stack, version, user_version ); NifStream( radius, in, version ); } -void NiPSysSphereEmitter::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiPSysSphereEmitter::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { NiPSysVolumeEmitter::Write( out, link_map, version, user_version ); NifStream( radius, out, version ); } std::string NiPSysSphereEmitter::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << NiPSysVolumeEmitter::asString(); out << " Radius: " << radius << endl; return out.str(); } -void NiPSysSphereEmitter::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiPSysSphereEmitter::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiPSysVolumeEmitter::FixLinks( objects, link_stack, version, user_version ); } @@ -10222,22 +10222,22 @@ std::list<NiObjectRef> NiPSysSphereEmitter::InternalGetRefs() const { return refs; } -void NiPSysUpdateCtlr::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiPSysUpdateCtlr::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiTimeController::Read( in, link_stack, version, user_version ); } -void NiPSysUpdateCtlr::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiPSysUpdateCtlr::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { NiTimeController::Write( out, link_map, version, user_version ); } std::string NiPSysUpdateCtlr::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << NiTimeController::asString(); return out.str(); } -void NiPSysUpdateCtlr::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiPSysUpdateCtlr::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiTimeController::FixLinks( objects, link_stack, version, user_version ); } @@ -10247,22 +10247,22 @@ std::list<NiObjectRef> NiPSysUpdateCtlr::InternalGetRefs() const { return refs; } -void NiLODData::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiLODData::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiObject::Read( in, link_stack, version, user_version ); } -void NiLODData::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiLODData::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { NiObject::Write( out, link_map, version, user_version ); } std::string NiLODData::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << NiObject::asString(); return out.str(); } -void NiLODData::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiLODData::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiObject::FixLinks( objects, link_stack, version, user_version ); } @@ -10272,23 +10272,23 @@ std::list<NiObjectRef> NiLODData::InternalGetRefs() const { return refs; } -void NiRangeLODData::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiRangeLODData::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiLODData::Read( in, link_stack, version, user_version ); NifStream( lodCenter, in, version ); NifStream( numLodLevels, in, version ); lodLevels.resize(numLodLevels); - for (uint i1 = 0; i1 < lodLevels.size(); i1++) { + for (unsigned int i1 = 0; i1 < lodLevels.size(); i1++) { NifStream( lodLevels[i1].nearExtent, in, version ); NifStream( lodLevels[i1].farExtent, in, version ); }; } -void NiRangeLODData::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiRangeLODData::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { NiLODData::Write( out, link_map, version, user_version ); - numLodLevels = uint(lodLevels.size()); + numLodLevels = unsigned int(lodLevels.size()); NifStream( lodCenter, out, version ); NifStream( numLodLevels, out, version ); - for (uint i1 = 0; i1 < lodLevels.size(); i1++) { + for (unsigned int i1 = 0; i1 < lodLevels.size(); i1++) { NifStream( lodLevels[i1].nearExtent, out, version ); NifStream( lodLevels[i1].farExtent, out, version ); }; @@ -10296,13 +10296,13 @@ void NiRangeLODData::InternalWrite( ostream& out, const map<NiObjectRef,uint> & std::string NiRangeLODData::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << NiLODData::asString(); - numLodLevels = uint(lodLevels.size()); + numLodLevels = unsigned int(lodLevels.size()); out << " LOD Center: " << lodCenter << endl; out << " Num LOD Levels: " << numLodLevels << endl; array_output_count = 0; - for (uint i1 = 0; i1 < lodLevels.size(); i1++) { + for (unsigned int i1 = 0; i1 < lodLevels.size(); i1++) { if ( !verbose && ( array_output_count > MAXARRAYDUMP ) ) { out << "<Data Truncated. Use verbose mode to see complete listing.>" << endl; break; @@ -10313,7 +10313,7 @@ std::string NiRangeLODData::InternalAsString( bool verbose ) const { return out.str(); } -void NiRangeLODData::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiRangeLODData::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiLODData::FixLinks( objects, link_stack, version, user_version ); } @@ -10323,7 +10323,7 @@ std::list<NiObjectRef> NiRangeLODData::InternalGetRefs() const { return refs; } -void NiScreenLODData::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiScreenLODData::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiLODData::Read( in, link_stack, version, user_version ); NifStream( boundCenter, in, version ); NifStream( boundRadius, in, version ); @@ -10331,36 +10331,36 @@ void NiScreenLODData::InternalRead( istream& in, list<uint> & link_stack, unsign NifStream( worldRadius, in, version ); NifStream( proportionCount, in, version ); proportionLevels.resize(proportionCount); - for (uint i1 = 0; i1 < proportionLevels.size(); i1++) { + for (unsigned int i1 = 0; i1 < proportionLevels.size(); i1++) { NifStream( proportionLevels[i1], in, version ); }; } -void NiScreenLODData::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiScreenLODData::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { NiLODData::Write( out, link_map, version, user_version ); - proportionCount = uint(proportionLevels.size()); + proportionCount = unsigned int(proportionLevels.size()); NifStream( boundCenter, out, version ); NifStream( boundRadius, out, version ); NifStream( worldCenter, out, version ); NifStream( worldRadius, out, version ); NifStream( proportionCount, out, version ); - for (uint i1 = 0; i1 < proportionLevels.size(); i1++) { + for (unsigned int i1 = 0; i1 < proportionLevels.size(); i1++) { NifStream( proportionLevels[i1], out, version ); }; } std::string NiScreenLODData::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << NiLODData::asString(); - proportionCount = uint(proportionLevels.size()); + proportionCount = unsigned int(proportionLevels.size()); out << " Bound Center: " << boundCenter << endl; out << " Bound Radius: " << boundRadius << endl; out << " World Center: " << worldCenter << endl; out << " World Radius: " << worldRadius << endl; out << " Proportion Count: " << proportionCount << endl; array_output_count = 0; - for (uint i1 = 0; i1 < proportionLevels.size(); i1++) { + for (unsigned int i1 = 0; i1 < proportionLevels.size(); i1++) { if ( !verbose && ( array_output_count > MAXARRAYDUMP ) ) { out << "<Data Truncated. Use verbose mode to see complete listing.>" << endl; break; @@ -10374,7 +10374,7 @@ std::string NiScreenLODData::InternalAsString( bool verbose ) const { return out.str(); } -void NiScreenLODData::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiScreenLODData::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiLODData::FixLinks( objects, link_stack, version, user_version ); } @@ -10384,22 +10384,22 @@ std::list<NiObjectRef> NiScreenLODData::InternalGetRefs() const { return refs; } -void NiRotatingParticles::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiRotatingParticles::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiParticles::Read( in, link_stack, version, user_version ); } -void NiRotatingParticles::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiRotatingParticles::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { NiParticles::Write( out, link_map, version, user_version ); } std::string NiRotatingParticles::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << NiParticles::asString(); return out.str(); } -void NiRotatingParticles::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiRotatingParticles::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiParticles::FixLinks( objects, link_stack, version, user_version ); } @@ -10409,22 +10409,22 @@ std::list<NiObjectRef> NiRotatingParticles::InternalGetRefs() const { return refs; } -void NiRotatingParticlesData::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiRotatingParticlesData::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiParticlesData::Read( in, link_stack, version, user_version ); } -void NiRotatingParticlesData::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiRotatingParticlesData::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { NiParticlesData::Write( out, link_map, version, user_version ); } std::string NiRotatingParticlesData::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << NiParticlesData::asString(); return out.str(); } -void NiRotatingParticlesData::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiRotatingParticlesData::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiParticlesData::FixLinks( objects, link_stack, version, user_version ); } @@ -10434,22 +10434,22 @@ std::list<NiObjectRef> NiRotatingParticlesData::InternalGetRefs() const { return refs; } -void NiSequenceStreamHelper::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiSequenceStreamHelper::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiObjectNET::Read( in, link_stack, version, user_version ); } -void NiSequenceStreamHelper::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiSequenceStreamHelper::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { NiObjectNET::Write( out, link_map, version, user_version ); } std::string NiSequenceStreamHelper::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << NiObjectNET::asString(); return out.str(); } -void NiSequenceStreamHelper::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiSequenceStreamHelper::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiObjectNET::FixLinks( objects, link_stack, version, user_version ); } @@ -10459,25 +10459,25 @@ std::list<NiObjectRef> NiSequenceStreamHelper::InternalGetRefs() const { return refs; } -void NiShadeProperty::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiShadeProperty::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiProperty::Read( in, link_stack, version, user_version ); NifStream( flags, in, version ); } -void NiShadeProperty::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiShadeProperty::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { NiProperty::Write( out, link_map, version, user_version ); NifStream( flags, out, version ); } std::string NiShadeProperty::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << NiProperty::asString(); out << " Flags: " << flags << endl; return out.str(); } -void NiShadeProperty::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiShadeProperty::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiProperty::FixLinks( objects, link_stack, version, user_version ); } @@ -10487,8 +10487,8 @@ std::list<NiObjectRef> NiShadeProperty::InternalGetRefs() const { return refs; } -void NiSkinData::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { - uint block_num; +void NiSkinData::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { + unsigned int block_num; NiObject::Read( in, link_stack, version, user_version ); NifStream( rotation, in, version ); NifStream( translation, in, version ); @@ -10502,7 +10502,7 @@ void NiSkinData::InternalRead( istream& in, list<uint> & link_stack, unsigned in NifStream( unknownByte, in, version ); }; boneList.resize(numBones); - for (uint i1 = 0; i1 < boneList.size(); i1++) { + for (unsigned int i1 = 0; i1 < boneList.size(); i1++) { NifStream( boneList[i1].rotation, in, version ); NifStream( boneList[i1].translation, in, version ); NifStream( boneList[i1].scale, in, version ); @@ -10510,16 +10510,16 @@ void NiSkinData::InternalRead( istream& in, list<uint> & link_stack, unsigned in NifStream( boneList[i1].boundingSphereRadius, in, version ); NifStream( boneList[i1].numVertices, in, version ); boneList[i1].vertexWeights.resize(boneList[i1].numVertices); - for (uint i2 = 0; i2 < boneList[i1].vertexWeights.size(); i2++) { + for (unsigned int i2 = 0; i2 < boneList[i1].vertexWeights.size(); i2++) { NifStream( boneList[i1].vertexWeights[i2].index, in, version ); NifStream( boneList[i1].vertexWeights[i2].weight, in, version ); }; }; } -void NiSkinData::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiSkinData::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { NiObject::Write( out, link_map, version, user_version ); - numBones = uint(boneList.size()); + numBones = unsigned int(boneList.size()); NifStream( rotation, out, version ); NifStream( translation, out, version ); NifStream( scale, out, version ); @@ -10533,15 +10533,15 @@ void NiSkinData::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link if ( version >= 0x04020100 ) { NifStream( unknownByte, out, version ); }; - for (uint i1 = 0; i1 < boneList.size(); i1++) { - boneList[i1].numVertices = ushort(boneList[i1].vertexWeights.size()); + for (unsigned int i1 = 0; i1 < boneList.size(); i1++) { + boneList[i1].numVertices = unsigned short(boneList[i1].vertexWeights.size()); NifStream( boneList[i1].rotation, out, version ); NifStream( boneList[i1].translation, out, version ); NifStream( boneList[i1].scale, out, version ); NifStream( boneList[i1].boundingSphereOffset, out, version ); NifStream( boneList[i1].boundingSphereRadius, out, version ); NifStream( boneList[i1].numVertices, out, version ); - for (uint i2 = 0; i2 < boneList[i1].vertexWeights.size(); i2++) { + for (unsigned int i2 = 0; i2 < boneList[i1].vertexWeights.size(); i2++) { NifStream( boneList[i1].vertexWeights[i2].index, out, version ); NifStream( boneList[i1].vertexWeights[i2].weight, out, version ); }; @@ -10550,9 +10550,9 @@ void NiSkinData::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link std::string NiSkinData::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << NiObject::asString(); - numBones = uint(boneList.size()); + numBones = unsigned int(boneList.size()); out << " Rotation: " << rotation << endl; out << " Translation: " << translation << endl; out << " Scale: " << scale << endl; @@ -10560,12 +10560,12 @@ std::string NiSkinData::InternalAsString( bool verbose ) const { out << " Skin Partition: " << skinPartition << endl; out << " Unknown Byte: " << unknownByte << endl; array_output_count = 0; - for (uint i1 = 0; i1 < boneList.size(); i1++) { + for (unsigned int i1 = 0; i1 < boneList.size(); i1++) { if ( !verbose && ( array_output_count > MAXARRAYDUMP ) ) { out << "<Data Truncated. Use verbose mode to see complete listing.>" << endl; break; }; - boneList[i1].numVertices = ushort(boneList[i1].vertexWeights.size()); + boneList[i1].numVertices = unsigned short(boneList[i1].vertexWeights.size()); out << " Rotation: " << boneList[i1].rotation << endl; out << " Translation: " << boneList[i1].translation << endl; out << " Scale: " << boneList[i1].scale << endl; @@ -10573,7 +10573,7 @@ std::string NiSkinData::InternalAsString( bool verbose ) const { out << " Bounding Sphere Radius: " << boneList[i1].boundingSphereRadius << endl; out << " Num Vertices: " << boneList[i1].numVertices << endl; array_output_count = 0; - for (uint i2 = 0; i2 < boneList[i1].vertexWeights.size(); i2++) { + for (unsigned int i2 = 0; i2 < boneList[i1].vertexWeights.size(); i2++) { if ( !verbose && ( array_output_count > MAXARRAYDUMP ) ) { out << "<Data Truncated. Use verbose mode to see complete listing.>" << endl; break; @@ -10585,7 +10585,7 @@ std::string NiSkinData::InternalAsString( bool verbose ) const { return out.str(); } -void NiSkinData::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiSkinData::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiObject::FixLinks( objects, link_stack, version, user_version ); if ( version <= 0x0A010000 ) { skinPartition = FixLink<NiSkinPartition>( objects, link_stack, version ); @@ -10600,8 +10600,8 @@ std::list<NiObjectRef> NiSkinData::InternalGetRefs() const { return refs; } -void NiSkinInstance::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { - uint block_num; +void NiSkinInstance::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { + unsigned int block_num; NiObject::Read( in, link_stack, version, user_version ); NifStream( block_num, in, version ); link_stack.push_back( block_num ); @@ -10613,15 +10613,15 @@ void NiSkinInstance::InternalRead( istream& in, list<uint> & link_stack, unsigne link_stack.push_back( block_num ); NifStream( numBones, in, version ); bones.resize(numBones); - for (uint i1 = 0; i1 < bones.size(); i1++) { + for (unsigned int i1 = 0; i1 < bones.size(); i1++) { NifStream( block_num, in, version ); link_stack.push_back( block_num ); }; } -void NiSkinInstance::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiSkinInstance::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { NiObject::Write( out, link_map, version, user_version ); - numBones = uint(bones.size()); + numBones = unsigned int(bones.size()); if ( data != NULL ) NifStream( link_map.find( StaticCast<NiObject>(data) )->second, out, version ); else @@ -10637,7 +10637,7 @@ void NiSkinInstance::InternalWrite( ostream& out, const map<NiObjectRef,uint> & else NifStream( 0xffffffff, out, version ); NifStream( numBones, out, version ); - for (uint i1 = 0; i1 < bones.size(); i1++) { + for (unsigned int i1 = 0; i1 < bones.size(); i1++) { if ( bones[i1] != NULL ) NifStream( link_map.find( StaticCast<NiObject>(bones[i1]) )->second, out, version ); else @@ -10647,15 +10647,15 @@ void NiSkinInstance::InternalWrite( ostream& out, const map<NiObjectRef,uint> & std::string NiSkinInstance::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << NiObject::asString(); - numBones = uint(bones.size()); + numBones = unsigned int(bones.size()); out << " Data: " << data << endl; out << " Skin Partition: " << skinPartition << endl; out << " Skeleton Root: " << skeletonRoot << endl; out << " Num Bones: " << numBones << endl; array_output_count = 0; - for (uint i1 = 0; i1 < bones.size(); i1++) { + for (unsigned int i1 = 0; i1 < bones.size(); i1++) { if ( !verbose && ( array_output_count > MAXARRAYDUMP ) ) { out << "<Data Truncated. Use verbose mode to see complete listing.>" << endl; break; @@ -10669,14 +10669,14 @@ std::string NiSkinInstance::InternalAsString( bool verbose ) const { return out.str(); } -void NiSkinInstance::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiSkinInstance::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiObject::FixLinks( objects, link_stack, version, user_version ); data = FixLink<NiSkinData>( objects, link_stack, version ); if ( version >= 0x0A020000 ) { skinPartition = FixLink<NiSkinPartition>( objects, link_stack, version ); }; skeletonRoot = FixLink<NiNode>( objects, link_stack, version ); - for (uint i1 = 0; i1 < bones.size(); i1++) { + for (unsigned int i1 = 0; i1 < bones.size(); i1++) { bones[i1] = FixLink<NiNode>( objects, link_stack, version ); }; } @@ -10688,27 +10688,27 @@ std::list<NiObjectRef> NiSkinInstance::InternalGetRefs() const { refs.push_back(StaticCast<NiObject>(data)); if ( skinPartition != NULL ) refs.push_back(StaticCast<NiObject>(skinPartition)); - for (uint i1 = 0; i1 < bones.size(); i1++) { + for (unsigned int i1 = 0; i1 < bones.size(); i1++) { }; return refs; } -void NiClodSkinInstance::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiClodSkinInstance::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiSkinInstance::Read( in, link_stack, version, user_version ); } -void NiClodSkinInstance::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiClodSkinInstance::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { NiSkinInstance::Write( out, link_map, version, user_version ); } std::string NiClodSkinInstance::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << NiSkinInstance::asString(); return out.str(); } -void NiClodSkinInstance::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiClodSkinInstance::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiSkinInstance::FixLinks( objects, link_stack, version, user_version ); } @@ -10718,18 +10718,18 @@ std::list<NiObjectRef> NiClodSkinInstance::InternalGetRefs() const { return refs; } -void NiSkinPartition::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiSkinPartition::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiObject::Read( in, link_stack, version, user_version ); NifStream( numSkinPartitionBlocks, in, version ); skinPartitionBlocks.resize(numSkinPartitionBlocks); - for (uint i1 = 0; i1 < skinPartitionBlocks.size(); i1++) { + for (unsigned int i1 = 0; i1 < skinPartitionBlocks.size(); i1++) { NifStream( skinPartitionBlocks[i1].numVertices, in, version ); NifStream( skinPartitionBlocks[i1].numTriangles, in, version ); NifStream( skinPartitionBlocks[i1].numBones, in, version ); NifStream( skinPartitionBlocks[i1].numStrips, in, version ); NifStream( skinPartitionBlocks[i1].numWeightsPerVertex, in, version ); skinPartitionBlocks[i1].bones.resize(skinPartitionBlocks[i1].numBones); - for (uint i2 = 0; i2 < skinPartitionBlocks[i1].bones.size(); i2++) { + for (unsigned int i2 = 0; i2 < skinPartitionBlocks[i1].bones.size(); i2++) { NifStream( skinPartitionBlocks[i1].bones[i2], in, version ); }; if ( version >= 0x0A010000 ) { @@ -10737,14 +10737,14 @@ void NiSkinPartition::InternalRead( istream& in, list<uint> & link_stack, unsign }; if ( version <= 0x0A000102 ) { skinPartitionBlocks[i1].vertexMap.resize(skinPartitionBlocks[i1].numVertices); - for (uint i3 = 0; i3 < skinPartitionBlocks[i1].vertexMap.size(); i3++) { + for (unsigned int i3 = 0; i3 < skinPartitionBlocks[i1].vertexMap.size(); i3++) { NifStream( skinPartitionBlocks[i1].vertexMap[i3], in, version ); }; }; if ( version >= 0x0A010000 ) { if ( (skinPartitionBlocks[i1].hasVertexMap != 0) ) { skinPartitionBlocks[i1].vertexMap.resize(skinPartitionBlocks[i1].numVertices); - for (uint i4 = 0; i4 < skinPartitionBlocks[i1].vertexMap.size(); i4++) { + for (unsigned int i4 = 0; i4 < skinPartitionBlocks[i1].vertexMap.size(); i4++) { NifStream( skinPartitionBlocks[i1].vertexMap[i4], in, version ); }; }; @@ -10752,9 +10752,9 @@ void NiSkinPartition::InternalRead( istream& in, list<uint> & link_stack, unsign }; if ( version <= 0x0A000102 ) { skinPartitionBlocks[i1].vertexWeights.resize(skinPartitionBlocks[i1].numVertices); - for (uint i3 = 0; i3 < skinPartitionBlocks[i1].vertexWeights.size(); i3++) { + for (unsigned int i3 = 0; i3 < skinPartitionBlocks[i1].vertexWeights.size(); i3++) { skinPartitionBlocks[i1].vertexWeights[i3].resize(skinPartitionBlocks[i1].numWeightsPerVertex); - for (uint i4 = 0; i4 < skinPartitionBlocks[i1].vertexWeights[i3].size(); i4++) { + for (unsigned int i4 = 0; i4 < skinPartitionBlocks[i1].vertexWeights[i3].size(); i4++) { NifStream( skinPartitionBlocks[i1].vertexWeights[i3][i4], in, version ); }; }; @@ -10762,16 +10762,16 @@ void NiSkinPartition::InternalRead( istream& in, list<uint> & link_stack, unsign if ( version >= 0x0A010000 ) { if ( (skinPartitionBlocks[i1].hasVertexWeights != 0) ) { skinPartitionBlocks[i1].vertexWeights.resize(skinPartitionBlocks[i1].numVertices); - for (uint i4 = 0; i4 < skinPartitionBlocks[i1].vertexWeights.size(); i4++) { + for (unsigned int i4 = 0; i4 < skinPartitionBlocks[i1].vertexWeights.size(); i4++) { skinPartitionBlocks[i1].vertexWeights[i4].resize(skinPartitionBlocks[i1].numWeightsPerVertex); - for (uint i5 = 0; i5 < skinPartitionBlocks[i1].vertexWeights[i4].size(); i5++) { + for (unsigned int i5 = 0; i5 < skinPartitionBlocks[i1].vertexWeights[i4].size(); i5++) { NifStream( skinPartitionBlocks[i1].vertexWeights[i4][i5], in, version ); }; }; }; }; skinPartitionBlocks[i1].stripLengths.resize(skinPartitionBlocks[i1].numStrips); - for (uint i2 = 0; i2 < skinPartitionBlocks[i1].stripLengths.size(); i2++) { + for (unsigned int i2 = 0; i2 < skinPartitionBlocks[i1].stripLengths.size(); i2++) { NifStream( skinPartitionBlocks[i1].stripLengths[i2], in, version ); }; if ( version >= 0x0A010000 ) { @@ -10779,9 +10779,9 @@ void NiSkinPartition::InternalRead( istream& in, list<uint> & link_stack, unsign }; if ( version <= 0x0A000102 ) { skinPartitionBlocks[i1].strips.resize(skinPartitionBlocks[i1].numStrips); - for (uint i3 = 0; i3 < skinPartitionBlocks[i1].strips.size(); i3++) { + for (unsigned int i3 = 0; i3 < skinPartitionBlocks[i1].strips.size(); i3++) { skinPartitionBlocks[i1].strips[i3].resize(skinPartitionBlocks[i1].stripLengths[i3]); - for (uint i4 = 0; i4 < skinPartitionBlocks[i1].stripLengths[i3]; i4++) { + for (unsigned int i4 = 0; i4 < skinPartitionBlocks[i1].stripLengths[i3]; i4++) { NifStream( skinPartitionBlocks[i1].strips[i3][i4], in, version ); }; }; @@ -10789,9 +10789,9 @@ void NiSkinPartition::InternalRead( istream& in, list<uint> & link_stack, unsign if ( version >= 0x0A010000 ) { if ( (skinPartitionBlocks[i1].hasStrips != 0) ) { skinPartitionBlocks[i1].strips.resize(skinPartitionBlocks[i1].numStrips); - for (uint i4 = 0; i4 < skinPartitionBlocks[i1].strips.size(); i4++) { + for (unsigned int i4 = 0; i4 < skinPartitionBlocks[i1].strips.size(); i4++) { skinPartitionBlocks[i1].strips[i4].resize(skinPartitionBlocks[i1].stripLengths[i4]); - for (uint i5 = 0; i5 < skinPartitionBlocks[i1].stripLengths[i4]; i5++) { + for (unsigned int i5 = 0; i5 < skinPartitionBlocks[i1].stripLengths[i4]; i5++) { NifStream( skinPartitionBlocks[i1].strips[i4][i5], in, version ); }; }; @@ -10799,16 +10799,16 @@ void NiSkinPartition::InternalRead( istream& in, list<uint> & link_stack, unsign }; if ( (skinPartitionBlocks[i1].numStrips == 0) ) { skinPartitionBlocks[i1].triangles.resize(skinPartitionBlocks[i1].numTriangles); - for (uint i3 = 0; i3 < skinPartitionBlocks[i1].triangles.size(); i3++) { + for (unsigned int i3 = 0; i3 < skinPartitionBlocks[i1].triangles.size(); i3++) { NifStream( skinPartitionBlocks[i1].triangles[i3], in, version ); }; }; NifStream( skinPartitionBlocks[i1].hasBoneIndices, in, version ); if ( (skinPartitionBlocks[i1].hasBoneIndices != 0) ) { skinPartitionBlocks[i1].boneIndices.resize(skinPartitionBlocks[i1].numVertices); - for (uint i3 = 0; i3 < skinPartitionBlocks[i1].boneIndices.size(); i3++) { + for (unsigned int i3 = 0; i3 < skinPartitionBlocks[i1].boneIndices.size(); i3++) { skinPartitionBlocks[i1].boneIndices[i3].resize(skinPartitionBlocks[i1].numWeightsPerVertex); - for (uint i4 = 0; i4 < skinPartitionBlocks[i1].boneIndices[i3].size(); i4++) { + for (unsigned int i4 = 0; i4 < skinPartitionBlocks[i1].boneIndices[i3].size(); i4++) { NifStream( skinPartitionBlocks[i1].boneIndices[i3][i4], in, version ); }; }; @@ -10816,89 +10816,89 @@ void NiSkinPartition::InternalRead( istream& in, list<uint> & link_stack, unsign }; } -void NiSkinPartition::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiSkinPartition::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { NiObject::Write( out, link_map, version, user_version ); - numSkinPartitionBlocks = uint(skinPartitionBlocks.size()); + numSkinPartitionBlocks = unsigned int(skinPartitionBlocks.size()); NifStream( numSkinPartitionBlocks, out, version ); - for (uint i1 = 0; i1 < skinPartitionBlocks.size(); i1++) { - for (uint i2 = 0; i2 < skinPartitionBlocks[i1].strips.size(); i2++) - skinPartitionBlocks[i1].stripLengths[i2] = ushort(skinPartitionBlocks[i1].strips[i2].size()); - skinPartitionBlocks[i1].numWeightsPerVertex = ushort((skinPartitionBlocks[i1].vertexWeights.size() > 0) ? skinPartitionBlocks[i1].vertexWeights[0].size() : 0); - skinPartitionBlocks[i1].numStrips = ushort(skinPartitionBlocks[i1].stripLengths.size()); - skinPartitionBlocks[i1].numBones = ushort(skinPartitionBlocks[i1].bones.size()); - skinPartitionBlocks[i1].numTriangles = ushort(skinPartitionBlocks[i1].triangles.size()); - skinPartitionBlocks[i1].numVertices = ushort(skinPartitionBlocks[i1].vertexMap.size()); + for (unsigned int i1 = 0; i1 < skinPartitionBlocks.size(); i1++) { + for (unsigned int i2 = 0; i2 < skinPartitionBlocks[i1].strips.size(); i2++) + skinPartitionBlocks[i1].stripLengths[i2] = unsigned short(skinPartitionBlocks[i1].strips[i2].size()); + skinPartitionBlocks[i1].numWeightsPerVertex = unsigned short((skinPartitionBlocks[i1].vertexWeights.size() > 0) ? skinPartitionBlocks[i1].vertexWeights[0].size() : 0); + skinPartitionBlocks[i1].numStrips = unsigned short(skinPartitionBlocks[i1].stripLengths.size()); + skinPartitionBlocks[i1].numBones = unsigned short(skinPartitionBlocks[i1].bones.size()); + skinPartitionBlocks[i1].numTriangles = unsigned short(skinPartitionBlocks[i1].triangles.size()); + skinPartitionBlocks[i1].numVertices = unsigned short(skinPartitionBlocks[i1].vertexMap.size()); NifStream( skinPartitionBlocks[i1].numVertices, out, version ); NifStream( skinPartitionBlocks[i1].numTriangles, out, version ); NifStream( skinPartitionBlocks[i1].numBones, out, version ); NifStream( skinPartitionBlocks[i1].numStrips, out, version ); NifStream( skinPartitionBlocks[i1].numWeightsPerVertex, out, version ); - for (uint i2 = 0; i2 < skinPartitionBlocks[i1].bones.size(); i2++) { + for (unsigned int i2 = 0; i2 < skinPartitionBlocks[i1].bones.size(); i2++) { NifStream( skinPartitionBlocks[i1].bones[i2], out, version ); }; if ( version >= 0x0A010000 ) { NifStream( skinPartitionBlocks[i1].hasVertexMap, out, version ); }; if ( version <= 0x0A000102 ) { - for (uint i3 = 0; i3 < skinPartitionBlocks[i1].vertexMap.size(); i3++) { + for (unsigned int i3 = 0; i3 < skinPartitionBlocks[i1].vertexMap.size(); i3++) { NifStream( skinPartitionBlocks[i1].vertexMap[i3], out, version ); }; }; if ( version >= 0x0A010000 ) { if ( (skinPartitionBlocks[i1].hasVertexMap != 0) ) { - for (uint i4 = 0; i4 < skinPartitionBlocks[i1].vertexMap.size(); i4++) { + for (unsigned int i4 = 0; i4 < skinPartitionBlocks[i1].vertexMap.size(); i4++) { NifStream( skinPartitionBlocks[i1].vertexMap[i4], out, version ); }; }; NifStream( skinPartitionBlocks[i1].hasVertexWeights, out, version ); }; if ( version <= 0x0A000102 ) { - for (uint i3 = 0; i3 < skinPartitionBlocks[i1].vertexWeights.size(); i3++) { - for (uint i4 = 0; i4 < skinPartitionBlocks[i1].vertexWeights[i3].size(); i4++) { + for (unsigned int i3 = 0; i3 < skinPartitionBlocks[i1].vertexWeights.size(); i3++) { + for (unsigned int i4 = 0; i4 < skinPartitionBlocks[i1].vertexWeights[i3].size(); i4++) { NifStream( skinPartitionBlocks[i1].vertexWeights[i3][i4], out, version ); }; }; }; if ( version >= 0x0A010000 ) { if ( (skinPartitionBlocks[i1].hasVertexWeights != 0) ) { - for (uint i4 = 0; i4 < skinPartitionBlocks[i1].vertexWeights.size(); i4++) { - for (uint i5 = 0; i5 < skinPartitionBlocks[i1].vertexWeights[i4].size(); i5++) { + for (unsigned int i4 = 0; i4 < skinPartitionBlocks[i1].vertexWeights.size(); i4++) { + for (unsigned int i5 = 0; i5 < skinPartitionBlocks[i1].vertexWeights[i4].size(); i5++) { NifStream( skinPartitionBlocks[i1].vertexWeights[i4][i5], out, version ); }; }; }; }; - for (uint i2 = 0; i2 < skinPartitionBlocks[i1].stripLengths.size(); i2++) { + for (unsigned int i2 = 0; i2 < skinPartitionBlocks[i1].stripLengths.size(); i2++) { NifStream( skinPartitionBlocks[i1].stripLengths[i2], out, version ); }; if ( version >= 0x0A010000 ) { NifStream( skinPartitionBlocks[i1].hasStrips, out, version ); }; if ( version <= 0x0A000102 ) { - for (uint i3 = 0; i3 < skinPartitionBlocks[i1].strips.size(); i3++) { - for (uint i4 = 0; i4 < skinPartitionBlocks[i1].stripLengths[i3]; i4++) { + for (unsigned int i3 = 0; i3 < skinPartitionBlocks[i1].strips.size(); i3++) { + for (unsigned int i4 = 0; i4 < skinPartitionBlocks[i1].stripLengths[i3]; i4++) { NifStream( skinPartitionBlocks[i1].strips[i3][i4], out, version ); }; }; }; if ( version >= 0x0A010000 ) { if ( (skinPartitionBlocks[i1].hasStrips != 0) ) { - for (uint i4 = 0; i4 < skinPartitionBlocks[i1].strips.size(); i4++) { - for (uint i5 = 0; i5 < skinPartitionBlocks[i1].stripLengths[i4]; i5++) { + for (unsigned int i4 = 0; i4 < skinPartitionBlocks[i1].strips.size(); i4++) { + for (unsigned int i5 = 0; i5 < skinPartitionBlocks[i1].stripLengths[i4]; i5++) { NifStream( skinPartitionBlocks[i1].strips[i4][i5], out, version ); }; }; }; }; if ( (skinPartitionBlocks[i1].numStrips == 0) ) { - for (uint i3 = 0; i3 < skinPartitionBlocks[i1].triangles.size(); i3++) { + for (unsigned int i3 = 0; i3 < skinPartitionBlocks[i1].triangles.size(); i3++) { NifStream( skinPartitionBlocks[i1].triangles[i3], out, version ); }; }; NifStream( skinPartitionBlocks[i1].hasBoneIndices, out, version ); if ( (skinPartitionBlocks[i1].hasBoneIndices != 0) ) { - for (uint i3 = 0; i3 < skinPartitionBlocks[i1].boneIndices.size(); i3++) { - for (uint i4 = 0; i4 < skinPartitionBlocks[i1].boneIndices[i3].size(); i4++) { + for (unsigned int i3 = 0; i3 < skinPartitionBlocks[i1].boneIndices.size(); i3++) { + for (unsigned int i4 = 0; i4 < skinPartitionBlocks[i1].boneIndices[i3].size(); i4++) { NifStream( skinPartitionBlocks[i1].boneIndices[i3][i4], out, version ); }; }; @@ -10908,30 +10908,30 @@ void NiSkinPartition::InternalWrite( ostream& out, const map<NiObjectRef,uint> & std::string NiSkinPartition::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << NiObject::asString(); - numSkinPartitionBlocks = uint(skinPartitionBlocks.size()); + numSkinPartitionBlocks = unsigned int(skinPartitionBlocks.size()); out << " Num Skin Partition Blocks: " << numSkinPartitionBlocks << endl; array_output_count = 0; - for (uint i1 = 0; i1 < skinPartitionBlocks.size(); i1++) { + for (unsigned int i1 = 0; i1 < skinPartitionBlocks.size(); i1++) { if ( !verbose && ( array_output_count > MAXARRAYDUMP ) ) { out << "<Data Truncated. Use verbose mode to see complete listing.>" << endl; break; }; - for (uint i2 = 0; i2 < skinPartitionBlocks[i1].strips.size(); i2++) - skinPartitionBlocks[i1].stripLengths[i2] = ushort(skinPartitionBlocks[i1].strips[i2].size()); - skinPartitionBlocks[i1].numWeightsPerVertex = ushort((skinPartitionBlocks[i1].vertexWeights.size() > 0) ? skinPartitionBlocks[i1].vertexWeights[0].size() : 0); - skinPartitionBlocks[i1].numStrips = ushort(skinPartitionBlocks[i1].stripLengths.size()); - skinPartitionBlocks[i1].numBones = ushort(skinPartitionBlocks[i1].bones.size()); - skinPartitionBlocks[i1].numTriangles = ushort(skinPartitionBlocks[i1].triangles.size()); - skinPartitionBlocks[i1].numVertices = ushort(skinPartitionBlocks[i1].vertexMap.size()); + for (unsigned int i2 = 0; i2 < skinPartitionBlocks[i1].strips.size(); i2++) + skinPartitionBlocks[i1].stripLengths[i2] = unsigned short(skinPartitionBlocks[i1].strips[i2].size()); + skinPartitionBlocks[i1].numWeightsPerVertex = unsigned short((skinPartitionBlocks[i1].vertexWeights.size() > 0) ? skinPartitionBlocks[i1].vertexWeights[0].size() : 0); + skinPartitionBlocks[i1].numStrips = unsigned short(skinPartitionBlocks[i1].stripLengths.size()); + skinPartitionBlocks[i1].numBones = unsigned short(skinPartitionBlocks[i1].bones.size()); + skinPartitionBlocks[i1].numTriangles = unsigned short(skinPartitionBlocks[i1].triangles.size()); + skinPartitionBlocks[i1].numVertices = unsigned short(skinPartitionBlocks[i1].vertexMap.size()); out << " Num Vertices: " << skinPartitionBlocks[i1].numVertices << endl; out << " Num Triangles: " << skinPartitionBlocks[i1].numTriangles << endl; out << " Num Bones: " << skinPartitionBlocks[i1].numBones << endl; out << " Num Strips: " << skinPartitionBlocks[i1].numStrips << endl; out << " Num Weights Per Vertex: " << skinPartitionBlocks[i1].numWeightsPerVertex << endl; array_output_count = 0; - for (uint i2 = 0; i2 < skinPartitionBlocks[i1].bones.size(); i2++) { + for (unsigned int i2 = 0; i2 < skinPartitionBlocks[i1].bones.size(); i2++) { if ( !verbose && ( array_output_count > MAXARRAYDUMP ) ) { out << "<Data Truncated. Use verbose mode to see complete listing.>" << endl; break; @@ -10944,7 +10944,7 @@ std::string NiSkinPartition::InternalAsString( bool verbose ) const { }; out << " Has Vertex Map: " << skinPartitionBlocks[i1].hasVertexMap << endl; array_output_count = 0; - for (uint i2 = 0; i2 < skinPartitionBlocks[i1].vertexMap.size(); i2++) { + for (unsigned int i2 = 0; i2 < skinPartitionBlocks[i1].vertexMap.size(); i2++) { if ( !verbose && ( array_output_count > MAXARRAYDUMP ) ) { out << "<Data Truncated. Use verbose mode to see complete listing.>" << endl; break; @@ -10957,12 +10957,12 @@ std::string NiSkinPartition::InternalAsString( bool verbose ) const { }; out << " Has Vertex Weights: " << skinPartitionBlocks[i1].hasVertexWeights << endl; array_output_count = 0; - for (uint i2 = 0; i2 < skinPartitionBlocks[i1].vertexWeights.size(); i2++) { + for (unsigned int i2 = 0; i2 < skinPartitionBlocks[i1].vertexWeights.size(); i2++) { if ( !verbose && ( array_output_count > MAXARRAYDUMP ) ) { out << "<Data Truncated. Use verbose mode to see complete listing.>" << endl; break; }; - for (uint i3 = 0; i3 < skinPartitionBlocks[i1].vertexWeights[i2].size(); i3++) { + for (unsigned int i3 = 0; i3 < skinPartitionBlocks[i1].vertexWeights[i2].size(); i3++) { if ( !verbose && ( array_output_count > MAXARRAYDUMP ) ) { break; }; @@ -10971,7 +10971,7 @@ std::string NiSkinPartition::InternalAsString( bool verbose ) const { }; }; array_output_count = 0; - for (uint i2 = 0; i2 < skinPartitionBlocks[i1].stripLengths.size(); i2++) { + for (unsigned int i2 = 0; i2 < skinPartitionBlocks[i1].stripLengths.size(); i2++) { if ( !verbose && ( array_output_count > MAXARRAYDUMP ) ) { out << "<Data Truncated. Use verbose mode to see complete listing.>" << endl; break; @@ -10984,12 +10984,12 @@ std::string NiSkinPartition::InternalAsString( bool verbose ) const { }; out << " Has Strips: " << skinPartitionBlocks[i1].hasStrips << endl; array_output_count = 0; - for (uint i2 = 0; i2 < skinPartitionBlocks[i1].strips.size(); i2++) { + for (unsigned int i2 = 0; i2 < skinPartitionBlocks[i1].strips.size(); i2++) { if ( !verbose && ( array_output_count > MAXARRAYDUMP ) ) { out << "<Data Truncated. Use verbose mode to see complete listing.>" << endl; break; }; - for (uint i3 = 0; i3 < skinPartitionBlocks[i1].stripLengths[i2]; i3++) { + for (unsigned int i3 = 0; i3 < skinPartitionBlocks[i1].stripLengths[i2]; i3++) { if ( !verbose && ( array_output_count > MAXARRAYDUMP ) ) { break; }; @@ -10999,7 +10999,7 @@ std::string NiSkinPartition::InternalAsString( bool verbose ) const { }; if ( (skinPartitionBlocks[i1].numStrips == 0) ) { array_output_count = 0; - for (uint i3 = 0; i3 < skinPartitionBlocks[i1].triangles.size(); i3++) { + for (unsigned int i3 = 0; i3 < skinPartitionBlocks[i1].triangles.size(); i3++) { if ( !verbose && ( array_output_count > MAXARRAYDUMP ) ) { out << "<Data Truncated. Use verbose mode to see complete listing.>" << endl; break; @@ -11014,12 +11014,12 @@ std::string NiSkinPartition::InternalAsString( bool verbose ) const { out << " Has Bone Indices: " << skinPartitionBlocks[i1].hasBoneIndices << endl; if ( (skinPartitionBlocks[i1].hasBoneIndices != 0) ) { array_output_count = 0; - for (uint i3 = 0; i3 < skinPartitionBlocks[i1].boneIndices.size(); i3++) { + for (unsigned int i3 = 0; i3 < skinPartitionBlocks[i1].boneIndices.size(); i3++) { if ( !verbose && ( array_output_count > MAXARRAYDUMP ) ) { out << "<Data Truncated. Use verbose mode to see complete listing.>" << endl; break; }; - for (uint i4 = 0; i4 < skinPartitionBlocks[i1].boneIndices[i3].size(); i4++) { + for (unsigned int i4 = 0; i4 < skinPartitionBlocks[i1].boneIndices[i3].size(); i4++) { if ( !verbose && ( array_output_count > MAXARRAYDUMP ) ) { break; }; @@ -11032,7 +11032,7 @@ std::string NiSkinPartition::InternalAsString( bool verbose ) const { return out.str(); } -void NiSkinPartition::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiSkinPartition::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiObject::FixLinks( objects, link_stack, version, user_version ); } @@ -11042,8 +11042,8 @@ std::list<NiObjectRef> NiSkinPartition::InternalGetRefs() const { return refs; } -void NiSourceTexture::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { - uint block_num; +void NiSourceTexture::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { + unsigned int block_num; NiObjectNET::Read( in, link_stack, version, user_version ); NifStream( useExternal, in, version ); if ( (useExternal == 1) ) { @@ -11078,7 +11078,7 @@ void NiSourceTexture::InternalRead( istream& in, list<uint> & link_stack, unsign }; } -void NiSourceTexture::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiSourceTexture::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { NiObjectNET::Write( out, link_map, version, user_version ); NifStream( useExternal, out, version ); if ( (useExternal == 1) ) { @@ -11119,7 +11119,7 @@ void NiSourceTexture::InternalWrite( ostream& out, const map<NiObjectRef,uint> & std::string NiSourceTexture::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << NiObjectNET::asString(); out << " Use External: " << useExternal << endl; if ( (useExternal == 1) ) { @@ -11138,7 +11138,7 @@ std::string NiSourceTexture::InternalAsString( bool verbose ) const { return out.str(); } -void NiSourceTexture::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiSourceTexture::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiObjectNET::FixLinks( objects, link_stack, version, user_version ); if ( version >= 0x0A010000 ) { if ( (useExternal == 1) ) { @@ -11160,25 +11160,25 @@ std::list<NiObjectRef> NiSourceTexture::InternalGetRefs() const { return refs; } -void NiSpecularProperty::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiSpecularProperty::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiProperty::Read( in, link_stack, version, user_version ); NifStream( flags, in, version ); } -void NiSpecularProperty::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiSpecularProperty::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { NiProperty::Write( out, link_map, version, user_version ); NifStream( flags, out, version ); } std::string NiSpecularProperty::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << NiProperty::asString(); out << " Flags: " << flags << endl; return out.str(); } -void NiSpecularProperty::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiSpecularProperty::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiProperty::FixLinks( objects, link_stack, version, user_version ); } @@ -11188,7 +11188,7 @@ std::list<NiObjectRef> NiSpecularProperty::InternalGetRefs() const { return refs; } -void NiSphericalCollider::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiSphericalCollider::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { AParticleModifier::Read( in, link_stack, version, user_version ); NifStream( unknownFloat1, in, version ); NifStream( unknownShort1, in, version ); @@ -11203,7 +11203,7 @@ void NiSphericalCollider::InternalRead( istream& in, list<uint> & link_stack, un NifStream( unknownFloat5, in, version ); } -void NiSphericalCollider::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiSphericalCollider::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { AParticleModifier::Write( out, link_map, version, user_version ); NifStream( unknownFloat1, out, version ); NifStream( unknownShort1, out, version ); @@ -11220,7 +11220,7 @@ void NiSphericalCollider::InternalWrite( ostream& out, const map<NiObjectRef,uin std::string NiSphericalCollider::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << AParticleModifier::asString(); out << " Unknown Float 1: " << unknownFloat1 << endl; out << " Unknown Short 1: " << unknownShort1 << endl; @@ -11232,7 +11232,7 @@ std::string NiSphericalCollider::InternalAsString( bool verbose ) const { return out.str(); } -void NiSphericalCollider::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiSphericalCollider::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { AParticleModifier::FixLinks( objects, link_stack, version, user_version ); } @@ -11242,13 +11242,13 @@ std::list<NiObjectRef> NiSphericalCollider::InternalGetRefs() const { return refs; } -void NiSpotLight::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiSpotLight::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiPointLight::Read( in, link_stack, version, user_version ); NifStream( cutoffAngle, in, version ); NifStream( exponent, in, version ); } -void NiSpotLight::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiSpotLight::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { NiPointLight::Write( out, link_map, version, user_version ); NifStream( cutoffAngle, out, version ); NifStream( exponent, out, version ); @@ -11256,14 +11256,14 @@ void NiSpotLight::InternalWrite( ostream& out, const map<NiObjectRef,uint> & lin std::string NiSpotLight::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << NiPointLight::asString(); out << " Cutoff Angle: " << cutoffAngle << endl; out << " Exponent: " << exponent << endl; return out.str(); } -void NiSpotLight::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiSpotLight::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiPointLight::FixLinks( objects, link_stack, version, user_version ); } @@ -11273,7 +11273,7 @@ std::list<NiObjectRef> NiSpotLight::InternalGetRefs() const { return refs; } -void NiStencilProperty::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiStencilProperty::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiProperty::Read( in, link_stack, version, user_version ); if ( version <= 0x0A000102 ) { NifStream( flags, in, version ); @@ -11288,7 +11288,7 @@ void NiStencilProperty::InternalRead( istream& in, list<uint> & link_stack, unsi NifStream( drawMode, in, version ); } -void NiStencilProperty::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiStencilProperty::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { NiProperty::Write( out, link_map, version, user_version ); if ( version <= 0x0A000102 ) { NifStream( flags, out, version ); @@ -11305,7 +11305,7 @@ void NiStencilProperty::InternalWrite( ostream& out, const map<NiObjectRef,uint> std::string NiStencilProperty::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << NiProperty::asString(); out << " Flags: " << flags << endl; out << " Stencil Enabled: " << stencilEnabled << endl; @@ -11319,7 +11319,7 @@ std::string NiStencilProperty::InternalAsString( bool verbose ) const { return out.str(); } -void NiStencilProperty::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiStencilProperty::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiProperty::FixLinks( objects, link_stack, version, user_version ); } @@ -11329,7 +11329,7 @@ std::list<NiObjectRef> NiStencilProperty::InternalGetRefs() const { return refs; } -void NiStringExtraData::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiStringExtraData::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiExtraData::Read( in, link_stack, version, user_version ); if ( version <= 0x04020200 ) { NifStream( bytesRemaining, in, version ); @@ -11337,7 +11337,7 @@ void NiStringExtraData::InternalRead( istream& in, list<uint> & link_stack, unsi NifStream( stringData, in, version ); } -void NiStringExtraData::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiStringExtraData::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { NiExtraData::Write( out, link_map, version, user_version ); if ( version <= 0x04020200 ) { NifStream( bytesRemaining, out, version ); @@ -11347,14 +11347,14 @@ void NiStringExtraData::InternalWrite( ostream& out, const map<NiObjectRef,uint> std::string NiStringExtraData::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << NiExtraData::asString(); out << " Bytes Remaining: " << bytesRemaining << endl; out << " String Data: " << stringData << endl; return out.str(); } -void NiStringExtraData::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiStringExtraData::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiExtraData::FixLinks( objects, link_stack, version, user_version ); } @@ -11364,13 +11364,13 @@ std::list<NiObjectRef> NiStringExtraData::InternalGetRefs() const { return refs; } -void NiStringPalette::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiStringPalette::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiObject::Read( in, link_stack, version, user_version ); NifStream( palette.palette, in, version ); NifStream( palette.length, in, version ); } -void NiStringPalette::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiStringPalette::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { NiObject::Write( out, link_map, version, user_version ); NifStream( palette.palette, out, version ); NifStream( palette.length, out, version ); @@ -11378,14 +11378,14 @@ void NiStringPalette::InternalWrite( ostream& out, const map<NiObjectRef,uint> & std::string NiStringPalette::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << NiObject::asString(); out << " Palette: " << palette.palette << endl; out << " Length: " << palette.length << endl; return out.str(); } -void NiStringPalette::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiStringPalette::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiObject::FixLinks( objects, link_stack, version, user_version ); } @@ -11395,32 +11395,32 @@ std::list<NiObjectRef> NiStringPalette::InternalGetRefs() const { return refs; } -void NiStringsExtraData::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiStringsExtraData::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiExtraData::Read( in, link_stack, version, user_version ); NifStream( numStrings, in, version ); data.resize(numStrings); - for (uint i1 = 0; i1 < data.size(); i1++) { + for (unsigned int i1 = 0; i1 < data.size(); i1++) { NifStream( data[i1], in, version ); }; } -void NiStringsExtraData::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiStringsExtraData::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { NiExtraData::Write( out, link_map, version, user_version ); - numStrings = uint(data.size()); + numStrings = unsigned int(data.size()); NifStream( numStrings, out, version ); - for (uint i1 = 0; i1 < data.size(); i1++) { + for (unsigned int i1 = 0; i1 < data.size(); i1++) { NifStream( data[i1], out, version ); }; } std::string NiStringsExtraData::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << NiExtraData::asString(); - numStrings = uint(data.size()); + numStrings = unsigned int(data.size()); out << " Num Strings: " << numStrings << endl; array_output_count = 0; - for (uint i1 = 0; i1 < data.size(); i1++) { + for (unsigned int i1 = 0; i1 < data.size(); i1++) { if ( !verbose && ( array_output_count > MAXARRAYDUMP ) ) { out << "<Data Truncated. Use verbose mode to see complete listing.>" << endl; break; @@ -11434,7 +11434,7 @@ std::string NiStringsExtraData::InternalAsString( bool verbose ) const { return out.str(); } -void NiStringsExtraData::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiStringsExtraData::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiExtraData::FixLinks( objects, link_stack, version, user_version ); } @@ -11444,39 +11444,39 @@ std::list<NiObjectRef> NiStringsExtraData::InternalGetRefs() const { return refs; } -void NiTextKeyExtraData::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiTextKeyExtraData::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiExtraData::Read( in, link_stack, version, user_version ); if ( version <= 0x04020200 ) { NifStream( unknownInt1, in, version ); }; NifStream( numTextKeys, in, version ); textKeys.resize(numTextKeys); - for (uint i1 = 0; i1 < textKeys.size(); i1++) { + for (unsigned int i1 = 0; i1 < textKeys.size(); i1++) { NifStream( textKeys[i1], in, version, 1 ); }; } -void NiTextKeyExtraData::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiTextKeyExtraData::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { NiExtraData::Write( out, link_map, version, user_version ); - numTextKeys = uint(textKeys.size()); + numTextKeys = unsigned int(textKeys.size()); if ( version <= 0x04020200 ) { NifStream( unknownInt1, out, version ); }; NifStream( numTextKeys, out, version ); - for (uint i1 = 0; i1 < textKeys.size(); i1++) { + for (unsigned int i1 = 0; i1 < textKeys.size(); i1++) { NifStream( textKeys[i1], out, version, 1 ); }; } std::string NiTextKeyExtraData::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << NiExtraData::asString(); - numTextKeys = uint(textKeys.size()); + numTextKeys = unsigned int(textKeys.size()); out << " Unknown Int 1: " << unknownInt1 << endl; out << " Num Text Keys: " << numTextKeys << endl; array_output_count = 0; - for (uint i1 = 0; i1 < textKeys.size(); i1++) { + for (unsigned int i1 = 0; i1 < textKeys.size(); i1++) { if ( !verbose && ( array_output_count > MAXARRAYDUMP ) ) { out << "<Data Truncated. Use verbose mode to see complete listing.>" << endl; break; @@ -11490,7 +11490,7 @@ std::string NiTextKeyExtraData::InternalAsString( bool verbose ) const { return out.str(); } -void NiTextKeyExtraData::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiTextKeyExtraData::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiExtraData::FixLinks( objects, link_stack, version, user_version ); } @@ -11500,8 +11500,8 @@ std::list<NiObjectRef> NiTextKeyExtraData::InternalGetRefs() const { return refs; } -void NiTextureEffect::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { - uint block_num; +void NiTextureEffect::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { + unsigned int block_num; NiDynamicEffect::Read( in, link_stack, version, user_version ); NifStream( modelProjectionMatrix, in, version ); NifStream( modelProjectionTransform, in, version ); @@ -11523,7 +11523,7 @@ void NiTextureEffect::InternalRead( istream& in, list<uint> & link_stack, unsign }; } -void NiTextureEffect::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiTextureEffect::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { NiDynamicEffect::Write( out, link_map, version, user_version ); NifStream( modelProjectionMatrix, out, version ); NifStream( modelProjectionTransform, out, version ); @@ -11549,7 +11549,7 @@ void NiTextureEffect::InternalWrite( ostream& out, const map<NiObjectRef,uint> & std::string NiTextureEffect::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << NiDynamicEffect::asString(); out << " Model Projection Matrix: " << modelProjectionMatrix << endl; out << " Model Projection Transform: " << modelProjectionTransform << endl; @@ -11567,7 +11567,7 @@ std::string NiTextureEffect::InternalAsString( bool verbose ) const { return out.str(); } -void NiTextureEffect::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiTextureEffect::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiDynamicEffect::FixLinks( objects, link_stack, version, user_version ); sourceTexture = FixLink<NiSourceTexture>( objects, link_stack, version ); } @@ -11580,8 +11580,8 @@ std::list<NiObjectRef> NiTextureEffect::InternalGetRefs() const { return refs; } -void NiTextureTransformController::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { - uint block_num; +void NiTextureTransformController::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { + unsigned int block_num; NiSingleInterpolatorController::Read( in, link_stack, version, user_version ); NifStream( unknown2, in, version ); NifStream( textureSlot, in, version ); @@ -11592,7 +11592,7 @@ void NiTextureTransformController::InternalRead( istream& in, list<uint> & link_ }; } -void NiTextureTransformController::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiTextureTransformController::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { NiSingleInterpolatorController::Write( out, link_map, version, user_version ); NifStream( unknown2, out, version ); NifStream( textureSlot, out, version ); @@ -11607,7 +11607,7 @@ void NiTextureTransformController::InternalWrite( ostream& out, const map<NiObje std::string NiTextureTransformController::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << NiSingleInterpolatorController::asString(); out << " Unknown2: " << unknown2 << endl; out << " Texture Slot: " << textureSlot << endl; @@ -11616,7 +11616,7 @@ std::string NiTextureTransformController::InternalAsString( bool verbose ) const return out.str(); } -void NiTextureTransformController::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiTextureTransformController::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiSingleInterpolatorController::FixLinks( objects, link_stack, version, user_version ); if ( version <= 0x0A010000 ) { data = FixLink<NiFloatData>( objects, link_stack, version ); @@ -11631,26 +11631,26 @@ std::list<NiObjectRef> NiTextureTransformController::InternalGetRefs() const { return refs; } -void NiTextureModeProperty::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiTextureModeProperty::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiProperty::Read( in, link_stack, version, user_version ); - for (uint i1 = 0; i1 < 3; i1++) { + for (unsigned int i1 = 0; i1 < 3; i1++) { NifStream( unknown3Shorts[i1], in, version ); }; } -void NiTextureModeProperty::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiTextureModeProperty::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { NiProperty::Write( out, link_map, version, user_version ); - for (uint i1 = 0; i1 < 3; i1++) { + for (unsigned int i1 = 0; i1 < 3; i1++) { NifStream( unknown3Shorts[i1], out, version ); }; } std::string NiTextureModeProperty::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << NiProperty::asString(); array_output_count = 0; - for (uint i1 = 0; i1 < 3; i1++) { + for (unsigned int i1 = 0; i1 < 3; i1++) { if ( !verbose && ( array_output_count > MAXARRAYDUMP ) ) { out << "<Data Truncated. Use verbose mode to see complete listing.>" << endl; break; @@ -11664,7 +11664,7 @@ std::string NiTextureModeProperty::InternalAsString( bool verbose ) const { return out.str(); } -void NiTextureModeProperty::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiTextureModeProperty::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiProperty::FixLinks( objects, link_stack, version, user_version ); } @@ -11674,32 +11674,32 @@ std::list<NiObjectRef> NiTextureModeProperty::InternalGetRefs() const { return refs; } -void NiImage::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiImage::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiObject::Read( in, link_stack, version, user_version ); NifStream( external_, in, version ); NifStream( file, in, version ); - for (uint i1 = 0; i1 < 4; i1++) { + for (unsigned int i1 = 0; i1 < 4; i1++) { NifStream( unknown4Shorts[i1], in, version ); }; } -void NiImage::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiImage::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { NiObject::Write( out, link_map, version, user_version ); NifStream( external_, out, version ); NifStream( file, out, version ); - for (uint i1 = 0; i1 < 4; i1++) { + for (unsigned int i1 = 0; i1 < 4; i1++) { NifStream( unknown4Shorts[i1], out, version ); }; } std::string NiImage::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << NiObject::asString(); out << " External ?: " << external_ << endl; out << " File: " << file << endl; array_output_count = 0; - for (uint i1 = 0; i1 < 4; i1++) { + for (unsigned int i1 = 0; i1 < 4; i1++) { if ( !verbose && ( array_output_count > MAXARRAYDUMP ) ) { out << "<Data Truncated. Use verbose mode to see complete listing.>" << endl; break; @@ -11713,7 +11713,7 @@ std::string NiImage::InternalAsString( bool verbose ) const { return out.str(); } -void NiImage::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiImage::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiObject::FixLinks( objects, link_stack, version, user_version ); } @@ -11723,15 +11723,15 @@ std::list<NiObjectRef> NiImage::InternalGetRefs() const { return refs; } -void NiTextureProperty::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { - uint block_num; +void NiTextureProperty::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { + unsigned int block_num; NiProperty::Read( in, link_stack, version, user_version ); NifStream( flags, in, version ); NifStream( block_num, in, version ); link_stack.push_back( block_num ); } -void NiTextureProperty::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiTextureProperty::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { NiProperty::Write( out, link_map, version, user_version ); NifStream( flags, out, version ); if ( image != NULL ) @@ -11742,14 +11742,14 @@ void NiTextureProperty::InternalWrite( ostream& out, const map<NiObjectRef,uint> std::string NiTextureProperty::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << NiProperty::asString(); out << " Flags: " << flags << endl; out << " Image: " << image << endl; return out.str(); } -void NiTextureProperty::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiTextureProperty::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiProperty::FixLinks( objects, link_stack, version, user_version ); image = FixLink<NiImage>( objects, link_stack, version ); } @@ -11762,8 +11762,8 @@ std::list<NiObjectRef> NiTextureProperty::InternalGetRefs() const { return refs; } -void NiTexturingProperty::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { - uint block_num; +void NiTexturingProperty::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { + unsigned int block_num; NiProperty::Read( in, link_stack, version, user_version ); if ( version <= 0x0A000102 ) { NifStream( flags, in, version ); @@ -12032,7 +12032,7 @@ void NiTexturingProperty::InternalRead( istream& in, list<uint> & link_stack, un if ( version >= 0x0A000100 ) { NifStream( numShaderTextures, in, version ); shaderTextures.resize(numShaderTextures); - for (uint i2 = 0; i2 < shaderTextures.size(); i2++) { + for (unsigned int i2 = 0; i2 < shaderTextures.size(); i2++) { NifStream( shaderTextures[i2].isUsed, in, version ); if ( (shaderTextures[i2].isUsed != 0) ) { NifStream( block_num, in, version ); @@ -12063,9 +12063,9 @@ void NiTexturingProperty::InternalRead( istream& in, list<uint> & link_stack, un }; } -void NiTexturingProperty::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiTexturingProperty::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { NiProperty::Write( out, link_map, version, user_version ); - numShaderTextures = uint(shaderTextures.size()); + numShaderTextures = unsigned int(shaderTextures.size()); if ( version <= 0x0A000102 ) { NifStream( flags, out, version ); }; @@ -12352,7 +12352,7 @@ void NiTexturingProperty::InternalWrite( ostream& out, const map<NiObjectRef,uin }; if ( version >= 0x0A000100 ) { NifStream( numShaderTextures, out, version ); - for (uint i2 = 0; i2 < shaderTextures.size(); i2++) { + for (unsigned int i2 = 0; i2 < shaderTextures.size(); i2++) { NifStream( shaderTextures[i2].isUsed, out, version ); if ( (shaderTextures[i2].isUsed != 0) ) { if ( shaderTextures[i2].textureData.source != NULL ) @@ -12387,9 +12387,9 @@ void NiTexturingProperty::InternalWrite( ostream& out, const map<NiObjectRef,uin std::string NiTexturingProperty::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << NiProperty::asString(); - numShaderTextures = uint(shaderTextures.size()); + numShaderTextures = unsigned int(shaderTextures.size()); out << " Flags: " << flags << endl; out << " Apply Mode: " << applyMode << endl; out << " Texture Count: " << textureCount << endl; @@ -12584,7 +12584,7 @@ std::string NiTexturingProperty::InternalAsString( bool verbose ) const { }; out << " Num Shader Textures: " << numShaderTextures << endl; array_output_count = 0; - for (uint i1 = 0; i1 < shaderTextures.size(); i1++) { + for (unsigned int i1 = 0; i1 < shaderTextures.size(); i1++) { if ( !verbose && ( array_output_count > MAXARRAYDUMP ) ) { out << "<Data Truncated. Use verbose mode to see complete listing.>" << endl; break; @@ -12612,7 +12612,7 @@ std::string NiTexturingProperty::InternalAsString( bool verbose ) const { return out.str(); } -void NiTexturingProperty::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiTexturingProperty::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiProperty::FixLinks( objects, link_stack, version, user_version ); if ( (hasBaseTexture != 0) ) { baseTexture.source = FixLink<NiSourceTexture>( objects, link_stack, version ); @@ -12645,7 +12645,7 @@ void NiTexturingProperty::InternalFixLinks( const map<unsigned int,NiObjectRef> decal3Texture.source = FixLink<NiSourceTexture>( objects, link_stack, version ); }; if ( version >= 0x0A000100 ) { - for (uint i2 = 0; i2 < shaderTextures.size(); i2++) { + for (unsigned int i2 = 0; i2 < shaderTextures.size(); i2++) { if ( (shaderTextures[i2].isUsed != 0) ) { shaderTextures[i2].textureData.source = FixLink<NiSourceTexture>( objects, link_stack, version ); }; @@ -12676,29 +12676,29 @@ std::list<NiObjectRef> NiTexturingProperty::InternalGetRefs() const { refs.push_back(StaticCast<NiObject>(decal2Texture.source)); if ( decal3Texture.source != NULL ) refs.push_back(StaticCast<NiObject>(decal3Texture.source)); - for (uint i1 = 0; i1 < shaderTextures.size(); i1++) { + for (unsigned int i1 = 0; i1 < shaderTextures.size(); i1++) { if ( shaderTextures[i1].textureData.source != NULL ) refs.push_back(StaticCast<NiObject>(shaderTextures[i1].textureData.source)); }; return refs; } -void NiTransformController::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiTransformController::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiSingleInterpolatorController::Read( in, link_stack, version, user_version ); } -void NiTransformController::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiTransformController::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { NiSingleInterpolatorController::Write( out, link_map, version, user_version ); } std::string NiTransformController::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << NiSingleInterpolatorController::asString(); return out.str(); } -void NiTransformController::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiTransformController::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiSingleInterpolatorController::FixLinks( objects, link_stack, version, user_version ); } @@ -12708,22 +12708,22 @@ std::list<NiObjectRef> NiTransformController::InternalGetRefs() const { return refs; } -void NiTransformData::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiTransformData::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiKeyframeData::Read( in, link_stack, version, user_version ); } -void NiTransformData::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiTransformData::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { NiKeyframeData::Write( out, link_map, version, user_version ); } std::string NiTransformData::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << NiKeyframeData::asString(); return out.str(); } -void NiTransformData::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiTransformData::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiKeyframeData::FixLinks( objects, link_stack, version, user_version ); } @@ -12733,14 +12733,14 @@ std::list<NiObjectRef> NiTransformData::InternalGetRefs() const { return refs; } -void NiTransformInterpolator::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { - uint block_num; +void NiTransformInterpolator::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { + unsigned int block_num; NiInterpolator::Read( in, link_stack, version, user_version ); NifStream( translation, in, version ); NifStream( rotation, in, version ); NifStream( scale, in, version ); if ( ( version >= 0x0A01006A ) && ( version <= 0x0A01006A ) ) { - for (uint i2 = 0; i2 < 3; i2++) { + for (unsigned int i2 = 0; i2 < 3; i2++) { NifStream( unknownBytes[i2], in, version ); }; }; @@ -12748,13 +12748,13 @@ void NiTransformInterpolator::InternalRead( istream& in, list<uint> & link_stack link_stack.push_back( block_num ); } -void NiTransformInterpolator::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiTransformInterpolator::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { NiInterpolator::Write( out, link_map, version, user_version ); NifStream( translation, out, version ); NifStream( rotation, out, version ); NifStream( scale, out, version ); if ( ( version >= 0x0A01006A ) && ( version <= 0x0A01006A ) ) { - for (uint i2 = 0; i2 < 3; i2++) { + for (unsigned int i2 = 0; i2 < 3; i2++) { NifStream( unknownBytes[i2], out, version ); }; }; @@ -12766,13 +12766,13 @@ void NiTransformInterpolator::InternalWrite( ostream& out, const map<NiObjectRef std::string NiTransformInterpolator::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << NiInterpolator::asString(); out << " Translation: " << translation << endl; out << " Rotation: " << rotation << endl; out << " Scale: " << scale << endl; array_output_count = 0; - for (uint i1 = 0; i1 < 3; i1++) { + for (unsigned int i1 = 0; i1 < 3; i1++) { if ( !verbose && ( array_output_count > MAXARRAYDUMP ) ) { out << "<Data Truncated. Use verbose mode to see complete listing.>" << endl; break; @@ -12787,7 +12787,7 @@ std::string NiTransformInterpolator::InternalAsString( bool verbose ) const { return out.str(); } -void NiTransformInterpolator::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiTransformInterpolator::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiInterpolator::FixLinks( objects, link_stack, version, user_version ); data = FixLink<NiTransformData>( objects, link_stack, version ); } @@ -12800,22 +12800,22 @@ std::list<NiObjectRef> NiTransformInterpolator::InternalGetRefs() const { return refs; } -void NiTriShape::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiTriShape::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiTriBasedGeom::Read( in, link_stack, version, user_version ); } -void NiTriShape::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiTriShape::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { NiTriBasedGeom::Write( out, link_map, version, user_version ); } std::string NiTriShape::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << NiTriBasedGeom::asString(); return out.str(); } -void NiTriShape::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiTriShape::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiTriBasedGeom::FixLinks( objects, link_stack, version, user_version ); } @@ -12825,7 +12825,7 @@ std::list<NiObjectRef> NiTriShape::InternalGetRefs() const { return refs; } -void NiTriShapeData::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiTriShapeData::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiTriBasedGeomData::Read( in, link_stack, version, user_version ); NifStream( numTrianglePoints, in, version ); if ( version >= 0x0A010000 ) { @@ -12833,53 +12833,53 @@ void NiTriShapeData::InternalRead( istream& in, list<uint> & link_stack, unsigne }; if ( version <= 0x0A000102 ) { triangles.resize(numTriangles); - for (uint i2 = 0; i2 < triangles.size(); i2++) { + for (unsigned int i2 = 0; i2 < triangles.size(); i2++) { NifStream( triangles[i2], in, version ); }; }; if ( version >= 0x0A010000 ) { if ( (hasTriangles != 0) ) { triangles.resize(numTriangles); - for (uint i3 = 0; i3 < triangles.size(); i3++) { + for (unsigned int i3 = 0; i3 < triangles.size(); i3++) { NifStream( triangles[i3], in, version ); }; }; }; NifStream( numMatchGroups, in, version ); matchGroups.resize(numMatchGroups); - for (uint i1 = 0; i1 < matchGroups.size(); i1++) { + for (unsigned int i1 = 0; i1 < matchGroups.size(); i1++) { NifStream( matchGroups[i1].numVertices, in, version ); matchGroups[i1].vertexIndices.resize(matchGroups[i1].numVertices); - for (uint i2 = 0; i2 < matchGroups[i1].vertexIndices.size(); i2++) { + for (unsigned int i2 = 0; i2 < matchGroups[i1].vertexIndices.size(); i2++) { NifStream( matchGroups[i1].vertexIndices[i2], in, version ); }; }; } -void NiTriShapeData::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiTriShapeData::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { NiTriBasedGeomData::Write( out, link_map, version, user_version ); - numMatchGroups = ushort(matchGroups.size()); + numMatchGroups = unsigned short(matchGroups.size()); NifStream( numTrianglePoints, out, version ); if ( version >= 0x0A010000 ) { NifStream( hasTriangles, out, version ); }; if ( version <= 0x0A000102 ) { - for (uint i2 = 0; i2 < triangles.size(); i2++) { + for (unsigned int i2 = 0; i2 < triangles.size(); i2++) { NifStream( triangles[i2], out, version ); }; }; if ( version >= 0x0A010000 ) { if ( (hasTriangles != 0) ) { - for (uint i3 = 0; i3 < triangles.size(); i3++) { + for (unsigned int i3 = 0; i3 < triangles.size(); i3++) { NifStream( triangles[i3], out, version ); }; }; }; NifStream( numMatchGroups, out, version ); - for (uint i1 = 0; i1 < matchGroups.size(); i1++) { - matchGroups[i1].numVertices = ushort(matchGroups[i1].vertexIndices.size()); + for (unsigned int i1 = 0; i1 < matchGroups.size(); i1++) { + matchGroups[i1].numVertices = unsigned short(matchGroups[i1].vertexIndices.size()); NifStream( matchGroups[i1].numVertices, out, version ); - for (uint i2 = 0; i2 < matchGroups[i1].vertexIndices.size(); i2++) { + for (unsigned int i2 = 0; i2 < matchGroups[i1].vertexIndices.size(); i2++) { NifStream( matchGroups[i1].vertexIndices[i2], out, version ); }; }; @@ -12887,13 +12887,13 @@ void NiTriShapeData::InternalWrite( ostream& out, const map<NiObjectRef,uint> & std::string NiTriShapeData::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << NiTriBasedGeomData::asString(); - numMatchGroups = ushort(matchGroups.size()); + numMatchGroups = unsigned short(matchGroups.size()); out << " Num Triangle Points: " << numTrianglePoints << endl; out << " Has Triangles: " << hasTriangles << endl; array_output_count = 0; - for (uint i1 = 0; i1 < triangles.size(); i1++) { + for (unsigned int i1 = 0; i1 < triangles.size(); i1++) { if ( !verbose && ( array_output_count > MAXARRAYDUMP ) ) { out << "<Data Truncated. Use verbose mode to see complete listing.>" << endl; break; @@ -12906,15 +12906,15 @@ std::string NiTriShapeData::InternalAsString( bool verbose ) const { }; out << " Num Match Groups: " << numMatchGroups << endl; array_output_count = 0; - for (uint i1 = 0; i1 < matchGroups.size(); i1++) { + for (unsigned int i1 = 0; i1 < matchGroups.size(); i1++) { if ( !verbose && ( array_output_count > MAXARRAYDUMP ) ) { out << "<Data Truncated. Use verbose mode to see complete listing.>" << endl; break; }; - matchGroups[i1].numVertices = ushort(matchGroups[i1].vertexIndices.size()); + matchGroups[i1].numVertices = unsigned short(matchGroups[i1].vertexIndices.size()); out << " Num Vertices: " << matchGroups[i1].numVertices << endl; array_output_count = 0; - for (uint i2 = 0; i2 < matchGroups[i1].vertexIndices.size(); i2++) { + for (unsigned int i2 = 0; i2 < matchGroups[i1].vertexIndices.size(); i2++) { if ( !verbose && ( array_output_count > MAXARRAYDUMP ) ) { out << "<Data Truncated. Use verbose mode to see complete listing.>" << endl; break; @@ -12929,7 +12929,7 @@ std::string NiTriShapeData::InternalAsString( bool verbose ) const { return out.str(); } -void NiTriShapeData::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiTriShapeData::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiTriBasedGeomData::FixLinks( objects, link_stack, version, user_version ); } @@ -12939,22 +12939,22 @@ std::list<NiObjectRef> NiTriShapeData::InternalGetRefs() const { return refs; } -void NiTriStrips::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiTriStrips::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiTriBasedGeom::Read( in, link_stack, version, user_version ); } -void NiTriStrips::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiTriStrips::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { NiTriBasedGeom::Write( out, link_map, version, user_version ); } std::string NiTriStrips::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << NiTriBasedGeom::asString(); return out.str(); } -void NiTriStrips::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiTriStrips::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiTriBasedGeom::FixLinks( objects, link_stack, version, user_version ); } @@ -12964,11 +12964,11 @@ std::list<NiObjectRef> NiTriStrips::InternalGetRefs() const { return refs; } -void NiTriStripsData::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiTriStripsData::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiTriBasedGeomData::Read( in, link_stack, version, user_version ); NifStream( numStrips, in, version ); stripLengths.resize(numStrips); - for (uint i1 = 0; i1 < stripLengths.size(); i1++) { + for (unsigned int i1 = 0; i1 < stripLengths.size(); i1++) { NifStream( stripLengths[i1], in, version ); }; if ( version >= 0x0A010000 ) { @@ -12976,9 +12976,9 @@ void NiTriStripsData::InternalRead( istream& in, list<uint> & link_stack, unsign }; if ( version <= 0x0A000102 ) { points.resize(numStrips); - for (uint i2 = 0; i2 < points.size(); i2++) { + for (unsigned int i2 = 0; i2 < points.size(); i2++) { points[i2].resize(stripLengths[i2]); - for (uint i3 = 0; i3 < stripLengths[i2]; i3++) { + for (unsigned int i3 = 0; i3 < stripLengths[i2]; i3++) { NifStream( points[i2][i3], in, version ); }; }; @@ -12986,9 +12986,9 @@ void NiTriStripsData::InternalRead( istream& in, list<uint> & link_stack, unsign if ( version >= 0x0A010000 ) { if ( (hasPoints != 0) ) { points.resize(numStrips); - for (uint i3 = 0; i3 < points.size(); i3++) { + for (unsigned int i3 = 0; i3 < points.size(); i3++) { points[i3].resize(stripLengths[i3]); - for (uint i4 = 0; i4 < stripLengths[i3]; i4++) { + for (unsigned int i4 = 0; i4 < stripLengths[i3]; i4++) { NifStream( points[i3][i4], in, version ); }; }; @@ -12996,29 +12996,29 @@ void NiTriStripsData::InternalRead( istream& in, list<uint> & link_stack, unsign }; } -void NiTriStripsData::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiTriStripsData::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { NiTriBasedGeomData::Write( out, link_map, version, user_version ); - for (uint i1 = 0; i1 < points.size(); i1++) - stripLengths[i1] = ushort(points[i1].size()); - numStrips = ushort(stripLengths.size()); + for (unsigned int i1 = 0; i1 < points.size(); i1++) + stripLengths[i1] = unsigned short(points[i1].size()); + numStrips = unsigned short(stripLengths.size()); NifStream( numStrips, out, version ); - for (uint i1 = 0; i1 < stripLengths.size(); i1++) { + for (unsigned int i1 = 0; i1 < stripLengths.size(); i1++) { NifStream( stripLengths[i1], out, version ); }; if ( version >= 0x0A010000 ) { NifStream( hasPoints, out, version ); }; if ( version <= 0x0A000102 ) { - for (uint i2 = 0; i2 < points.size(); i2++) { - for (uint i3 = 0; i3 < stripLengths[i2]; i3++) { + for (unsigned int i2 = 0; i2 < points.size(); i2++) { + for (unsigned int i3 = 0; i3 < stripLengths[i2]; i3++) { NifStream( points[i2][i3], out, version ); }; }; }; if ( version >= 0x0A010000 ) { if ( (hasPoints != 0) ) { - for (uint i3 = 0; i3 < points.size(); i3++) { - for (uint i4 = 0; i4 < stripLengths[i3]; i4++) { + for (unsigned int i3 = 0; i3 < points.size(); i3++) { + for (unsigned int i4 = 0; i4 < stripLengths[i3]; i4++) { NifStream( points[i3][i4], out, version ); }; }; @@ -13028,14 +13028,14 @@ void NiTriStripsData::InternalWrite( ostream& out, const map<NiObjectRef,uint> & std::string NiTriStripsData::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << NiTriBasedGeomData::asString(); - for (uint i1 = 0; i1 < points.size(); i1++) - stripLengths[i1] = ushort(points[i1].size()); - numStrips = ushort(stripLengths.size()); + for (unsigned int i1 = 0; i1 < points.size(); i1++) + stripLengths[i1] = unsigned short(points[i1].size()); + numStrips = unsigned short(stripLengths.size()); out << " Num Strips: " << numStrips << endl; array_output_count = 0; - for (uint i1 = 0; i1 < stripLengths.size(); i1++) { + for (unsigned int i1 = 0; i1 < stripLengths.size(); i1++) { if ( !verbose && ( array_output_count > MAXARRAYDUMP ) ) { out << "<Data Truncated. Use verbose mode to see complete listing.>" << endl; break; @@ -13048,12 +13048,12 @@ std::string NiTriStripsData::InternalAsString( bool verbose ) const { }; out << " Has Points: " << hasPoints << endl; array_output_count = 0; - for (uint i1 = 0; i1 < points.size(); i1++) { + for (unsigned int i1 = 0; i1 < points.size(); i1++) { if ( !verbose && ( array_output_count > MAXARRAYDUMP ) ) { out << "<Data Truncated. Use verbose mode to see complete listing.>" << endl; break; }; - for (uint i2 = 0; i2 < stripLengths[i1]; i2++) { + for (unsigned int i2 = 0; i2 < stripLengths[i1]; i2++) { if ( !verbose && ( array_output_count > MAXARRAYDUMP ) ) { break; }; @@ -13064,7 +13064,7 @@ std::string NiTriStripsData::InternalAsString( bool verbose ) const { return out.str(); } -void NiTriStripsData::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiTriStripsData::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiTriBasedGeomData::FixLinks( objects, link_stack, version, user_version ); } @@ -13074,22 +13074,22 @@ std::list<NiObjectRef> NiTriStripsData::InternalGetRefs() const { return refs; } -void NiClod::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiClod::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiTriBasedGeom::Read( in, link_stack, version, user_version ); } -void NiClod::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiClod::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { NiTriBasedGeom::Write( out, link_map, version, user_version ); } std::string NiClod::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << NiTriBasedGeom::asString(); return out.str(); } -void NiClod::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiClod::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiTriBasedGeom::FixLinks( objects, link_stack, version, user_version ); } @@ -13099,7 +13099,7 @@ std::list<NiObjectRef> NiClod::InternalGetRefs() const { return refs; } -void NiClodData::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiClodData::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiTriBasedGeomData::Read( in, link_stack, version, user_version ); NifStream( unknownShorts, in, version ); NifStream( unknownCount1, in, version ); @@ -13108,44 +13108,44 @@ void NiClodData::InternalRead( istream& in, list<uint> & link_stack, unsigned in NifStream( unknownFloat, in, version ); NifStream( unknownShort, in, version ); unknownClodShorts1.resize(unknownCount1); - for (uint i1 = 0; i1 < unknownClodShorts1.size(); i1++) { - for (uint i2 = 0; i2 < 6; i2++) { + for (unsigned int i1 = 0; i1 < unknownClodShorts1.size(); i1++) { + for (unsigned int i2 = 0; i2 < 6; i2++) { NifStream( unknownClodShorts1[i1][i2], in, version ); }; }; unknownClodShorts2.resize(unknownCount2); - for (uint i1 = 0; i1 < unknownClodShorts2.size(); i1++) { + for (unsigned int i1 = 0; i1 < unknownClodShorts2.size(); i1++) { NifStream( unknownClodShorts2[i1], in, version ); }; unknownClodShorts3.resize(unknownCount3); - for (uint i1 = 0; i1 < unknownClodShorts3.size(); i1++) { - for (uint i2 = 0; i2 < 6; i2++) { + for (unsigned int i1 = 0; i1 < unknownClodShorts3.size(); i1++) { + for (unsigned int i2 = 0; i2 < 6; i2++) { NifStream( unknownClodShorts3[i1][i2], in, version ); }; }; } -void NiClodData::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiClodData::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { NiTriBasedGeomData::Write( out, link_map, version, user_version ); - unknownCount3 = ushort(unknownClodShorts3.size()); - unknownCount2 = ushort(unknownClodShorts2.size()); - unknownCount1 = ushort(unknownClodShorts1.size()); + unknownCount3 = unsigned short(unknownClodShorts3.size()); + unknownCount2 = unsigned short(unknownClodShorts2.size()); + unknownCount1 = unsigned short(unknownClodShorts1.size()); NifStream( unknownShorts, out, version ); NifStream( unknownCount1, out, version ); NifStream( unknownCount2, out, version ); NifStream( unknownCount3, out, version ); NifStream( unknownFloat, out, version ); NifStream( unknownShort, out, version ); - for (uint i1 = 0; i1 < unknownClodShorts1.size(); i1++) { - for (uint i2 = 0; i2 < 6; i2++) { + for (unsigned int i1 = 0; i1 < unknownClodShorts1.size(); i1++) { + for (unsigned int i2 = 0; i2 < 6; i2++) { NifStream( unknownClodShorts1[i1][i2], out, version ); }; }; - for (uint i1 = 0; i1 < unknownClodShorts2.size(); i1++) { + for (unsigned int i1 = 0; i1 < unknownClodShorts2.size(); i1++) { NifStream( unknownClodShorts2[i1], out, version ); }; - for (uint i1 = 0; i1 < unknownClodShorts3.size(); i1++) { - for (uint i2 = 0; i2 < 6; i2++) { + for (unsigned int i1 = 0; i1 < unknownClodShorts3.size(); i1++) { + for (unsigned int i2 = 0; i2 < 6; i2++) { NifStream( unknownClodShorts3[i1][i2], out, version ); }; }; @@ -13153,11 +13153,11 @@ void NiClodData::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link std::string NiClodData::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << NiTriBasedGeomData::asString(); - unknownCount3 = ushort(unknownClodShorts3.size()); - unknownCount2 = ushort(unknownClodShorts2.size()); - unknownCount1 = ushort(unknownClodShorts1.size()); + unknownCount3 = unsigned short(unknownClodShorts3.size()); + unknownCount2 = unsigned short(unknownClodShorts2.size()); + unknownCount1 = unsigned short(unknownClodShorts1.size()); out << " Unknown Shorts: " << unknownShorts << endl; out << " Unknown Count 1: " << unknownCount1 << endl; out << " Unknown Count 2: " << unknownCount2 << endl; @@ -13165,12 +13165,12 @@ std::string NiClodData::InternalAsString( bool verbose ) const { out << " Unknown Float: " << unknownFloat << endl; out << " Unknown Short: " << unknownShort << endl; array_output_count = 0; - for (uint i1 = 0; i1 < unknownClodShorts1.size(); i1++) { + for (unsigned int i1 = 0; i1 < unknownClodShorts1.size(); i1++) { if ( !verbose && ( array_output_count > MAXARRAYDUMP ) ) { out << "<Data Truncated. Use verbose mode to see complete listing.>" << endl; break; }; - for (uint i2 = 0; i2 < 6; i2++) { + for (unsigned int i2 = 0; i2 < 6; i2++) { if ( !verbose && ( array_output_count > MAXARRAYDUMP ) ) { break; }; @@ -13179,7 +13179,7 @@ std::string NiClodData::InternalAsString( bool verbose ) const { }; }; array_output_count = 0; - for (uint i1 = 0; i1 < unknownClodShorts2.size(); i1++) { + for (unsigned int i1 = 0; i1 < unknownClodShorts2.size(); i1++) { if ( !verbose && ( array_output_count > MAXARRAYDUMP ) ) { out << "<Data Truncated. Use verbose mode to see complete listing.>" << endl; break; @@ -13191,12 +13191,12 @@ std::string NiClodData::InternalAsString( bool verbose ) const { array_output_count++; }; array_output_count = 0; - for (uint i1 = 0; i1 < unknownClodShorts3.size(); i1++) { + for (unsigned int i1 = 0; i1 < unknownClodShorts3.size(); i1++) { if ( !verbose && ( array_output_count > MAXARRAYDUMP ) ) { out << "<Data Truncated. Use verbose mode to see complete listing.>" << endl; break; }; - for (uint i2 = 0; i2 < 6; i2++) { + for (unsigned int i2 = 0; i2 < 6; i2++) { if ( !verbose && ( array_output_count > MAXARRAYDUMP ) ) { break; }; @@ -13207,7 +13207,7 @@ std::string NiClodData::InternalAsString( bool verbose ) const { return out.str(); } -void NiClodData::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiClodData::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiTriBasedGeomData::FixLinks( objects, link_stack, version, user_version ); } @@ -13217,15 +13217,15 @@ std::list<NiObjectRef> NiClodData::InternalGetRefs() const { return refs; } -void NiUVController::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { - uint block_num; +void NiUVController::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { + unsigned int block_num; NiTimeController::Read( in, link_stack, version, user_version ); NifStream( unknownShort, in, version ); NifStream( block_num, in, version ); link_stack.push_back( block_num ); } -void NiUVController::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiUVController::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { NiTimeController::Write( out, link_map, version, user_version ); NifStream( unknownShort, out, version ); if ( data != NULL ) @@ -13236,14 +13236,14 @@ void NiUVController::InternalWrite( ostream& out, const map<NiObjectRef,uint> & std::string NiUVController::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << NiTimeController::asString(); out << " Unknown Short: " << unknownShort << endl; out << " Data: " << data << endl; return out.str(); } -void NiUVController::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiUVController::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiTimeController::FixLinks( objects, link_stack, version, user_version ); data = FixLink<NiUVData>( objects, link_stack, version ); } @@ -13256,29 +13256,29 @@ std::list<NiObjectRef> NiUVController::InternalGetRefs() const { return refs; } -void NiUVData::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiUVData::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiObject::Read( in, link_stack, version, user_version ); - for (uint i1 = 0; i1 < 4; i1++) { + for (unsigned int i1 = 0; i1 < 4; i1++) { NifStream( uvGroups[i1].numKeys, in, version ); if ( (uvGroups[i1].numKeys != 0) ) { NifStream( uvGroups[i1].interpolation, in, version ); }; uvGroups[i1].keys.resize(uvGroups[i1].numKeys); - for (uint i2 = 0; i2 < uvGroups[i1].keys.size(); i2++) { + for (unsigned int i2 = 0; i2 < uvGroups[i1].keys.size(); i2++) { NifStream( uvGroups[i1].keys[i2], in, version, uvGroups[i1].interpolation ); }; }; } -void NiUVData::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiUVData::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { NiObject::Write( out, link_map, version, user_version ); - for (uint i1 = 0; i1 < 4; i1++) { - uvGroups[i1].numKeys = uint(uvGroups[i1].keys.size()); + for (unsigned int i1 = 0; i1 < 4; i1++) { + uvGroups[i1].numKeys = unsigned int(uvGroups[i1].keys.size()); NifStream( uvGroups[i1].numKeys, out, version ); if ( (uvGroups[i1].numKeys != 0) ) { NifStream( uvGroups[i1].interpolation, out, version ); }; - for (uint i2 = 0; i2 < uvGroups[i1].keys.size(); i2++) { + for (unsigned int i2 = 0; i2 < uvGroups[i1].keys.size(); i2++) { NifStream( uvGroups[i1].keys[i2], out, version, uvGroups[i1].interpolation ); }; }; @@ -13286,21 +13286,21 @@ void NiUVData::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_m std::string NiUVData::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << NiObject::asString(); array_output_count = 0; - for (uint i1 = 0; i1 < 4; i1++) { + for (unsigned int i1 = 0; i1 < 4; i1++) { if ( !verbose && ( array_output_count > MAXARRAYDUMP ) ) { out << "<Data Truncated. Use verbose mode to see complete listing.>" << endl; break; }; - uvGroups[i1].numKeys = uint(uvGroups[i1].keys.size()); + uvGroups[i1].numKeys = unsigned int(uvGroups[i1].keys.size()); out << " Num Keys: " << uvGroups[i1].numKeys << endl; if ( (uvGroups[i1].numKeys != 0) ) { out << " Interpolation: " << uvGroups[i1].interpolation << endl; }; array_output_count = 0; - for (uint i2 = 0; i2 < uvGroups[i1].keys.size(); i2++) { + for (unsigned int i2 = 0; i2 < uvGroups[i1].keys.size(); i2++) { if ( !verbose && ( array_output_count > MAXARRAYDUMP ) ) { out << "<Data Truncated. Use verbose mode to see complete listing.>" << endl; break; @@ -13315,7 +13315,7 @@ std::string NiUVData::InternalAsString( bool verbose ) const { return out.str(); } -void NiUVData::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiUVData::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiObject::FixLinks( objects, link_stack, version, user_version ); } @@ -13325,13 +13325,13 @@ std::list<NiObjectRef> NiUVData::InternalGetRefs() const { return refs; } -void NiVectorExtraData::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiVectorExtraData::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiExtraData::Read( in, link_stack, version, user_version ); NifStream( vectorData, in, version ); NifStream( unknownFloat, in, version ); } -void NiVectorExtraData::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiVectorExtraData::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { NiExtraData::Write( out, link_map, version, user_version ); NifStream( vectorData, out, version ); NifStream( unknownFloat, out, version ); @@ -13339,14 +13339,14 @@ void NiVectorExtraData::InternalWrite( ostream& out, const map<NiObjectRef,uint> std::string NiVectorExtraData::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << NiExtraData::asString(); out << " Vector Data: " << vectorData << endl; out << " Unknown Float: " << unknownFloat << endl; return out.str(); } -void NiVectorExtraData::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiVectorExtraData::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiExtraData::FixLinks( objects, link_stack, version, user_version ); } @@ -13356,14 +13356,14 @@ std::list<NiObjectRef> NiVectorExtraData::InternalGetRefs() const { return refs; } -void NiVertexColorProperty::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiVertexColorProperty::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiProperty::Read( in, link_stack, version, user_version ); NifStream( flags, in, version ); NifStream( vertexMode, in, version ); NifStream( lightingMode, in, version ); } -void NiVertexColorProperty::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiVertexColorProperty::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { NiProperty::Write( out, link_map, version, user_version ); NifStream( flags, out, version ); NifStream( vertexMode, out, version ); @@ -13372,7 +13372,7 @@ void NiVertexColorProperty::InternalWrite( ostream& out, const map<NiObjectRef,u std::string NiVertexColorProperty::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << NiProperty::asString(); out << " Flags: " << flags << endl; out << " Vertex Mode: " << vertexMode << endl; @@ -13380,7 +13380,7 @@ std::string NiVertexColorProperty::InternalAsString( bool verbose ) const { return out.str(); } -void NiVertexColorProperty::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiVertexColorProperty::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiProperty::FixLinks( objects, link_stack, version, user_version ); } @@ -13390,35 +13390,35 @@ std::list<NiObjectRef> NiVertexColorProperty::InternalGetRefs() const { return refs; } -void NiVertWeightsExtraData::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiVertWeightsExtraData::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiExtraData::Read( in, link_stack, version, user_version ); NifStream( numBytes, in, version ); NifStream( numVertices, in, version ); weight.resize(numVertices); - for (uint i1 = 0; i1 < weight.size(); i1++) { + for (unsigned int i1 = 0; i1 < weight.size(); i1++) { NifStream( weight[i1], in, version ); }; } -void NiVertWeightsExtraData::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiVertWeightsExtraData::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { NiExtraData::Write( out, link_map, version, user_version ); - numVertices = ushort(weight.size()); + numVertices = unsigned short(weight.size()); NifStream( numBytes, out, version ); NifStream( numVertices, out, version ); - for (uint i1 = 0; i1 < weight.size(); i1++) { + for (unsigned int i1 = 0; i1 < weight.size(); i1++) { NifStream( weight[i1], out, version ); }; } std::string NiVertWeightsExtraData::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << NiExtraData::asString(); - numVertices = ushort(weight.size()); + numVertices = unsigned short(weight.size()); out << " Num Bytes: " << numBytes << endl; out << " Num Vertices: " << numVertices << endl; array_output_count = 0; - for (uint i1 = 0; i1 < weight.size(); i1++) { + for (unsigned int i1 = 0; i1 < weight.size(); i1++) { if ( !verbose && ( array_output_count > MAXARRAYDUMP ) ) { out << "<Data Truncated. Use verbose mode to see complete listing.>" << endl; break; @@ -13432,7 +13432,7 @@ std::string NiVertWeightsExtraData::InternalAsString( bool verbose ) const { return out.str(); } -void NiVertWeightsExtraData::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiVertWeightsExtraData::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiExtraData::FixLinks( objects, link_stack, version, user_version ); } @@ -13442,8 +13442,8 @@ std::list<NiObjectRef> NiVertWeightsExtraData::InternalGetRefs() const { return refs; } -void NiVisController::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { - uint block_num; +void NiVisController::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { + unsigned int block_num; NiSingleInterpolatorController::Read( in, link_stack, version, user_version ); if ( version <= 0x0A010000 ) { NifStream( block_num, in, version ); @@ -13451,7 +13451,7 @@ void NiVisController::InternalRead( istream& in, list<uint> & link_stack, unsign }; } -void NiVisController::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiVisController::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { NiSingleInterpolatorController::Write( out, link_map, version, user_version ); if ( version <= 0x0A010000 ) { if ( data != NULL ) @@ -13463,13 +13463,13 @@ void NiVisController::InternalWrite( ostream& out, const map<NiObjectRef,uint> & std::string NiVisController::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << NiSingleInterpolatorController::asString(); out << " Data: " << data << endl; return out.str(); } -void NiVisController::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiVisController::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiSingleInterpolatorController::FixLinks( objects, link_stack, version, user_version ); if ( version <= 0x0A010000 ) { data = FixLink<NiVisData>( objects, link_stack, version ); @@ -13484,32 +13484,32 @@ std::list<NiObjectRef> NiVisController::InternalGetRefs() const { return refs; } -void NiVisData::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiVisData::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { AKeyedData::Read( in, link_stack, version, user_version ); NifStream( numVisKeys, in, version ); visKeys.resize(numVisKeys); - for (uint i1 = 0; i1 < visKeys.size(); i1++) { + for (unsigned int i1 = 0; i1 < visKeys.size(); i1++) { NifStream( visKeys[i1], in, version, 1 ); }; } -void NiVisData::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiVisData::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { AKeyedData::Write( out, link_map, version, user_version ); - numVisKeys = uint(visKeys.size()); + numVisKeys = unsigned int(visKeys.size()); NifStream( numVisKeys, out, version ); - for (uint i1 = 0; i1 < visKeys.size(); i1++) { + for (unsigned int i1 = 0; i1 < visKeys.size(); i1++) { NifStream( visKeys[i1], out, version, 1 ); }; } std::string NiVisData::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << AKeyedData::asString(); - numVisKeys = uint(visKeys.size()); + numVisKeys = unsigned int(visKeys.size()); out << " Num Vis Keys: " << numVisKeys << endl; array_output_count = 0; - for (uint i1 = 0; i1 < visKeys.size(); i1++) { + for (unsigned int i1 = 0; i1 < visKeys.size(); i1++) { if ( !verbose && ( array_output_count > MAXARRAYDUMP ) ) { out << "<Data Truncated. Use verbose mode to see complete listing.>" << endl; break; @@ -13523,7 +13523,7 @@ std::string NiVisData::InternalAsString( bool verbose ) const { return out.str(); } -void NiVisData::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiVisData::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { AKeyedData::FixLinks( objects, link_stack, version, user_version ); } @@ -13533,25 +13533,25 @@ std::list<NiObjectRef> NiVisData::InternalGetRefs() const { return refs; } -void NiWireframeProperty::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiWireframeProperty::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiProperty::Read( in, link_stack, version, user_version ); NifStream( flags, in, version ); } -void NiWireframeProperty::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiWireframeProperty::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { NiProperty::Write( out, link_map, version, user_version ); NifStream( flags, out, version ); } std::string NiWireframeProperty::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << NiProperty::asString(); out << " Flags: " << flags << endl; return out.str(); } -void NiWireframeProperty::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiWireframeProperty::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiProperty::FixLinks( objects, link_stack, version, user_version ); } @@ -13561,7 +13561,7 @@ std::list<NiObjectRef> NiWireframeProperty::InternalGetRefs() const { return refs; } -void NiZBufferProperty::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiZBufferProperty::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiProperty::Read( in, link_stack, version, user_version ); NifStream( flags, in, version ); if ( version >= 0x0401000C ) { @@ -13569,7 +13569,7 @@ void NiZBufferProperty::InternalRead( istream& in, list<uint> & link_stack, unsi }; } -void NiZBufferProperty::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiZBufferProperty::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { NiProperty::Write( out, link_map, version, user_version ); NifStream( flags, out, version ); if ( version >= 0x0401000C ) { @@ -13579,14 +13579,14 @@ void NiZBufferProperty::InternalWrite( ostream& out, const map<NiObjectRef,uint> std::string NiZBufferProperty::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << NiProperty::asString(); out << " Flags: " << flags << endl; out << " Function: " << function << endl; return out.str(); } -void NiZBufferProperty::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiZBufferProperty::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiProperty::FixLinks( objects, link_stack, version, user_version ); } @@ -13596,22 +13596,22 @@ std::list<NiObjectRef> NiZBufferProperty::InternalGetRefs() const { return refs; } -void RootCollisionNode::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void RootCollisionNode::InternalRead( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiNode::Read( in, link_stack, version, user_version ); } -void RootCollisionNode::InternalWrite( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void RootCollisionNode::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { NiNode::Write( out, link_map, version, user_version ); } std::string RootCollisionNode::InternalAsString( bool verbose ) const { stringstream out; - uint array_output_count = 0; + unsigned int array_output_count = 0; out << NiNode::asString(); return out.str(); } -void RootCollisionNode::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void RootCollisionNode::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { NiNode::FixLinks( objects, link_stack, version, user_version ); } diff --git a/src/kfm.cpp b/src/kfm.cpp index 629751df228512b33dcd0c17e914d9556c326b8c..0551de88bdab9438d8f1c31d510125251e69bc70 100644 --- a/src/kfm.cpp +++ b/src/kfm.cpp @@ -17,7 +17,7 @@ void KfmEventString::Write( ostream & out, unsigned int version ) { WriteString(event, out); }; -void KfmEvent::Read( istream & in, uint version ) { +void KfmEvent::Read( istream & in, unsigned int version ) { id = ReadUInt(in); type = ReadUInt(in); if ( type != 5 ) { @@ -28,7 +28,7 @@ void KfmEvent::Read( istream & in, uint version ) { }; }; -void KfmAction::Read( istream & in, uint version ) { +void KfmAction::Read( istream & in, unsigned int version ) { if ( version <= VER_KFM_1_2_4b ) action_name = ReadString(in); action_filename = ReadString(in); unk_int1 = ReadUInt(in); @@ -104,7 +104,7 @@ unsigned int Kfm::Read( istream & in ) { }; /* -void Kfm::Write( ostream & out, uint version ) { +void Kfm::Write( ostream & out, unsigned int version ) { if ( version == VER_KFM_1_0 ) { // handle this case seperately out << ";Gamebryo KFM File Version 1.0" << endl; diff --git a/src/niflib.cpp b/src/niflib.cpp index d00232941b9e36a4ced4a11cddb1ddb0e8660095..b38c2d0930147c6cab8b0dfd3bcfa015dda92607 100644 --- a/src/niflib.cpp +++ b/src/niflib.cpp @@ -42,7 +42,7 @@ bool global_block_map_init = false; map<string, blk_factory_func> global_block_map; //Utility Functions -void EnumerateObjects( NiObject * root, map<Type*,uint> & type_map, map<NiObjectRef, uint> & link_map, bool reverse = false ); +void EnumerateObjects( NiObject * root, map<Type*,unsigned int> & type_map, map<NiObjectRef, unsigned int> & link_map, bool reverse = false ); NiObjectRef FindRoot( vector<NiObjectRef> const & blocks ); void RegisterBlockFactories (); NiObjectRef GetObjectByType( NiObject * root, const Type & type ); @@ -102,7 +102,7 @@ NiObjectRef FindRoot( vector<NiObjectRef> const & blocks ) { //Find the first NiObjectNET derived object NiAVObjectRef root; - for (uint i = 0; i < blocks.size(); ++i) { + for (unsigned int i = 0; i < blocks.size(); ++i) { root = DynamicCast<NiAVObject>(blocks[i]); if ( root != NULL ) { break; @@ -179,12 +179,12 @@ vector<NiObjectRef> ReadNifList( istream & in, NifInfo * info ) { //--Read Objects--// size_t numObjects = header.numBlocks; map<unsigned,NiObjectRef> objects; //Map to hold objects by number - list<uint> link_stack; //List to add link values to as they're read in from the file + list<unsigned int> link_stack; //List to add link values to as they're read in from the file string objectType; stringstream errStream; //Loop through all objects in the file - uint i = 0; + unsigned int i = 0; NiObjectRef new_obj; while (true) { //Check for EOF @@ -206,7 +206,7 @@ vector<NiObjectRef> ReadNifList( istream & in, NifInfo * info ) { //From version 5.0.0.1 to version 10.0.1.106 there is a zero byte at the begining of each object if ( header.version <= VER_10_1_0_106 ) { - uint checkValue = ReadUInt( in ); + unsigned int checkValue = ReadUInt( in ); if ( checkValue != 0 ) { //Throw an exception if it's not zero errStream << "Read failue - Bad object position. Invalid check value: " << checkValue << endl; @@ -229,7 +229,7 @@ vector<NiObjectRef> ReadNifList( istream & in, NifInfo * info ) { #endif } else { // Find which object type this is by reading the string at this location - uint objectTypeLength = ReadUInt( in ); + unsigned int objectTypeLength = ReadUInt( in ); if (objectTypeLength > 30 || objectTypeLength < 6) { errStream << "Read failue - Bad object position. Invalid Type Name Length: " << objectTypeLength << endl; if ( new_obj != NULL ) { @@ -295,7 +295,7 @@ vector<NiObjectRef> ReadNifList( istream & in, NifInfo * info ) { throw runtime_error( errStream.str() ); } - uint index; + unsigned int index; if ( header.version < VER_3_3_0_13 ) { //These old versions have a pointer value after the name //which is used as the index @@ -340,7 +340,7 @@ vector<NiObjectRef> ReadNifList( istream & in, NifInfo * info ) { #ifdef DEBUG_LINK_PHASE cout << "Link Stack:" << endl; - list<uint>::iterator it; + list<unsigned int>::iterator it; for ( it = link_stack.begin(); it != link_stack.end(); ++it ) { cout << *it << endl; } @@ -373,8 +373,8 @@ void WriteNifTree( ostream & out, list<NiObjectRef> const & roots, const NifInfo //int block_count = ResetBlockNums( 0, root_block ); //Enumerate all objects in tree - map<Type*,uint> type_map; - map<NiObjectRef, uint> link_map; + map<Type*,unsigned int> type_map; + map<NiObjectRef, unsigned int> link_map; for (list<NiObjectRef>::const_iterator it = roots.begin(); it != roots.end(); ++it) { EnumerateObjects( (*it), type_map, link_map ); @@ -382,12 +382,12 @@ void WriteNifTree( ostream & out, list<NiObjectRef> const & roots, const NifInfo //Build vectors for reverse look-up vector<NiObjectRef> objects(link_map.size()); - for ( map<NiObjectRef, uint>::iterator it = link_map.begin(); it != link_map.end(); ++it ) { + for ( map<NiObjectRef, unsigned int>::iterator it = link_map.begin(); it != link_map.end(); ++it ) { objects[it->second] = it->first; } vector<const Type*> types(type_map.size()); - for ( map<Type*, uint>::iterator it = type_map.begin(); it != type_map.end(); ++it ) { + for ( map<Type*, unsigned int>::iterator it = type_map.begin(); it != type_map.end(); ++it ) { types[it->second] = it->first; } @@ -406,14 +406,14 @@ void WriteNifTree( ostream & out, list<NiObjectRef> const & roots, const NifInfo //Set Type Names header.blockTypes.resize( types.size() ); - for ( uint i = 0; i < types.size(); ++i ) { + for ( unsigned int i = 0; i < types.size(); ++i ) { header.blockTypes[i] = types[i]->GetTypeName(); } //Set type number of each block header.blockTypeIndex.resize( objects.size() ); - for ( uint i = 0; i < objects.size(); ++i ) { + for ( unsigned int i = 0; i < objects.size(); ++i ) { header.blockTypeIndex[i] = type_map[(Type*)&(objects[i]->GetType())]; } @@ -425,7 +425,7 @@ void WriteNifTree( ostream & out, list<NiObjectRef> const & roots, const NifInfo #endif //--Write Objects--// - for (uint i = 0; i < objects.size(); ++i) { + for (unsigned int i = 0; i < objects.size(); ++i) { #ifdef PRINT_OBJECT_NAMES cout << endl << i << ": " << objects[i]->GetType().GetTypeName(); @@ -448,7 +448,7 @@ void WriteNifTree( ostream & out, list<NiObjectRef> const & roots, const NifInfo const NiObjectRef& root = roots.front(); if (root->IsDerivedType(NiControllerSequence::TypeConst())) { // KF animation files allow for multiple roots of type NiControllerSequence - for ( uint i = 0; i < objects.size(); ++i ) { + for ( unsigned int i = 0; i < objects.size(); ++i ) { if (objects[i]->IsDerivedType(NiControllerSequence::TypeConst())) { footer.roots.push_back(objects[i]); } @@ -495,7 +495,7 @@ void WriteNifTree( ostream & out, NiObject * root, const NifInfo & info ) { WriteNifTree( out, roots, info ); } -void EnumerateObjects( NiObject * root, map<Type*,uint> & type_map, map<NiObjectRef, uint> & link_map, bool reverse ) { +void EnumerateObjects( NiObject * root, map<Type*,unsigned int> & type_map, map<NiObjectRef, unsigned int> & link_map, bool reverse ) { //Ensure that this object has not already been visited if ( link_map.find( root ) != link_map.end() ) { //This object has already been visited. Return. @@ -505,7 +505,7 @@ void EnumerateObjects( NiObject * root, map<Type*,uint> & type_map, map<NiObject //Add this object type to the map if it isn't there already if ( type_map.find( (Type*)&(root->GetType()) ) == type_map.end() ) { //The type has not yet been registered, so register it - type_map[ (Type*)&(root->GetType()) ] = uint(type_map.size()); + type_map[ (Type*)&(root->GetType()) ] = unsigned int(type_map.size()); } // Oblivion has very rigid requirements about block ordering and the bhkRigidBody @@ -522,7 +522,7 @@ void EnumerateObjects( NiObject * root, map<Type*,uint> & type_map, map<NiObject // If reverse is set then add the link after children otherwise add it before if (!reverse) { - link_map[root] = uint(link_map.size()); + link_map[root] = unsigned int(link_map.size()); } //Call this function on all links of this object @@ -534,7 +534,7 @@ void EnumerateObjects( NiObject * root, map<Type*,uint> & type_map, map<NiObject } if (reverse) { - link_map[root] = uint(link_map.size()); + link_map[root] = unsigned int(link_map.size()); } } @@ -766,10 +766,10 @@ static void SplitNifTree( NiObject * root_block, NiObject * xnif_root, list<NiOb //TODO: This was written by Amorilia. Figure out how to fix it. void WriteFileGroup( string const & file_name, NiObject * root_block, const NifInfo & info, ExportOptions export_files, NifGame kf_type ) { // Get base filename. - uint file_name_slash = uint(file_name.rfind("\\") + 1); + unsigned int file_name_slash = unsigned int(file_name.rfind("\\") + 1); string file_name_path = file_name.substr(0, file_name_slash); string file_name_base = file_name.substr(file_name_slash, file_name.length()); - uint file_name_dot = uint(file_name_base.rfind(".")); + unsigned int file_name_dot = unsigned int(file_name_base.rfind(".")); file_name_base = file_name_base.substr(0, file_name_dot); // Deal with the simple case first @@ -884,7 +884,7 @@ void MergeSceneGraph( map<string,NiNodeRef> & name_map, NiNode * root, NiAVObjec } else { //This is a NiNode class, so merge its child list with that of the root vector<NiAVObjectRef> children = par_node->GetChildren(); - for ( uint i = 0; i < children.size(); ++i ) { + for ( unsigned int i = 0; i < children.size(); ++i ) { root->AddChild( children[i] ); } } @@ -953,7 +953,7 @@ void MergeNifTrees( NiNode * target, NiControllerSequence * right, unsigned vers vector<ControllerLink> data = right->GetControllerData(); //Connect a clone of all the interpolators/controllers to the named node - for ( uint i = 0; i < data.size(); ++i ) { + for ( unsigned int i = 0; i < data.size(); ++i ) { //Get strings //TODO: Find out if other strings are needed string node_name, ctlr_type; @@ -1147,7 +1147,7 @@ void SendNifTreeToBindPos( NiNode * root ) { //Call this function on any NiNode children vector<NiAVObjectRef> children = root->GetChildren(); - for ( uint i = 0; i < children.size(); ++i ) { + for ( unsigned int i = 0; i < children.size(); ++i ) { NiNodeRef child = DynamicCast<NiNode>(children[i]); if ( child != NULL ) { SendNifTreeToBindPos( child ); diff --git a/src/obj/ABoneLODController.cpp b/src/obj/ABoneLODController.cpp index b92d3f958ff26176f1284b427dbebdee629a0e62..60bf6d072ee08b785721c8029aef471004a6ce2a 100644 --- a/src/obj/ABoneLODController.cpp +++ b/src/obj/ABoneLODController.cpp @@ -14,11 +14,11 @@ ABoneLODController::ABoneLODController() A_BONE_L_O_D_CONTROLLER_CONSTRUCT {} ABoneLODController::~ABoneLODController() {} -void ABoneLODController::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void ABoneLODController::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void ABoneLODController::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void ABoneLODController::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -26,7 +26,7 @@ string ABoneLODController::asString( bool verbose ) const { return InternalAsString( verbose ); } -void ABoneLODController::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void ABoneLODController::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } diff --git a/src/obj/AKeyedData.cpp b/src/obj/AKeyedData.cpp index 86e531dab8664a2e87fc554b8465ef4b55205539..6c794ed73b0c8f71c56c38591c6ccc665f123b66 100644 --- a/src/obj/AKeyedData.cpp +++ b/src/obj/AKeyedData.cpp @@ -11,11 +11,11 @@ AKeyedData::AKeyedData() A_KEYED_DATA_CONSTRUCT {} AKeyedData::~AKeyedData() {} -void AKeyedData::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void AKeyedData::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void AKeyedData::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void AKeyedData::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -23,7 +23,7 @@ string AKeyedData::asString( bool verbose ) const { return InternalAsString( verbose ); } -void AKeyedData::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void AKeyedData::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } diff --git a/src/obj/APSysCtlr.cpp b/src/obj/APSysCtlr.cpp index 4bb90030dd558763c0c093b3bff154a4715195a3..8adc82625a5fe836823046bcb0423d4d65952816 100644 --- a/src/obj/APSysCtlr.cpp +++ b/src/obj/APSysCtlr.cpp @@ -11,11 +11,11 @@ APSysCtlr::APSysCtlr() A_P_SYS_CTLR_CONSTRUCT {} APSysCtlr::~APSysCtlr() {} -void APSysCtlr::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void APSysCtlr::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void APSysCtlr::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void APSysCtlr::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -23,7 +23,7 @@ string APSysCtlr::asString( bool verbose ) const { return InternalAsString( verbose ); } -void APSysCtlr::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void APSysCtlr::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } diff --git a/src/obj/APSysData.cpp b/src/obj/APSysData.cpp index 1f0c5228d89bef536e57a0169e97b5642976d657..1e1144659a7d0bfdf04ea6587756ea4f5288d33e 100644 --- a/src/obj/APSysData.cpp +++ b/src/obj/APSysData.cpp @@ -11,11 +11,11 @@ APSysData::APSysData() A_P_SYS_DATA_CONSTRUCT {} APSysData::~APSysData() {} -void APSysData::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void APSysData::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void APSysData::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void APSysData::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -23,7 +23,7 @@ string APSysData::asString( bool verbose ) const { return InternalAsString( verbose ); } -void APSysData::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void APSysData::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } diff --git a/src/obj/AParticleModifier.cpp b/src/obj/AParticleModifier.cpp index 6425f9dec2cdef6f912516d0c125d3e7d4abb0a0..634725c4ff5938b97c2f1d0423f34886179f0af5 100644 --- a/src/obj/AParticleModifier.cpp +++ b/src/obj/AParticleModifier.cpp @@ -12,11 +12,11 @@ AParticleModifier::AParticleModifier() A_PARTICLE_MODIFIER_CONSTRUCT {} AParticleModifier::~AParticleModifier() {} -void AParticleModifier::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void AParticleModifier::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void AParticleModifier::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void AParticleModifier::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -24,7 +24,7 @@ string AParticleModifier::asString( bool verbose ) const { return InternalAsString( verbose ); } -void AParticleModifier::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void AParticleModifier::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } diff --git a/src/obj/AbhkConstraint.cpp b/src/obj/AbhkConstraint.cpp index 345f0ba8146cd456713c3e056b8719a75ab6f1f0..c9439b3ef5c81b88d4da3751b031f4de862df81d 100644 --- a/src/obj/AbhkConstraint.cpp +++ b/src/obj/AbhkConstraint.cpp @@ -12,11 +12,11 @@ AbhkConstraint::AbhkConstraint() ABHK_CONSTRAINT_CONSTRUCT {} AbhkConstraint::~AbhkConstraint() {} -void AbhkConstraint::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void AbhkConstraint::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void AbhkConstraint::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void AbhkConstraint::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -24,7 +24,7 @@ string AbhkConstraint::asString( bool verbose ) const { return InternalAsString( verbose ); } -void AbhkConstraint::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void AbhkConstraint::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } diff --git a/src/obj/AbhkRagdollConstraint.cpp b/src/obj/AbhkRagdollConstraint.cpp index 89599e8321129c8832e313b37624c46981afcb40..7f0e651f526851a0d8968c956f9e3511f81628d7 100644 --- a/src/obj/AbhkRagdollConstraint.cpp +++ b/src/obj/AbhkRagdollConstraint.cpp @@ -11,11 +11,11 @@ AbhkRagdollConstraint::AbhkRagdollConstraint() ABHK_RAGDOLL_CONSTRAINT_CONSTRUCT AbhkRagdollConstraint::~AbhkRagdollConstraint() {} -void AbhkRagdollConstraint::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void AbhkRagdollConstraint::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void AbhkRagdollConstraint::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void AbhkRagdollConstraint::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -23,7 +23,7 @@ string AbhkRagdollConstraint::asString( bool verbose ) const { return InternalAsString( verbose ); } -void AbhkRagdollConstraint::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void AbhkRagdollConstraint::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } diff --git a/src/obj/AbhkShapeCollection.cpp b/src/obj/AbhkShapeCollection.cpp index b7d918976579d89378fc583379835b63bd156a17..9ca0cb3b2c94239ce3acf6bb7f4920cb842c487c 100644 --- a/src/obj/AbhkShapeCollection.cpp +++ b/src/obj/AbhkShapeCollection.cpp @@ -11,11 +11,11 @@ AbhkShapeCollection::AbhkShapeCollection() ABHK_SHAPE_COLLECTION_CONSTRUCT {} AbhkShapeCollection::~AbhkShapeCollection() {} -void AbhkShapeCollection::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void AbhkShapeCollection::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void AbhkShapeCollection::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void AbhkShapeCollection::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -23,7 +23,7 @@ string AbhkShapeCollection::asString( bool verbose ) const { return InternalAsString( verbose ); } -void AbhkShapeCollection::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void AbhkShapeCollection::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } diff --git a/src/obj/AvoidNode.cpp b/src/obj/AvoidNode.cpp index 208c1b64832999a1463346aeba2aea6051b1f59c..f3ef33aee9a5a5d20aa88045c06de48c83ec0f43 100644 --- a/src/obj/AvoidNode.cpp +++ b/src/obj/AvoidNode.cpp @@ -11,11 +11,11 @@ AvoidNode::AvoidNode() AVOID_NODE_CONSTRUCT {} AvoidNode::~AvoidNode() {} -void AvoidNode::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void AvoidNode::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void AvoidNode::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void AvoidNode::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -23,7 +23,7 @@ string AvoidNode::asString( bool verbose ) const { return InternalAsString( verbose ); } -void AvoidNode::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void AvoidNode::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } diff --git a/src/obj/BSBound.cpp b/src/obj/BSBound.cpp index 3459a3aa2fb2c18bad695db5c34cfd3c197ede62..3608799042755873e7513df9928b42fe86fcf504 100644 --- a/src/obj/BSBound.cpp +++ b/src/obj/BSBound.cpp @@ -11,11 +11,11 @@ BSBound::BSBound() B_S_BOUND_CONSTRUCT {} BSBound::~BSBound() {} -void BSBound::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void BSBound::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void BSBound::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void BSBound::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -23,7 +23,7 @@ string BSBound::asString( bool verbose ) const { return InternalAsString( verbose ); } -void BSBound::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void BSBound::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } diff --git a/src/obj/BSFurnitureMarker.cpp b/src/obj/BSFurnitureMarker.cpp index e7f606876431724a86f084912969d4cf251afd1c..f3420e9268147766184c4d4d25b14dd00b4b2b8a 100644 --- a/src/obj/BSFurnitureMarker.cpp +++ b/src/obj/BSFurnitureMarker.cpp @@ -12,11 +12,11 @@ BSFurnitureMarker::BSFurnitureMarker() B_S_FURNITURE_MARKER_CONSTRUCT {} BSFurnitureMarker::~BSFurnitureMarker() {} -void BSFurnitureMarker::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void BSFurnitureMarker::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void BSFurnitureMarker::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void BSFurnitureMarker::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -24,7 +24,7 @@ string BSFurnitureMarker::asString( bool verbose ) const { return InternalAsString( verbose ); } -void BSFurnitureMarker::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void BSFurnitureMarker::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } @@ -41,7 +41,7 @@ vector<FurniturePosition> BSFurnitureMarker::GetFurniturePositions() const { } void BSFurnitureMarker::SetFurniturePositions( const vector<FurniturePosition> & n ) { - numPositions = uint(n.size()); + numPositions = unsigned int(n.size()); positions = n; } diff --git a/src/obj/BSKeyframeController.cpp b/src/obj/BSKeyframeController.cpp index daabe2cec28ff1582039596e88afd226b9fd35d5..3f8d3833d267af4ec13ebf117db7093e9cdbd5be 100644 --- a/src/obj/BSKeyframeController.cpp +++ b/src/obj/BSKeyframeController.cpp @@ -12,11 +12,11 @@ BSKeyframeController::BSKeyframeController() B_S_KEYFRAME_CONTROLLER_CONSTRUCT { BSKeyframeController::~BSKeyframeController() {} -void BSKeyframeController::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void BSKeyframeController::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void BSKeyframeController::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void BSKeyframeController::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -24,7 +24,7 @@ string BSKeyframeController::asString( bool verbose ) const { return InternalAsString( verbose ); } -void BSKeyframeController::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void BSKeyframeController::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } diff --git a/src/obj/BSPSysArrayEmitter.cpp b/src/obj/BSPSysArrayEmitter.cpp index 1b7b9956328f9dc673feb83fe5979b6fb30c8344..0a4d1d06f2cf86a108dba8ebfb737fb2e755633a 100644 --- a/src/obj/BSPSysArrayEmitter.cpp +++ b/src/obj/BSPSysArrayEmitter.cpp @@ -11,11 +11,11 @@ BSPSysArrayEmitter::BSPSysArrayEmitter() B_S_P_SYS_ARRAY_EMITTER_CONSTRUCT {} BSPSysArrayEmitter::~BSPSysArrayEmitter() {} -void BSPSysArrayEmitter::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void BSPSysArrayEmitter::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void BSPSysArrayEmitter::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void BSPSysArrayEmitter::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -23,7 +23,7 @@ string BSPSysArrayEmitter::asString( bool verbose ) const { return InternalAsString( verbose ); } -void BSPSysArrayEmitter::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void BSPSysArrayEmitter::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } diff --git a/src/obj/BSParentVelocityModifier.cpp b/src/obj/BSParentVelocityModifier.cpp index 2c4ecff75be43dd585ae1bf343d59572449aab91..337bfbea08e9bef4ab42e90ac8bce7f44b73c449 100644 --- a/src/obj/BSParentVelocityModifier.cpp +++ b/src/obj/BSParentVelocityModifier.cpp @@ -11,11 +11,11 @@ BSParentVelocityModifier::BSParentVelocityModifier() B_S_PARENT_VELOCITY_MODIFIE BSParentVelocityModifier::~BSParentVelocityModifier() {} -void BSParentVelocityModifier::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void BSParentVelocityModifier::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void BSParentVelocityModifier::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void BSParentVelocityModifier::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -23,7 +23,7 @@ string BSParentVelocityModifier::asString( bool verbose ) const { return InternalAsString( verbose ); } -void BSParentVelocityModifier::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void BSParentVelocityModifier::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } diff --git a/src/obj/BSXFlags.cpp b/src/obj/BSXFlags.cpp index 0be1303318711a3c31567960f1df8f1f039e2102..674cda7cbb42a0c58e875202303c655268cd7e3e 100644 --- a/src/obj/BSXFlags.cpp +++ b/src/obj/BSXFlags.cpp @@ -11,11 +11,11 @@ BSXFlags::BSXFlags() B_S_X_FLAGS_CONSTRUCT {} BSXFlags::~BSXFlags() {} -void BSXFlags::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void BSXFlags::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void BSXFlags::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void BSXFlags::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -23,7 +23,7 @@ string BSXFlags::asString( bool verbose ) const { return InternalAsString( verbose ); } -void BSXFlags::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void BSXFlags::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } @@ -35,11 +35,11 @@ const Type & BSXFlags::GetType() const { return TYPE; }; -uint BSXFlags::GetFlags() const { +unsigned int BSXFlags::GetFlags() const { return flags; } -void BSXFlags::SetFlags( uint value ) { +void BSXFlags::SetFlags( unsigned int value ) { flags = value; } diff --git a/src/obj/FxButton.cpp b/src/obj/FxButton.cpp index 7ac67cf709fb48c17691cd8dda9d5cf3cce3b4d3..b4328ea1b8e574221b439b05ee289c6f9109154c 100644 --- a/src/obj/FxButton.cpp +++ b/src/obj/FxButton.cpp @@ -11,11 +11,11 @@ FxButton::FxButton() FX_BUTTON_CONSTRUCT {} FxButton::~FxButton() {} -void FxButton::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void FxButton::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void FxButton::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void FxButton::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -23,7 +23,7 @@ string FxButton::asString( bool verbose ) const { return InternalAsString( verbose ); } -void FxButton::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void FxButton::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } diff --git a/src/obj/FxRadioButton.cpp b/src/obj/FxRadioButton.cpp index e8b71b9ce445bf7e0794d12ac0ab5ad8b9cd46fa..81878c0f20e23cf163e9e1483d085be787c26838 100644 --- a/src/obj/FxRadioButton.cpp +++ b/src/obj/FxRadioButton.cpp @@ -12,11 +12,11 @@ FxRadioButton::FxRadioButton() FX_RADIO_BUTTON_CONSTRUCT {} FxRadioButton::~FxRadioButton() {} -void FxRadioButton::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void FxRadioButton::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void FxRadioButton::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void FxRadioButton::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -24,7 +24,7 @@ string FxRadioButton::asString( bool verbose ) const { return InternalAsString( verbose ); } -void FxRadioButton::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void FxRadioButton::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } diff --git a/src/obj/FxWidget.cpp b/src/obj/FxWidget.cpp index f08b5aa564cbbc23c8d1f42f58c8fa93cf7b7aa5..a2487197e479b27ff3b93e5a77f19a7a3dbe71aa 100644 --- a/src/obj/FxWidget.cpp +++ b/src/obj/FxWidget.cpp @@ -11,11 +11,11 @@ FxWidget::FxWidget() FX_WIDGET_CONSTRUCT {} FxWidget::~FxWidget() {} -void FxWidget::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void FxWidget::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void FxWidget::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void FxWidget::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -23,7 +23,7 @@ string FxWidget::asString( bool verbose ) const { return InternalAsString( verbose ); } -void FxWidget::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void FxWidget::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } diff --git a/src/obj/NiAVObject.cpp b/src/obj/NiAVObject.cpp index c07676c443a87e795de59e3323e1f3f18c0bde95..1ef71f5f84ae7960bf987764bbb313a2960e283f 100644 --- a/src/obj/NiAVObject.cpp +++ b/src/obj/NiAVObject.cpp @@ -25,11 +25,11 @@ NiAVObject::~NiAVObject() { ClearProperties(); } -void NiAVObject::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiAVObject::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void NiAVObject::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiAVObject::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -37,7 +37,7 @@ string NiAVObject::asString( bool verbose ) const { return InternalAsString( verbose ); } -void NiAVObject::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiAVObject::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } @@ -104,7 +104,7 @@ vector< Ref<NiProperty> > NiAVObject::GetProperties() const { } Ref<NiProperty> NiAVObject::GetPropertyByType( const Type & compare_to ) { - for ( uint i = 0; i < properties.size(); ++i ) { + for ( unsigned int i = 0; i < properties.size(); ++i ) { if ( properties[i]->IsSameType( compare_to ) ) { return properties[i]; } @@ -113,11 +113,11 @@ Ref<NiProperty> NiAVObject::GetPropertyByType( const Type & compare_to ) { return NULL; } -ushort NiAVObject::GetFlags() const { +unsigned short NiAVObject::GetFlags() const { return flags; } -void NiAVObject::SetFlags( ushort n ) { +void NiAVObject::SetFlags( unsigned short n ) { flags = n; } diff --git a/src/obj/NiAlphaController.cpp b/src/obj/NiAlphaController.cpp index c39c6b4bcf5fdeaaac7f295dcdc91d4c8fdafd73..12bbe96fb3d3d57eaae783f39cb36941aee89f95 100644 --- a/src/obj/NiAlphaController.cpp +++ b/src/obj/NiAlphaController.cpp @@ -12,11 +12,11 @@ NiAlphaController::NiAlphaController() NI_ALPHA_CONTROLLER_CONSTRUCT {} NiAlphaController::~NiAlphaController() {} -void NiAlphaController::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiAlphaController::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void NiAlphaController::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiAlphaController::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -24,7 +24,7 @@ string NiAlphaController::asString( bool verbose ) const { return InternalAsString( verbose ); } -void NiAlphaController::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiAlphaController::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } diff --git a/src/obj/NiAlphaProperty.cpp b/src/obj/NiAlphaProperty.cpp index b5752419e470da3ff54feed99019f49a22e7e4f3..9daaaaedea0a9ff354c7e83c011cf1277b60ebdc 100644 --- a/src/obj/NiAlphaProperty.cpp +++ b/src/obj/NiAlphaProperty.cpp @@ -11,11 +11,11 @@ NiAlphaProperty::NiAlphaProperty() NI_ALPHA_PROPERTY_CONSTRUCT {} NiAlphaProperty::~NiAlphaProperty() {} -void NiAlphaProperty::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiAlphaProperty::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void NiAlphaProperty::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiAlphaProperty::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -23,7 +23,7 @@ string NiAlphaProperty::asString( bool verbose ) const { return InternalAsString( verbose ); } -void NiAlphaProperty::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiAlphaProperty::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } @@ -35,11 +35,11 @@ const Type & NiAlphaProperty::GetType() const { return TYPE; }; -ushort NiAlphaProperty::GetFlags() const { +unsigned short NiAlphaProperty::GetFlags() const { return flags; } -void NiAlphaProperty::SetFlags( ushort n ) { +void NiAlphaProperty::SetFlags( unsigned short n ) { flags = n; } diff --git a/src/obj/NiAmbientLight.cpp b/src/obj/NiAmbientLight.cpp index 22f5822b367b8f8f4303adc6e2b113da8ebe95b4..39bd57bd85779bc289511f0b5543409a8799a1de 100644 --- a/src/obj/NiAmbientLight.cpp +++ b/src/obj/NiAmbientLight.cpp @@ -11,11 +11,11 @@ NiAmbientLight::NiAmbientLight() NI_AMBIENT_LIGHT_CONSTRUCT {} NiAmbientLight::~NiAmbientLight() {} -void NiAmbientLight::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiAmbientLight::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void NiAmbientLight::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiAmbientLight::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -23,7 +23,7 @@ string NiAmbientLight::asString( bool verbose ) const { return InternalAsString( verbose ); } -void NiAmbientLight::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiAmbientLight::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } diff --git a/src/obj/NiAutoNormalParticles.cpp b/src/obj/NiAutoNormalParticles.cpp index f3b9075d23c717cd70c147247153c318538de090..88aa1bca636a5058083135e65faef77024bab32f 100644 --- a/src/obj/NiAutoNormalParticles.cpp +++ b/src/obj/NiAutoNormalParticles.cpp @@ -11,11 +11,11 @@ NiAutoNormalParticles::NiAutoNormalParticles() NI_AUTO_NORMAL_PARTICLES_CONSTRUC NiAutoNormalParticles::~NiAutoNormalParticles() {} -void NiAutoNormalParticles::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiAutoNormalParticles::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void NiAutoNormalParticles::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiAutoNormalParticles::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -23,7 +23,7 @@ string NiAutoNormalParticles::asString( bool verbose ) const { return InternalAsString( verbose ); } -void NiAutoNormalParticles::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiAutoNormalParticles::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } diff --git a/src/obj/NiAutoNormalParticlesData.cpp b/src/obj/NiAutoNormalParticlesData.cpp index a85ee01b30a34c8312c6736e0cf1e5a13183cdb6..58926f236d0eb31a99fda77ecf2f32e9ed65f165 100644 --- a/src/obj/NiAutoNormalParticlesData.cpp +++ b/src/obj/NiAutoNormalParticlesData.cpp @@ -11,11 +11,11 @@ NiAutoNormalParticlesData::NiAutoNormalParticlesData() NI_AUTO_NORMAL_PARTICLES_ NiAutoNormalParticlesData::~NiAutoNormalParticlesData() {} -void NiAutoNormalParticlesData::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiAutoNormalParticlesData::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void NiAutoNormalParticlesData::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiAutoNormalParticlesData::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -23,7 +23,7 @@ string NiAutoNormalParticlesData::asString( bool verbose ) const { return InternalAsString( verbose ); } -void NiAutoNormalParticlesData::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiAutoNormalParticlesData::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } diff --git a/src/obj/NiBSAnimationNode.cpp b/src/obj/NiBSAnimationNode.cpp index 3c47514f05d31fe2a17ddf59f397f81be5251e6c..bd6f60ad4336ba698ac8fa58b8f353e0cf657458 100644 --- a/src/obj/NiBSAnimationNode.cpp +++ b/src/obj/NiBSAnimationNode.cpp @@ -11,11 +11,11 @@ NiBSAnimationNode::NiBSAnimationNode() NI_B_S_ANIMATION_NODE_CONSTRUCT {} NiBSAnimationNode::~NiBSAnimationNode() {} -void NiBSAnimationNode::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiBSAnimationNode::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void NiBSAnimationNode::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiBSAnimationNode::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -23,7 +23,7 @@ string NiBSAnimationNode::asString( bool verbose ) const { return InternalAsString( verbose ); } -void NiBSAnimationNode::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiBSAnimationNode::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } diff --git a/src/obj/NiBSBoneLODController.cpp b/src/obj/NiBSBoneLODController.cpp index e0b18a4045bd1d667667d51fa592a056aa07889e..e7ef405cc8a521f6bc64c568bb8ec281352875c1 100644 --- a/src/obj/NiBSBoneLODController.cpp +++ b/src/obj/NiBSBoneLODController.cpp @@ -11,11 +11,11 @@ NiBSBoneLODController::NiBSBoneLODController() NI_B_S_BONE_L_O_D_CONTROLLER_CONS NiBSBoneLODController::~NiBSBoneLODController() {} -void NiBSBoneLODController::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiBSBoneLODController::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void NiBSBoneLODController::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiBSBoneLODController::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -23,7 +23,7 @@ string NiBSBoneLODController::asString( bool verbose ) const { return InternalAsString( verbose ); } -void NiBSBoneLODController::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiBSBoneLODController::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } diff --git a/src/obj/NiBSPArrayController.cpp b/src/obj/NiBSPArrayController.cpp index e8128fe0e2fe383dea287974d8decafbcdc51e21..c119cd4e3567f114310f2af1b738d893b845a4e4 100644 --- a/src/obj/NiBSPArrayController.cpp +++ b/src/obj/NiBSPArrayController.cpp @@ -11,11 +11,11 @@ NiBSPArrayController::NiBSPArrayController() NI_B_S_P_ARRAY_CONTROLLER_CONSTRUCT NiBSPArrayController::~NiBSPArrayController() {} -void NiBSPArrayController::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiBSPArrayController::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void NiBSPArrayController::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiBSPArrayController::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -23,7 +23,7 @@ string NiBSPArrayController::asString( bool verbose ) const { return InternalAsString( verbose ); } -void NiBSPArrayController::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiBSPArrayController::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } diff --git a/src/obj/NiBSParticleNode.cpp b/src/obj/NiBSParticleNode.cpp index 5ee5e17f0b3d1451c8b0874584f4d64f525c5716..8c58a70bdb647c7951ebc056f0d83ebf579381a7 100644 --- a/src/obj/NiBSParticleNode.cpp +++ b/src/obj/NiBSParticleNode.cpp @@ -11,11 +11,11 @@ NiBSParticleNode::NiBSParticleNode() NI_B_S_PARTICLE_NODE_CONSTRUCT {} NiBSParticleNode::~NiBSParticleNode() {} -void NiBSParticleNode::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiBSParticleNode::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void NiBSParticleNode::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiBSParticleNode::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -23,7 +23,7 @@ string NiBSParticleNode::asString( bool verbose ) const { return InternalAsString( verbose ); } -void NiBSParticleNode::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiBSParticleNode::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } diff --git a/src/obj/NiBSplineBasisData.cpp b/src/obj/NiBSplineBasisData.cpp index 7dc74f3869c800e80a97fb914e9486f63fb562dd..a811cbbfc9c1e1dca1e566b0a9d8b6d16e674535 100644 --- a/src/obj/NiBSplineBasisData.cpp +++ b/src/obj/NiBSplineBasisData.cpp @@ -11,11 +11,11 @@ NiBSplineBasisData::NiBSplineBasisData() NI_B_SPLINE_BASIS_DATA_CONSTRUCT {} NiBSplineBasisData::~NiBSplineBasisData() {} -void NiBSplineBasisData::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiBSplineBasisData::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void NiBSplineBasisData::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiBSplineBasisData::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -23,7 +23,7 @@ string NiBSplineBasisData::asString( bool verbose ) const { return InternalAsString( verbose ); } -void NiBSplineBasisData::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiBSplineBasisData::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } @@ -35,11 +35,11 @@ const Type & NiBSplineBasisData::GetType() const { return TYPE; }; -uint NiBSplineBasisData::GetNumControlPt() const { +unsigned int NiBSplineBasisData::GetNumControlPt() const { return numControlPt; } -void NiBSplineBasisData::SetNumControlPt( uint value ) { +void NiBSplineBasisData::SetNumControlPt( unsigned int value ) { numControlPt = value; } diff --git a/src/obj/NiBSplineCompFloatInterpolator.cpp b/src/obj/NiBSplineCompFloatInterpolator.cpp index c43b6031b2230f635666e070acd87bbb25097053..d9c607bdfbabe8ff937063504c4984ec964e7993 100644 --- a/src/obj/NiBSplineCompFloatInterpolator.cpp +++ b/src/obj/NiBSplineCompFloatInterpolator.cpp @@ -11,11 +11,11 @@ NiBSplineCompFloatInterpolator::NiBSplineCompFloatInterpolator() NI_B_SPLINE_COM NiBSplineCompFloatInterpolator::~NiBSplineCompFloatInterpolator() {} -void NiBSplineCompFloatInterpolator::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiBSplineCompFloatInterpolator::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void NiBSplineCompFloatInterpolator::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiBSplineCompFloatInterpolator::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -23,7 +23,7 @@ string NiBSplineCompFloatInterpolator::asString( bool verbose ) const { return InternalAsString( verbose ); } -void NiBSplineCompFloatInterpolator::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiBSplineCompFloatInterpolator::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } diff --git a/src/obj/NiBSplineCompPoint3Interpolator.cpp b/src/obj/NiBSplineCompPoint3Interpolator.cpp index bbaa3523c059cb34829963c7a6ce693b4cdb26bf..37b6372243718e1218dff2b8f17390d2eae323c0 100644 --- a/src/obj/NiBSplineCompPoint3Interpolator.cpp +++ b/src/obj/NiBSplineCompPoint3Interpolator.cpp @@ -11,11 +11,11 @@ NiBSplineCompPoint3Interpolator::NiBSplineCompPoint3Interpolator() NI_B_SPLINE_C NiBSplineCompPoint3Interpolator::~NiBSplineCompPoint3Interpolator() {} -void NiBSplineCompPoint3Interpolator::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiBSplineCompPoint3Interpolator::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void NiBSplineCompPoint3Interpolator::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiBSplineCompPoint3Interpolator::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -23,7 +23,7 @@ string NiBSplineCompPoint3Interpolator::asString( bool verbose ) const { return InternalAsString( verbose ); } -void NiBSplineCompPoint3Interpolator::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiBSplineCompPoint3Interpolator::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } diff --git a/src/obj/NiBSplineCompTransformInterpolator.cpp b/src/obj/NiBSplineCompTransformInterpolator.cpp index 64cd5c0edae8dd13896a02985c96129c5dc9fa71..b2c1109abfb7d4c1535b4f6f880db7b08c50a28f 100644 --- a/src/obj/NiBSplineCompTransformInterpolator.cpp +++ b/src/obj/NiBSplineCompTransformInterpolator.cpp @@ -17,11 +17,11 @@ NiBSplineCompTransformInterpolator::NiBSplineCompTransformInterpolator() NI_B_SP NiBSplineCompTransformInterpolator::~NiBSplineCompTransformInterpolator() {} -void NiBSplineCompTransformInterpolator::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiBSplineCompTransformInterpolator::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void NiBSplineCompTransformInterpolator::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiBSplineCompTransformInterpolator::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -29,7 +29,7 @@ string NiBSplineCompTransformInterpolator::asString( bool verbose ) const { return InternalAsString( verbose ); } -void NiBSplineCompTransformInterpolator::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiBSplineCompTransformInterpolator::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } diff --git a/src/obj/NiBSplineData.cpp b/src/obj/NiBSplineData.cpp index 1953b0a1aa00af91c1f5e9f38ee6107e7a2121f3..ba39d834b75488719391a49a34f923e279a82930 100644 --- a/src/obj/NiBSplineData.cpp +++ b/src/obj/NiBSplineData.cpp @@ -11,11 +11,11 @@ NiBSplineData::NiBSplineData() NI_B_SPLINE_DATA_CONSTRUCT {} NiBSplineData::~NiBSplineData() {} -void NiBSplineData::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiBSplineData::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void NiBSplineData::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiBSplineData::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -23,7 +23,7 @@ string NiBSplineData::asString( bool verbose ) const { return InternalAsString( verbose ); } -void NiBSplineData::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiBSplineData::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } diff --git a/src/obj/NiBSplineInterpolator.cpp b/src/obj/NiBSplineInterpolator.cpp index a8f9f6ae798ea8b4979ff737513fba7afb587881..a0b4769a87b6affe5b3628af0c0ba88f14eae163 100644 --- a/src/obj/NiBSplineInterpolator.cpp +++ b/src/obj/NiBSplineInterpolator.cpp @@ -13,11 +13,11 @@ NiBSplineInterpolator::NiBSplineInterpolator() NI_B_SPLINE_INTERPOLATOR_CONSTRUC NiBSplineInterpolator::~NiBSplineInterpolator() {} -void NiBSplineInterpolator::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiBSplineInterpolator::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void NiBSplineInterpolator::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiBSplineInterpolator::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -25,7 +25,7 @@ string NiBSplineInterpolator::asString( bool verbose ) const { return InternalAsString( verbose ); } -void NiBSplineInterpolator::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiBSplineInterpolator::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } diff --git a/src/obj/NiBillboardNode.cpp b/src/obj/NiBillboardNode.cpp index 2246514f4e4c3bc14ccd562b441c6cc28ad38e0f..e28cded9e62807ee6fd9d8ae73d4e54e30ff7cb5 100644 --- a/src/obj/NiBillboardNode.cpp +++ b/src/obj/NiBillboardNode.cpp @@ -11,11 +11,11 @@ NiBillboardNode::NiBillboardNode() NI_BILLBOARD_NODE_CONSTRUCT {} NiBillboardNode::~NiBillboardNode() {} -void NiBillboardNode::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiBillboardNode::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void NiBillboardNode::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiBillboardNode::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -23,7 +23,7 @@ string NiBillboardNode::asString( bool verbose ) const { return InternalAsString( verbose ); } -void NiBillboardNode::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiBillboardNode::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } diff --git a/src/obj/NiBinaryExtraData.cpp b/src/obj/NiBinaryExtraData.cpp index a52504dd690a01fef5228b43a4a9c08f14599c82..6f50f514513141717a5004dbfb877802ac77853c 100644 --- a/src/obj/NiBinaryExtraData.cpp +++ b/src/obj/NiBinaryExtraData.cpp @@ -12,11 +12,11 @@ NiBinaryExtraData::NiBinaryExtraData() NI_BINARY_EXTRA_DATA_CONSTRUCT {} NiBinaryExtraData::~NiBinaryExtraData() {} -void NiBinaryExtraData::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiBinaryExtraData::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void NiBinaryExtraData::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiBinaryExtraData::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -24,7 +24,7 @@ string NiBinaryExtraData::asString( bool verbose ) const { return InternalAsString( verbose ); } -void NiBinaryExtraData::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiBinaryExtraData::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } @@ -42,6 +42,6 @@ vector<byte> NiBinaryExtraData::GetData() const { }; void NiBinaryExtraData::SetData( const vector<byte> & n ) { - binaryData.dataSize = uint(n.size()); + binaryData.dataSize = unsigned int(n.size()); binaryData.data = n; }; diff --git a/src/obj/NiBlendBoolInterpolator.cpp b/src/obj/NiBlendBoolInterpolator.cpp index 4de61d17d287c257989d534fb0f987fa04bde638..24e392c5508c3d35d7d5c16ca8b9c6261fda67c5 100644 --- a/src/obj/NiBlendBoolInterpolator.cpp +++ b/src/obj/NiBlendBoolInterpolator.cpp @@ -11,11 +11,11 @@ NiBlendBoolInterpolator::NiBlendBoolInterpolator() NI_BLEND_BOOL_INTERPOLATOR_CO NiBlendBoolInterpolator::~NiBlendBoolInterpolator() {} -void NiBlendBoolInterpolator::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiBlendBoolInterpolator::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void NiBlendBoolInterpolator::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiBlendBoolInterpolator::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -23,7 +23,7 @@ string NiBlendBoolInterpolator::asString( bool verbose ) const { return InternalAsString( verbose ); } -void NiBlendBoolInterpolator::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiBlendBoolInterpolator::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } diff --git a/src/obj/NiBlendFloatInterpolator.cpp b/src/obj/NiBlendFloatInterpolator.cpp index 21635b0ce9db7349b66bd08b1e29e74840b29e85..359b55acdc0b38bb194ad8a494162a1941b6157a 100644 --- a/src/obj/NiBlendFloatInterpolator.cpp +++ b/src/obj/NiBlendFloatInterpolator.cpp @@ -11,11 +11,11 @@ NiBlendFloatInterpolator::NiBlendFloatInterpolator() NI_BLEND_FLOAT_INTERPOLATOR NiBlendFloatInterpolator::~NiBlendFloatInterpolator() {} -void NiBlendFloatInterpolator::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiBlendFloatInterpolator::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void NiBlendFloatInterpolator::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiBlendFloatInterpolator::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -23,7 +23,7 @@ string NiBlendFloatInterpolator::asString( bool verbose ) const { return InternalAsString( verbose ); } -void NiBlendFloatInterpolator::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiBlendFloatInterpolator::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } diff --git a/src/obj/NiBlendInterpolator.cpp b/src/obj/NiBlendInterpolator.cpp index 2883bd76c8e1f81d963c13c9739e4b29477903a9..19af68d4fc2f90abe5cb61d9bb3aae8fa628091a 100644 --- a/src/obj/NiBlendInterpolator.cpp +++ b/src/obj/NiBlendInterpolator.cpp @@ -11,11 +11,11 @@ NiBlendInterpolator::NiBlendInterpolator() NI_BLEND_INTERPOLATOR_CONSTRUCT {} NiBlendInterpolator::~NiBlendInterpolator() {} -void NiBlendInterpolator::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiBlendInterpolator::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void NiBlendInterpolator::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiBlendInterpolator::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -23,7 +23,7 @@ string NiBlendInterpolator::asString( bool verbose ) const { return InternalAsString( verbose ); } -void NiBlendInterpolator::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiBlendInterpolator::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } diff --git a/src/obj/NiBlendPoint3Interpolator.cpp b/src/obj/NiBlendPoint3Interpolator.cpp index 72cf6930cf7b15a85b8df571cfeea371d615a8de..9e3516a573e42735b6362059678957134022f576 100644 --- a/src/obj/NiBlendPoint3Interpolator.cpp +++ b/src/obj/NiBlendPoint3Interpolator.cpp @@ -11,11 +11,11 @@ NiBlendPoint3Interpolator::NiBlendPoint3Interpolator() NI_BLEND_POINT3_INTERPOLA NiBlendPoint3Interpolator::~NiBlendPoint3Interpolator() {} -void NiBlendPoint3Interpolator::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiBlendPoint3Interpolator::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void NiBlendPoint3Interpolator::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiBlendPoint3Interpolator::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -23,7 +23,7 @@ string NiBlendPoint3Interpolator::asString( bool verbose ) const { return InternalAsString( verbose ); } -void NiBlendPoint3Interpolator::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiBlendPoint3Interpolator::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } diff --git a/src/obj/NiBlendTransformInterpolator.cpp b/src/obj/NiBlendTransformInterpolator.cpp index e7a880d7ef252fd4a3471505faf17d18bebbdb53..5c2da8e0bd2765a6e1c20966a5130aaa47917b27 100644 --- a/src/obj/NiBlendTransformInterpolator.cpp +++ b/src/obj/NiBlendTransformInterpolator.cpp @@ -11,11 +11,11 @@ NiBlendTransformInterpolator::NiBlendTransformInterpolator() NI_BLEND_TRANSFORM_ NiBlendTransformInterpolator::~NiBlendTransformInterpolator() {} -void NiBlendTransformInterpolator::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiBlendTransformInterpolator::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void NiBlendTransformInterpolator::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiBlendTransformInterpolator::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -23,7 +23,7 @@ string NiBlendTransformInterpolator::asString( bool verbose ) const { return InternalAsString( verbose ); } -void NiBlendTransformInterpolator::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiBlendTransformInterpolator::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } diff --git a/src/obj/NiBoneLODController.cpp b/src/obj/NiBoneLODController.cpp index 7c74d0cbc03d147fd9fc2afa64a50a9d98eca8af..c99823ecdca0fb1fa20138537fbe258558decdb6 100644 --- a/src/obj/NiBoneLODController.cpp +++ b/src/obj/NiBoneLODController.cpp @@ -15,11 +15,11 @@ NiBoneLODController::NiBoneLODController() NI_BONE_L_O_D_CONTROLLER_CONSTRUCT {} NiBoneLODController::~NiBoneLODController() {} -void NiBoneLODController::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiBoneLODController::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void NiBoneLODController::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiBoneLODController::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -27,7 +27,7 @@ string NiBoneLODController::asString( bool verbose ) const { return InternalAsString( verbose ); } -void NiBoneLODController::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiBoneLODController::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } diff --git a/src/obj/NiBoolData.cpp b/src/obj/NiBoolData.cpp index bef4272e4d569c31744aadbd4c25a703effa2836..dca8d06b00a41359d09960241bae89d4e2731e97 100644 --- a/src/obj/NiBoolData.cpp +++ b/src/obj/NiBoolData.cpp @@ -12,11 +12,11 @@ NiBoolData::NiBoolData() NI_BOOL_DATA_CONSTRUCT {} NiBoolData::~NiBoolData() {} -void NiBoolData::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiBoolData::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void NiBoolData::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiBoolData::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -24,7 +24,7 @@ string NiBoolData::asString( bool verbose ) const { return InternalAsString( verbose ); } -void NiBoolData::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiBoolData::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } diff --git a/src/obj/NiBoolInterpolator.cpp b/src/obj/NiBoolInterpolator.cpp index 31f9470a36e43f7f4e06619f01feefbc76c02f99..1bec50c3e7febd9fbedd1033a81dd73baa40b6e7 100644 --- a/src/obj/NiBoolInterpolator.cpp +++ b/src/obj/NiBoolInterpolator.cpp @@ -12,11 +12,11 @@ NiBoolInterpolator::NiBoolInterpolator() NI_BOOL_INTERPOLATOR_CONSTRUCT {} NiBoolInterpolator::~NiBoolInterpolator() {} -void NiBoolInterpolator::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiBoolInterpolator::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void NiBoolInterpolator::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiBoolInterpolator::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -24,7 +24,7 @@ string NiBoolInterpolator::asString( bool verbose ) const { return InternalAsString( verbose ); } -void NiBoolInterpolator::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiBoolInterpolator::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } diff --git a/src/obj/NiBoolTimelineInterpolator.cpp b/src/obj/NiBoolTimelineInterpolator.cpp index 78090f37943e16a947e23a60b67cbb5b9d2dbe60..d97ade3c208c82e3bc392ae04b13c16dd534cb49 100644 --- a/src/obj/NiBoolTimelineInterpolator.cpp +++ b/src/obj/NiBoolTimelineInterpolator.cpp @@ -12,11 +12,11 @@ NiBoolTimelineInterpolator::NiBoolTimelineInterpolator() NI_BOOL_TIMELINE_INTERP NiBoolTimelineInterpolator::~NiBoolTimelineInterpolator() {} -void NiBoolTimelineInterpolator::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiBoolTimelineInterpolator::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void NiBoolTimelineInterpolator::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiBoolTimelineInterpolator::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -24,7 +24,7 @@ string NiBoolTimelineInterpolator::asString( bool verbose ) const { return InternalAsString( verbose ); } -void NiBoolTimelineInterpolator::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiBoolTimelineInterpolator::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } diff --git a/src/obj/NiBooleanExtraData.cpp b/src/obj/NiBooleanExtraData.cpp index 293181510a2e4473c00f51c0f551a42685c4ea8f..1dc989140f8ee7b1d9935ea0ead37068ad304ea4 100644 --- a/src/obj/NiBooleanExtraData.cpp +++ b/src/obj/NiBooleanExtraData.cpp @@ -11,11 +11,11 @@ NiBooleanExtraData::NiBooleanExtraData() NI_BOOLEAN_EXTRA_DATA_CONSTRUCT {} NiBooleanExtraData::~NiBooleanExtraData() {} -void NiBooleanExtraData::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiBooleanExtraData::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void NiBooleanExtraData::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiBooleanExtraData::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -23,7 +23,7 @@ string NiBooleanExtraData::asString( bool verbose ) const { return InternalAsString( verbose ); } -void NiBooleanExtraData::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiBooleanExtraData::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } diff --git a/src/obj/NiCamera.cpp b/src/obj/NiCamera.cpp index c9d36eb7f6edf3d4fafec2cc60de7f8587a90a61..b182bee6f11dc62fbc85a144e87e67cca2b26934 100644 --- a/src/obj/NiCamera.cpp +++ b/src/obj/NiCamera.cpp @@ -12,11 +12,11 @@ NiCamera::NiCamera() NI_CAMERA_CONSTRUCT {} NiCamera::~NiCamera() {} -void NiCamera::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiCamera::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void NiCamera::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiCamera::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -24,7 +24,7 @@ string NiCamera::asString( bool verbose ) const { return InternalAsString( verbose ); } -void NiCamera::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiCamera::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } diff --git a/src/obj/NiClod.cpp b/src/obj/NiClod.cpp index 3f0d2818f530d818853fb2799846cd95fa4fb622..4ec0302d620993fd376bc5903a5e8bad3c3df229 100644 --- a/src/obj/NiClod.cpp +++ b/src/obj/NiClod.cpp @@ -11,11 +11,11 @@ NiClod::NiClod() NI_CLOD_CONSTRUCT {} NiClod::~NiClod() {} -void NiClod::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiClod::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void NiClod::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiClod::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -23,7 +23,7 @@ string NiClod::asString( bool verbose ) const { return InternalAsString( verbose ); } -void NiClod::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiClod::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } diff --git a/src/obj/NiClodData.cpp b/src/obj/NiClodData.cpp index 9a7ccc70589c837ff95e0e85b7778ff8c2bffc34..7587af46c8b30429a73ab78ce28632c1f8be459f 100644 --- a/src/obj/NiClodData.cpp +++ b/src/obj/NiClodData.cpp @@ -11,11 +11,11 @@ NiClodData::NiClodData() NI_CLOD_DATA_CONSTRUCT {} NiClodData::~NiClodData() {} -void NiClodData::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiClodData::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void NiClodData::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiClodData::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -23,7 +23,7 @@ string NiClodData::asString( bool verbose ) const { return InternalAsString( verbose ); } -void NiClodData::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiClodData::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } diff --git a/src/obj/NiClodSkinInstance.cpp b/src/obj/NiClodSkinInstance.cpp index b9cec0d78e3f47be6331659ef36a70f851194949..9100ba6b09314cd5c12c606ce1e1aedb0815c4a2 100644 --- a/src/obj/NiClodSkinInstance.cpp +++ b/src/obj/NiClodSkinInstance.cpp @@ -11,11 +11,11 @@ NiClodSkinInstance::NiClodSkinInstance() NI_CLOD_SKIN_INSTANCE_CONSTRUCT {} NiClodSkinInstance::~NiClodSkinInstance() {} -void NiClodSkinInstance::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiClodSkinInstance::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void NiClodSkinInstance::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiClodSkinInstance::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -23,7 +23,7 @@ string NiClodSkinInstance::asString( bool verbose ) const { return InternalAsString( verbose ); } -void NiClodSkinInstance::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiClodSkinInstance::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } diff --git a/src/obj/NiCollisionData.cpp b/src/obj/NiCollisionData.cpp index 226e4b67c707821082c8dd5da4b947c008f7aba6..86d1e73f2aae0231fd9d594c34558645dce53d91 100644 --- a/src/obj/NiCollisionData.cpp +++ b/src/obj/NiCollisionData.cpp @@ -12,11 +12,11 @@ NiCollisionData::NiCollisionData() NI_COLLISION_DATA_CONSTRUCT {} NiCollisionData::~NiCollisionData() {} -void NiCollisionData::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiCollisionData::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void NiCollisionData::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiCollisionData::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -24,7 +24,7 @@ string NiCollisionData::asString( bool verbose ) const { return InternalAsString( verbose ); } -void NiCollisionData::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiCollisionData::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } diff --git a/src/obj/NiCollisionObject.cpp b/src/obj/NiCollisionObject.cpp index a6694827d76aa4f0e80b8f0c1b621dae402349ad..e528f8260db2cd223a3f72adfbf55c8407390aae 100644 --- a/src/obj/NiCollisionObject.cpp +++ b/src/obj/NiCollisionObject.cpp @@ -13,11 +13,11 @@ NiCollisionObject::NiCollisionObject() NI_COLLISION_OBJECT_CONSTRUCT {} NiCollisionObject::~NiCollisionObject() {} -void NiCollisionObject::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiCollisionObject::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void NiCollisionObject::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiCollisionObject::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -25,7 +25,7 @@ string NiCollisionObject::asString( bool verbose ) const { return InternalAsString( verbose ); } -void NiCollisionObject::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiCollisionObject::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } diff --git a/src/obj/NiColorData.cpp b/src/obj/NiColorData.cpp index 5053959727a51f5c68f3a640ea7362aa5b3c3889..cd6b888d256b1ad128f218d0448cd95954d0f5e5 100644 --- a/src/obj/NiColorData.cpp +++ b/src/obj/NiColorData.cpp @@ -12,11 +12,11 @@ NiColorData::NiColorData() NI_COLOR_DATA_CONSTRUCT {} NiColorData::~NiColorData() {} -void NiColorData::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiColorData::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void NiColorData::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiColorData::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -24,7 +24,7 @@ string NiColorData::asString( bool verbose ) const { return InternalAsString( verbose ); } -void NiColorData::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiColorData::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } diff --git a/src/obj/NiColorExtraData.cpp b/src/obj/NiColorExtraData.cpp index 6ff24eaf106c617369c051942b0a3cd9d3eed4b9..64666279bce9c2c326cf4c2625fd2909caca55e1 100644 --- a/src/obj/NiColorExtraData.cpp +++ b/src/obj/NiColorExtraData.cpp @@ -11,11 +11,11 @@ NiColorExtraData::NiColorExtraData() NI_COLOR_EXTRA_DATA_CONSTRUCT {} NiColorExtraData::~NiColorExtraData() {} -void NiColorExtraData::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiColorExtraData::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void NiColorExtraData::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiColorExtraData::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -23,7 +23,7 @@ string NiColorExtraData::asString( bool verbose ) const { return InternalAsString( verbose ); } -void NiColorExtraData::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiColorExtraData::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } diff --git a/src/obj/NiControllerManager.cpp b/src/obj/NiControllerManager.cpp index 723e0ebec79846dbee4899c0a7cc52a5af987fbf..174882647c570745b46306456a9dee7b496958ff 100644 --- a/src/obj/NiControllerManager.cpp +++ b/src/obj/NiControllerManager.cpp @@ -14,11 +14,11 @@ NiControllerManager::NiControllerManager() NI_CONTROLLER_MANAGER_CONSTRUCT {} NiControllerManager::~NiControllerManager() {} -void NiControllerManager::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiControllerManager::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void NiControllerManager::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiControllerManager::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -26,7 +26,7 @@ string NiControllerManager::asString( bool verbose ) const { return InternalAsString( verbose ); } -void NiControllerManager::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiControllerManager::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } diff --git a/src/obj/NiControllerSequence.cpp b/src/obj/NiControllerSequence.cpp index bb320f0c551fc5f588751ec2e6e65f45b4138abb..bc5adc2e80f2380873147dd98a8998ca345c2d0b 100644 --- a/src/obj/NiControllerSequence.cpp +++ b/src/obj/NiControllerSequence.cpp @@ -23,11 +23,11 @@ NiControllerSequence::NiControllerSequence() NI_CONTROLLER_SEQUENCE_CONSTRUCT {} NiControllerSequence::~NiControllerSequence() {} -void NiControllerSequence::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiControllerSequence::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void NiControllerSequence::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiControllerSequence::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -35,7 +35,7 @@ string NiControllerSequence::asString( bool verbose ) const { return InternalAsString( verbose ); } -void NiControllerSequence::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiControllerSequence::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } diff --git a/src/obj/NiDefaultAVObjectPalette.cpp b/src/obj/NiDefaultAVObjectPalette.cpp index 33a46486725af73253bad9c4420f8950c207613a..ef63517cd3a41df9dce5b3c0ac9975dec92d1bbe 100644 --- a/src/obj/NiDefaultAVObjectPalette.cpp +++ b/src/obj/NiDefaultAVObjectPalette.cpp @@ -13,11 +13,11 @@ NiDefaultAVObjectPalette::NiDefaultAVObjectPalette() NI_DEFAULT_A_V_OBJECT_PALET NiDefaultAVObjectPalette::~NiDefaultAVObjectPalette() {} -void NiDefaultAVObjectPalette::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiDefaultAVObjectPalette::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void NiDefaultAVObjectPalette::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiDefaultAVObjectPalette::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -25,7 +25,7 @@ string NiDefaultAVObjectPalette::asString( bool verbose ) const { return InternalAsString( verbose ); } -void NiDefaultAVObjectPalette::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiDefaultAVObjectPalette::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } diff --git a/src/obj/NiDirectionalLight.cpp b/src/obj/NiDirectionalLight.cpp index c5c0bd43be5ad1b80b4fa113269f207c97d89d84..026e66bbb2ce965c56090ea8661a9c6f4e44e3ba 100644 --- a/src/obj/NiDirectionalLight.cpp +++ b/src/obj/NiDirectionalLight.cpp @@ -11,11 +11,11 @@ NiDirectionalLight::NiDirectionalLight() NI_DIRECTIONAL_LIGHT_CONSTRUCT {} NiDirectionalLight::~NiDirectionalLight() {} -void NiDirectionalLight::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiDirectionalLight::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void NiDirectionalLight::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiDirectionalLight::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -23,7 +23,7 @@ string NiDirectionalLight::asString( bool verbose ) const { return InternalAsString( verbose ); } -void NiDirectionalLight::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiDirectionalLight::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } diff --git a/src/obj/NiDitherProperty.cpp b/src/obj/NiDitherProperty.cpp index dcfef6f2b58e384e09ceb8a8d6fc7fe97e564870..7f76d97300a2807eea03e942982792d0b71bac46 100644 --- a/src/obj/NiDitherProperty.cpp +++ b/src/obj/NiDitherProperty.cpp @@ -11,11 +11,11 @@ NiDitherProperty::NiDitherProperty() NI_DITHER_PROPERTY_CONSTRUCT {} NiDitherProperty::~NiDitherProperty() {} -void NiDitherProperty::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiDitherProperty::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void NiDitherProperty::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiDitherProperty::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -23,7 +23,7 @@ string NiDitherProperty::asString( bool verbose ) const { return InternalAsString( verbose ); } -void NiDitherProperty::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiDitherProperty::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } @@ -35,11 +35,11 @@ const Type & NiDitherProperty::GetType() const { return TYPE; }; -ushort NiDitherProperty::GetFlags() const { +unsigned short NiDitherProperty::GetFlags() const { return flags; } -void NiDitherProperty::SetFlags( ushort n ) { +void NiDitherProperty::SetFlags( unsigned short n ) { flags = n; } diff --git a/src/obj/NiDynamicEffect.cpp b/src/obj/NiDynamicEffect.cpp index 4c80666cc23dd8002d554c107e635c79a19877b8..79630feab9ae5bc28b173838b99309ed7ce0fcdf 100644 --- a/src/obj/NiDynamicEffect.cpp +++ b/src/obj/NiDynamicEffect.cpp @@ -12,11 +12,11 @@ NiDynamicEffect::NiDynamicEffect() NI_DYNAMIC_EFFECT_CONSTRUCT {} NiDynamicEffect::~NiDynamicEffect() {} -void NiDynamicEffect::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiDynamicEffect::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void NiDynamicEffect::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiDynamicEffect::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -24,7 +24,7 @@ string NiDynamicEffect::asString( bool verbose ) const { return InternalAsString( verbose ); } -void NiDynamicEffect::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiDynamicEffect::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } @@ -56,7 +56,7 @@ vector<unsigned int> NiDynamicEffect::GetAffectedNodeListPointers() const { return affectedNodeListPointers; } -void NiDynamicEffect::SetAffectedNodeListPointers( const vector<uint >& value ) { +void NiDynamicEffect::SetAffectedNodeListPointers( const vector<unsigned int >& value ) { affectedNodeListPointers = value; } diff --git a/src/obj/NiExtraData.cpp b/src/obj/NiExtraData.cpp index 800894b4376f68853803f52f819953c651403ab0..6a7a172b57fa2b32772eb234641a46cdb455cf91 100644 --- a/src/obj/NiExtraData.cpp +++ b/src/obj/NiExtraData.cpp @@ -11,11 +11,11 @@ NiExtraData::NiExtraData() NI_EXTRA_DATA_CONSTRUCT {} NiExtraData::~NiExtraData() {} -void NiExtraData::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiExtraData::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void NiExtraData::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiExtraData::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -23,7 +23,7 @@ string NiExtraData::asString( bool verbose ) const { return InternalAsString( verbose ); } -void NiExtraData::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiExtraData::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } diff --git a/src/obj/NiFlipController.cpp b/src/obj/NiFlipController.cpp index 51a7338f2e8ab5c8cb5efcfd9e6e6990782e6ca7..ee08b648dd3953bdee4ca8d9cbc96c911829e24f 100644 --- a/src/obj/NiFlipController.cpp +++ b/src/obj/NiFlipController.cpp @@ -12,11 +12,11 @@ NiFlipController::NiFlipController() NI_FLIP_CONTROLLER_CONSTRUCT {} NiFlipController::~NiFlipController() {} -void NiFlipController::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiFlipController::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void NiFlipController::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiFlipController::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -24,7 +24,7 @@ string NiFlipController::asString( bool verbose ) const { return InternalAsString( verbose ); } -void NiFlipController::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiFlipController::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } diff --git a/src/obj/NiFloatData.cpp b/src/obj/NiFloatData.cpp index 0541822caf2ed1dce0326edfe1526af3d72d5e5f..50767380ce123ec228f4b9da3d65b82ec42bfa85 100644 --- a/src/obj/NiFloatData.cpp +++ b/src/obj/NiFloatData.cpp @@ -12,11 +12,11 @@ NiFloatData::NiFloatData() NI_FLOAT_DATA_CONSTRUCT {} NiFloatData::~NiFloatData() {} -void NiFloatData::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiFloatData::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void NiFloatData::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiFloatData::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -24,7 +24,7 @@ string NiFloatData::asString( bool verbose ) const { return InternalAsString( verbose ); } -void NiFloatData::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiFloatData::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } diff --git a/src/obj/NiFloatExtraData.cpp b/src/obj/NiFloatExtraData.cpp index 4f78876d3503d7d66990a559f72a8ee60df2a033..3ea46f753ebbfcbe7e3fcd5b43d548b00fa9d5fa 100644 --- a/src/obj/NiFloatExtraData.cpp +++ b/src/obj/NiFloatExtraData.cpp @@ -11,11 +11,11 @@ NiFloatExtraData::NiFloatExtraData() NI_FLOAT_EXTRA_DATA_CONSTRUCT {} NiFloatExtraData::~NiFloatExtraData() {} -void NiFloatExtraData::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiFloatExtraData::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void NiFloatExtraData::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiFloatExtraData::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -23,7 +23,7 @@ string NiFloatExtraData::asString( bool verbose ) const { return InternalAsString( verbose ); } -void NiFloatExtraData::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiFloatExtraData::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } diff --git a/src/obj/NiFloatExtraDataController.cpp b/src/obj/NiFloatExtraDataController.cpp index 2b95c224e5717894608f82dec1facb1ce1dc7061..3faf71bf6753fde21c95e63471d22a67e00b54fe 100644 --- a/src/obj/NiFloatExtraDataController.cpp +++ b/src/obj/NiFloatExtraDataController.cpp @@ -12,11 +12,11 @@ NiFloatExtraDataController::NiFloatExtraDataController() NI_FLOAT_EXTRA_DATA_CON NiFloatExtraDataController::~NiFloatExtraDataController() {} -void NiFloatExtraDataController::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiFloatExtraDataController::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void NiFloatExtraDataController::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiFloatExtraDataController::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -24,7 +24,7 @@ string NiFloatExtraDataController::asString( bool verbose ) const { return InternalAsString( verbose ); } -void NiFloatExtraDataController::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiFloatExtraDataController::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } diff --git a/src/obj/NiFloatInterpolator.cpp b/src/obj/NiFloatInterpolator.cpp index 180f5648ceac327d63eaed285a86012afed3df52..9398b635fb28469b707157ea6c9960d2353ca0c5 100644 --- a/src/obj/NiFloatInterpolator.cpp +++ b/src/obj/NiFloatInterpolator.cpp @@ -12,11 +12,11 @@ NiFloatInterpolator::NiFloatInterpolator() NI_FLOAT_INTERPOLATOR_CONSTRUCT {} NiFloatInterpolator::~NiFloatInterpolator() {} -void NiFloatInterpolator::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiFloatInterpolator::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void NiFloatInterpolator::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiFloatInterpolator::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -24,7 +24,7 @@ string NiFloatInterpolator::asString( bool verbose ) const { return InternalAsString( verbose ); } -void NiFloatInterpolator::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiFloatInterpolator::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } diff --git a/src/obj/NiFloatsExtraData.cpp b/src/obj/NiFloatsExtraData.cpp index dfb32fbc7ff14df8b17e7fe1c804313f82c4effa..064d08b7e0db0485481b27c3e4ce1b2c375fc092 100644 --- a/src/obj/NiFloatsExtraData.cpp +++ b/src/obj/NiFloatsExtraData.cpp @@ -11,11 +11,11 @@ NiFloatsExtraData::NiFloatsExtraData() NI_FLOATS_EXTRA_DATA_CONSTRUCT {} NiFloatsExtraData::~NiFloatsExtraData() {} -void NiFloatsExtraData::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiFloatsExtraData::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void NiFloatsExtraData::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiFloatsExtraData::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -23,7 +23,7 @@ string NiFloatsExtraData::asString( bool verbose ) const { return InternalAsString( verbose ); } -void NiFloatsExtraData::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiFloatsExtraData::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } @@ -40,6 +40,6 @@ vector<float> NiFloatsExtraData::GetData() const { } void NiFloatsExtraData::SetData( const vector<float> & n ) { - numFloats = uint(n.size()); + numFloats = unsigned int(n.size()); data = n; } diff --git a/src/obj/NiFogProperty.cpp b/src/obj/NiFogProperty.cpp index d73bd6a51233728d836eb7b0f4855bbf209993de..d09be0a21a07bed0cdf941bd51626d30b228727d 100644 --- a/src/obj/NiFogProperty.cpp +++ b/src/obj/NiFogProperty.cpp @@ -11,11 +11,11 @@ NiFogProperty::NiFogProperty() NI_FOG_PROPERTY_CONSTRUCT {} NiFogProperty::~NiFogProperty() {} -void NiFogProperty::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiFogProperty::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void NiFogProperty::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiFogProperty::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -23,7 +23,7 @@ string NiFogProperty::asString( bool verbose ) const { return InternalAsString( verbose ); } -void NiFogProperty::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiFogProperty::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } @@ -36,11 +36,11 @@ const Type & NiFogProperty::GetType() const { }; -ushort NiFogProperty::GetFlags() const { +unsigned short NiFogProperty::GetFlags() const { return flags; } -void NiFogProperty::SetFlags( ushort n ) { +void NiFogProperty::SetFlags( unsigned short n ) { flags = n; } diff --git a/src/obj/NiGeomMorpherController.cpp b/src/obj/NiGeomMorpherController.cpp index 30e53c217eb1d6802cf8b18720491bed8eead97c..a68a98ed321a4add63eb3e59520115a895d32a62 100644 --- a/src/obj/NiGeomMorpherController.cpp +++ b/src/obj/NiGeomMorpherController.cpp @@ -13,11 +13,11 @@ NiGeomMorpherController::NiGeomMorpherController() NI_GEOM_MORPHER_CONTROLLER_CO NiGeomMorpherController::~NiGeomMorpherController() {} -void NiGeomMorpherController::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiGeomMorpherController::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void NiGeomMorpherController::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiGeomMorpherController::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -25,7 +25,7 @@ string NiGeomMorpherController::asString( bool verbose ) const { return InternalAsString( verbose ); } -void NiGeomMorpherController::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiGeomMorpherController::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } @@ -42,7 +42,7 @@ vector< Ref<NiInterpolator> > NiGeomMorpherController::GetInterpolators() const } void NiGeomMorpherController::SetInterpolators( const vector< Ref<NiInterpolator> > & n ) { - numInterpolators = uint(n.size()); + numInterpolators = unsigned int(n.size()); interpolators = n; } diff --git a/src/obj/NiGeometry.cpp b/src/obj/NiGeometry.cpp index dbfe449490b470d75e20fd0d0ff30c68a3df797c..bffd82bb4959c83cedfc5f35b82cf87c209948b9 100644 --- a/src/obj/NiGeometry.cpp +++ b/src/obj/NiGeometry.cpp @@ -16,11 +16,11 @@ NiGeometry::NiGeometry() NI_GEOMETRY_CONSTRUCT {} NiGeometry::~NiGeometry() {} -void NiGeometry::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiGeometry::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void NiGeometry::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiGeometry::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -28,7 +28,7 @@ string NiGeometry::asString( bool verbose ) const { return InternalAsString( verbose ); } -void NiGeometry::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiGeometry::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } @@ -311,14 +311,14 @@ void NiGeometry::GetSkinDeformation( vector<Vector3> & vertices, vector<Vector3> //Transform vertices into position based on skin data Matrix44 root_world = skel_root->GetWorldTransform(); Matrix44 geom_world = GetWorldTransform(); - for ( uint i = 0; i < skin_data->GetBoneCount(); ++i ) { + for ( unsigned int i = 0; i < skin_data->GetBoneCount(); ++i ) { Matrix44 bone_world = bone_nodes[i]->GetWorldTransform(); Matrix44 bone_offset = skin_data->GetBoneTransform(i); vector<SkinWeight> weights = skin_data->GetBoneWeights(i); Matrix44 vert_trans = bone_offset * bone_world; Matrix44 norm_trans = Matrix44( vert_trans.GetRotation() ); - for ( uint j = 0; j < weights.size(); ++j ) { - uint index = weights[j].index; + for ( unsigned int j = 0; j < weights.size(); ++j ) { + unsigned int index = weights[j].index; float weight = weights[j].weight; if ( index < vertices.size() ) { vertices[index] += (vert_trans * in_verts[index] ) * weight; @@ -332,10 +332,10 @@ void NiGeometry::GetSkinDeformation( vector<Vector3> & vertices, vector<Vector3> //Transform all vertices to final position Matrix44 geom_world_inv = geom_world.Inverse(); Matrix44 geom_world_inv_rot = Matrix44( geom_world_inv.GetRotation() ); - for ( uint i = 0; i < vertices.size(); ++i ) { + for ( unsigned int i = 0; i < vertices.size(); ++i ) { vertices[i] = geom_world_inv * vertices[i]; } - for ( uint i = 0; i < normals.size(); ++i ) { + for ( unsigned int i = 0; i < normals.size(); ++i ) { normals[i] = geom_world_inv_rot * normals[i]; //normals[i] = normals[i].Normalized(); } @@ -412,7 +412,7 @@ static void CalcCenteredSphere(const vector<SkinWeight> & n, const vector<Vector } } -void NiGeometry::SetBoneWeights( uint bone_index, const vector<SkinWeight> & n ) { +void NiGeometry::SetBoneWeights( unsigned int bone_index, const vector<SkinWeight> & n ) { if ( n.size() == 0 ) { throw runtime_error( "You must specify at least one weight value." ); diff --git a/src/obj/NiGeometryData.cpp b/src/obj/NiGeometryData.cpp index 4626f4d004e68f654d0b1cd7269584aaf5dc20f6..befd0d2c10135a6eafd831dd4e9a76aeecdfd09d 100644 --- a/src/obj/NiGeometryData.cpp +++ b/src/obj/NiGeometryData.cpp @@ -12,11 +12,11 @@ NiGeometryData::NiGeometryData() NI_GEOMETRY_DATA_CONSTRUCT {} NiGeometryData::~NiGeometryData() {} -void NiGeometryData::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiGeometryData::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void NiGeometryData::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiGeometryData::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -24,7 +24,7 @@ string NiGeometryData::asString( bool verbose ) const { return InternalAsString( verbose ); } -void NiGeometryData::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiGeometryData::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } @@ -51,7 +51,7 @@ void NiGeometryData::SetVertices( const vector<Vector3> & in ) { hasNormals = false; vertexColors.clear(); this->hasVertexColors = false; - for (uint i = 0; i < uvSets.size(); ++i ) { + for (unsigned int i = 0; i < uvSets.size(); ++i ) { uvSets[i].clear(); } @@ -131,10 +131,10 @@ void NiGeometryData::Transform( const Matrix44 & transform ) { Matrix44 rotation = Matrix44( transform.GetRotation() ); //Apply the transformations - for ( uint i = 0; i < vertices.size(); ++i ) { + for ( unsigned int i = 0; i < vertices.size(); ++i ) { vertices[i] = transform * vertices[i]; } - for ( uint i = 0; i < normals.size(); ++i ) { + for ( unsigned int i = 0; i < normals.size(); ++i ) { normals[i] = rotation * normals[i]; } } diff --git a/src/obj/NiGravity.cpp b/src/obj/NiGravity.cpp index 28730e8dbe40a5aa481b2cabb1f3d1024d2bb946..b0bd9c0b6d2e7d2f317050217d5d3db29419116e 100644 --- a/src/obj/NiGravity.cpp +++ b/src/obj/NiGravity.cpp @@ -11,11 +11,11 @@ NiGravity::NiGravity() NI_GRAVITY_CONSTRUCT {} NiGravity::~NiGravity() {} -void NiGravity::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiGravity::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void NiGravity::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiGravity::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -23,7 +23,7 @@ string NiGravity::asString( bool verbose ) const { return InternalAsString( verbose ); } -void NiGravity::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiGravity::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } diff --git a/src/obj/NiImage.cpp b/src/obj/NiImage.cpp index 73f09b090d7b9638a4f2ebe7e0808ba191df4b54..be9d0c668e8426a35e868310045122140636f4f0 100644 --- a/src/obj/NiImage.cpp +++ b/src/obj/NiImage.cpp @@ -11,11 +11,11 @@ NiImage::NiImage() NI_IMAGE_CONSTRUCT {} NiImage::~NiImage() {} -void NiImage::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiImage::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void NiImage::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiImage::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -23,7 +23,7 @@ string NiImage::asString( bool verbose ) const { return InternalAsString( verbose ); } -void NiImage::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiImage::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } diff --git a/src/obj/NiIntegerExtraData.cpp b/src/obj/NiIntegerExtraData.cpp index e7b7f4d0e7feab8b828d49fcffd6f6381a1f3419..a76dda8566bcffa7c6f331ea3f705033876372bf 100644 --- a/src/obj/NiIntegerExtraData.cpp +++ b/src/obj/NiIntegerExtraData.cpp @@ -11,11 +11,11 @@ NiIntegerExtraData::NiIntegerExtraData() NI_INTEGER_EXTRA_DATA_CONSTRUCT {} NiIntegerExtraData::~NiIntegerExtraData() {} -void NiIntegerExtraData::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiIntegerExtraData::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void NiIntegerExtraData::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiIntegerExtraData::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -23,7 +23,7 @@ string NiIntegerExtraData::asString( bool verbose ) const { return InternalAsString( verbose ); } -void NiIntegerExtraData::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiIntegerExtraData::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } @@ -35,10 +35,10 @@ const Type & NiIntegerExtraData::GetType() const { return TYPE; }; -uint NiIntegerExtraData::GetData() const { +unsigned int NiIntegerExtraData::GetData() const { return integerData; } -void NiIntegerExtraData::SetData( uint n ) { +void NiIntegerExtraData::SetData( unsigned int n ) { integerData = n; } diff --git a/src/obj/NiIntegersExtraData.cpp b/src/obj/NiIntegersExtraData.cpp index 7da1311425825eeedd4a2b1b2c90708314b1a90a..bddcea1854971a0f8276e2d4cf1534962dea088c 100644 --- a/src/obj/NiIntegersExtraData.cpp +++ b/src/obj/NiIntegersExtraData.cpp @@ -11,11 +11,11 @@ NiIntegersExtraData::NiIntegersExtraData() NI_INTEGERS_EXTRA_DATA_CONSTRUCT {} NiIntegersExtraData::~NiIntegersExtraData() {} -void NiIntegersExtraData::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiIntegersExtraData::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void NiIntegersExtraData::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiIntegersExtraData::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -23,7 +23,7 @@ string NiIntegersExtraData::asString( bool verbose ) const { return InternalAsString( verbose ); } -void NiIntegersExtraData::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiIntegersExtraData::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } @@ -39,7 +39,7 @@ vector<unsigned int> NiIntegersExtraData::GetData() const { return data; }; -void NiIntegersExtraData::SetData( const vector<uint> & n ) { - numIntegers = uint( n.size() ); +void NiIntegersExtraData::SetData( const vector<unsigned int> & n ) { + numIntegers = unsigned int( n.size() ); data = n; }; diff --git a/src/obj/NiInterpolator.cpp b/src/obj/NiInterpolator.cpp index 5ca3255d8f3f9799679c100daa5d5a5d5d674083..203a218df488bd8a40d6d50c75e590a5df9ef51f 100644 --- a/src/obj/NiInterpolator.cpp +++ b/src/obj/NiInterpolator.cpp @@ -11,11 +11,11 @@ NiInterpolator::NiInterpolator() NI_INTERPOLATOR_CONSTRUCT {} NiInterpolator::~NiInterpolator() {} -void NiInterpolator::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiInterpolator::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void NiInterpolator::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiInterpolator::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -23,7 +23,7 @@ string NiInterpolator::asString( bool verbose ) const { return InternalAsString( verbose ); } -void NiInterpolator::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiInterpolator::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } diff --git a/src/obj/NiKeyframeController.cpp b/src/obj/NiKeyframeController.cpp index f4cd560d91fca33804e7ab2430cee3cd9838fa7c..c373814688b7d64e66d8fbfdf946aef2f58f34ba 100644 --- a/src/obj/NiKeyframeController.cpp +++ b/src/obj/NiKeyframeController.cpp @@ -12,11 +12,11 @@ NiKeyframeController::NiKeyframeController() NI_KEYFRAME_CONTROLLER_CONSTRUCT {} NiKeyframeController::~NiKeyframeController() {} -void NiKeyframeController::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiKeyframeController::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void NiKeyframeController::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiKeyframeController::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -24,7 +24,7 @@ string NiKeyframeController::asString( bool verbose ) const { return InternalAsString( verbose ); } -void NiKeyframeController::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiKeyframeController::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } diff --git a/src/obj/NiKeyframeData.cpp b/src/obj/NiKeyframeData.cpp index dcc49bc7bf8b6277afb37779ad74d2eb29a36b58..226c846d03bd92eaba3445286e1a0686f8a5b3a6 100644 --- a/src/obj/NiKeyframeData.cpp +++ b/src/obj/NiKeyframeData.cpp @@ -12,11 +12,11 @@ NiKeyframeData::NiKeyframeData() NI_KEYFRAME_DATA_CONSTRUCT {} NiKeyframeData::~NiKeyframeData() {} -void NiKeyframeData::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiKeyframeData::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void NiKeyframeData::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiKeyframeData::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -24,7 +24,7 @@ string NiKeyframeData::asString( bool verbose ) const { return InternalAsString( verbose ); } -void NiKeyframeData::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiKeyframeData::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } @@ -53,7 +53,7 @@ void NiKeyframeData::UpdateRotationKeyCount() { if ( rotationType == XYZ_ROTATION_KEY ) { numRotationKeys = 1; } else { - numRotationKeys = uint(quaternionKeys.size()); + numRotationKeys = unsigned int(quaternionKeys.size()); } }; diff --git a/src/obj/NiLODData.cpp b/src/obj/NiLODData.cpp index 71a3327bc9837e63049ee27b6a622bbf4a1231e7..e631b2ceec9bffdb4a21bad365fdd84fa97805b6 100644 --- a/src/obj/NiLODData.cpp +++ b/src/obj/NiLODData.cpp @@ -11,11 +11,11 @@ NiLODData::NiLODData() NI_L_O_D_DATA_CONSTRUCT {} NiLODData::~NiLODData() {} -void NiLODData::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiLODData::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void NiLODData::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiLODData::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -23,7 +23,7 @@ string NiLODData::asString( bool verbose ) const { return InternalAsString( verbose ); } -void NiLODData::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiLODData::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } diff --git a/src/obj/NiLODNode.cpp b/src/obj/NiLODNode.cpp index 723c9424d81277da1db94f5da2c980fd02d35d50..018d3f5bb3cb4f8c9736e2e07934a7d833b98880 100644 --- a/src/obj/NiLODNode.cpp +++ b/src/obj/NiLODNode.cpp @@ -13,11 +13,11 @@ NiLODNode::NiLODNode() NI_L_O_D_NODE_CONSTRUCT {} NiLODNode::~NiLODNode() {} -void NiLODNode::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiLODNode::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void NiLODNode::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiLODNode::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -25,7 +25,7 @@ string NiLODNode::asString( bool verbose ) const { return InternalAsString( verbose ); } -void NiLODNode::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiLODNode::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } diff --git a/src/obj/NiLight.cpp b/src/obj/NiLight.cpp index 004ef9e11e4ce6540a1a59b461955738a3f9ad10..51d8c7cb6cf2636384cdc6264f129ac2f541fc49 100644 --- a/src/obj/NiLight.cpp +++ b/src/obj/NiLight.cpp @@ -11,11 +11,11 @@ NiLight::NiLight() NI_LIGHT_CONSTRUCT {} NiLight::~NiLight() {} -void NiLight::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiLight::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void NiLight::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiLight::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -23,7 +23,7 @@ string NiLight::asString( bool verbose ) const { return InternalAsString( verbose ); } -void NiLight::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiLight::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } diff --git a/src/obj/NiLightColorController.cpp b/src/obj/NiLightColorController.cpp index 249d40f676ccf5b95992379dbc0e4dafd7a2ec52..a1bb14f875769bb93fbb3a8f6bccfe5b07771d6f 100644 --- a/src/obj/NiLightColorController.cpp +++ b/src/obj/NiLightColorController.cpp @@ -13,11 +13,11 @@ NiLightColorController::NiLightColorController() NI_LIGHT_COLOR_CONTROLLER_CONST NiLightColorController::~NiLightColorController() {} -void NiLightColorController::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiLightColorController::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void NiLightColorController::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiLightColorController::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -25,7 +25,7 @@ string NiLightColorController::asString( bool verbose ) const { return InternalAsString( verbose ); } -void NiLightColorController::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiLightColorController::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } diff --git a/src/obj/NiLightDimmerController.cpp b/src/obj/NiLightDimmerController.cpp index 228a9efe8f92729e9969586ec6a6c4d64025ddf3..311b8bffe86810b9092997464da83f5afdeb400e 100644 --- a/src/obj/NiLightDimmerController.cpp +++ b/src/obj/NiLightDimmerController.cpp @@ -12,11 +12,11 @@ NiLightDimmerController::NiLightDimmerController() NI_LIGHT_DIMMER_CONTROLLER_CO NiLightDimmerController::~NiLightDimmerController() {} -void NiLightDimmerController::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiLightDimmerController::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void NiLightDimmerController::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiLightDimmerController::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -24,7 +24,7 @@ string NiLightDimmerController::asString( bool verbose ) const { return InternalAsString( verbose ); } -void NiLightDimmerController::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiLightDimmerController::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } diff --git a/src/obj/NiLookAtController.cpp b/src/obj/NiLookAtController.cpp index 8b67bfcd5c34e6ba7a573607d740073286bc8512..5cceb70ea3e8877de21b16278d1c98dd83edc273 100644 --- a/src/obj/NiLookAtController.cpp +++ b/src/obj/NiLookAtController.cpp @@ -12,11 +12,11 @@ NiLookAtController::NiLookAtController() NI_LOOK_AT_CONTROLLER_CONSTRUCT {} NiLookAtController::~NiLookAtController() {} -void NiLookAtController::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiLookAtController::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void NiLookAtController::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiLookAtController::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -24,7 +24,7 @@ string NiLookAtController::asString( bool verbose ) const { return InternalAsString( verbose ); } -void NiLookAtController::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiLookAtController::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } diff --git a/src/obj/NiLookAtInterpolator.cpp b/src/obj/NiLookAtInterpolator.cpp index 2cb5e15ec12970cc0be79d90b98a331be17a4934..87fdbde130b9adc7b4caecae8c83b37a4143fce6 100644 --- a/src/obj/NiLookAtInterpolator.cpp +++ b/src/obj/NiLookAtInterpolator.cpp @@ -14,11 +14,11 @@ NiLookAtInterpolator::NiLookAtInterpolator() NI_LOOK_AT_INTERPOLATOR_CONSTRUCT { NiLookAtInterpolator::~NiLookAtInterpolator() {} -void NiLookAtInterpolator::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiLookAtInterpolator::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void NiLookAtInterpolator::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiLookAtInterpolator::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -26,7 +26,7 @@ string NiLookAtInterpolator::asString( bool verbose ) const { return InternalAsString( verbose ); } -void NiLookAtInterpolator::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiLookAtInterpolator::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } diff --git a/src/obj/NiMaterialColorController.cpp b/src/obj/NiMaterialColorController.cpp index b76f439c9f44462efdc6f903bf8b1afe5e4ebcf2..26fd96762a1fb1245b2d2bf53a06e95f7d1609de 100644 --- a/src/obj/NiMaterialColorController.cpp +++ b/src/obj/NiMaterialColorController.cpp @@ -12,11 +12,11 @@ NiMaterialColorController::NiMaterialColorController() NI_MATERIAL_COLOR_CONTROL NiMaterialColorController::~NiMaterialColorController() {} -void NiMaterialColorController::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiMaterialColorController::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void NiMaterialColorController::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiMaterialColorController::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -24,7 +24,7 @@ string NiMaterialColorController::asString( bool verbose ) const { return InternalAsString( verbose ); } -void NiMaterialColorController::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiMaterialColorController::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } diff --git a/src/obj/NiMaterialProperty.cpp b/src/obj/NiMaterialProperty.cpp index 12f835b5f3dcc55d0c8e17db80b1cf185402874d..222d6a95e229a0e1e8717d394368ece05c91b95f 100644 --- a/src/obj/NiMaterialProperty.cpp +++ b/src/obj/NiMaterialProperty.cpp @@ -11,11 +11,11 @@ NiMaterialProperty::NiMaterialProperty() NI_MATERIAL_PROPERTY_CONSTRUCT {} NiMaterialProperty::~NiMaterialProperty() {} -void NiMaterialProperty::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiMaterialProperty::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void NiMaterialProperty::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiMaterialProperty::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -23,7 +23,7 @@ string NiMaterialProperty::asString( bool verbose ) const { return InternalAsString( verbose ); } -void NiMaterialProperty::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiMaterialProperty::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } @@ -35,11 +35,11 @@ const Type & NiMaterialProperty::GetType() const { return TYPE; }; -ushort NiMaterialProperty::GetFlags() const { +unsigned short NiMaterialProperty::GetFlags() const { return flags; } -void NiMaterialProperty::SetFlags( ushort n ) { +void NiMaterialProperty::SetFlags( unsigned short n ) { flags = n; } diff --git a/src/obj/NiMeshPSysData.cpp b/src/obj/NiMeshPSysData.cpp index ac92bdc9fcd0fea93cf0201e8f8ed5455a21875f..12a2c1ffbfecc9d5a751bdb62e18db21d3c9912b 100644 --- a/src/obj/NiMeshPSysData.cpp +++ b/src/obj/NiMeshPSysData.cpp @@ -13,11 +13,11 @@ NiMeshPSysData::NiMeshPSysData() NI_MESH_P_SYS_DATA_CONSTRUCT {} NiMeshPSysData::~NiMeshPSysData() {} -void NiMeshPSysData::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiMeshPSysData::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void NiMeshPSysData::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiMeshPSysData::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -25,7 +25,7 @@ string NiMeshPSysData::asString( bool verbose ) const { return InternalAsString( verbose ); } -void NiMeshPSysData::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiMeshPSysData::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } diff --git a/src/obj/NiMeshParticleSystem.cpp b/src/obj/NiMeshParticleSystem.cpp index f20139d32550ab7f4d7e801181a6bb5fc61d0f91..0ef891b87738fbb8a948cff3793670ed739c4e12 100644 --- a/src/obj/NiMeshParticleSystem.cpp +++ b/src/obj/NiMeshParticleSystem.cpp @@ -11,11 +11,11 @@ NiMeshParticleSystem::NiMeshParticleSystem() NI_MESH_PARTICLE_SYSTEM_CONSTRUCT { NiMeshParticleSystem::~NiMeshParticleSystem() {} -void NiMeshParticleSystem::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiMeshParticleSystem::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void NiMeshParticleSystem::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiMeshParticleSystem::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -23,7 +23,7 @@ string NiMeshParticleSystem::asString( bool verbose ) const { return InternalAsString( verbose ); } -void NiMeshParticleSystem::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiMeshParticleSystem::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } diff --git a/src/obj/NiMorphData.cpp b/src/obj/NiMorphData.cpp index f37e908e141a0cc854a2ac3d470e08149fe9f291..ea085a1c74b7f9475683e569cc4026f02243b107 100644 --- a/src/obj/NiMorphData.cpp +++ b/src/obj/NiMorphData.cpp @@ -12,11 +12,11 @@ NiMorphData::NiMorphData() NI_MORPH_DATA_CONSTRUCT {} NiMorphData::~NiMorphData() {} -void NiMorphData::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiMorphData::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void NiMorphData::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiMorphData::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -24,7 +24,7 @@ string NiMorphData::asString( bool verbose ) const { return InternalAsString( verbose ); } -void NiMorphData::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiMorphData::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } @@ -43,7 +43,7 @@ int NiMorphData::GetVertexCount() const { void NiMorphData::SetVertexCount( int n ) { numVertices = n; - for ( uint i = 0; i < morphs.size(); ++i ) { + for ( unsigned int i = 0; i < morphs.size(); ++i ) { morphs[i].vectors.resize( n ); } } @@ -53,11 +53,11 @@ int NiMorphData::GetMorphCount() const { } void NiMorphData::SetMorphCount( int n ) { - uint old_size = uint(morphs.size()); + unsigned int old_size = unsigned int(morphs.size()); morphs.resize( n ); //Make sure any new vertex groups are the right size - for (uint i = old_size; i < morphs.size(); ++i ) { + for (unsigned int i = old_size; i < morphs.size(); ++i ) { morphs[i].vectors.resize( numVertices ); } } diff --git a/src/obj/NiMultiTargetTransformController.cpp b/src/obj/NiMultiTargetTransformController.cpp index 44f49a47cd68a0c865ccde6d3cae470c85638a6e..ee7a0879736cae9ad6605e3f7385cb90641ca80b 100644 --- a/src/obj/NiMultiTargetTransformController.cpp +++ b/src/obj/NiMultiTargetTransformController.cpp @@ -13,11 +13,11 @@ NiMultiTargetTransformController::NiMultiTargetTransformController() NI_MULTI_TA NiMultiTargetTransformController::~NiMultiTargetTransformController() {} -void NiMultiTargetTransformController::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiMultiTargetTransformController::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void NiMultiTargetTransformController::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiMultiTargetTransformController::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -25,7 +25,7 @@ string NiMultiTargetTransformController::asString( bool verbose ) const { return InternalAsString( verbose ); } -void NiMultiTargetTransformController::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiMultiTargetTransformController::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } diff --git a/src/obj/NiNode.cpp b/src/obj/NiNode.cpp index 9813cbb7df5258f4b3b31fb6b104fbc079723a0c..aa6e7b92308debc7f8f17d86b9de7c71135f4783 100644 --- a/src/obj/NiNode.cpp +++ b/src/obj/NiNode.cpp @@ -27,11 +27,11 @@ NiNode::~NiNode() { ClearChildren(); } -void NiNode::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiNode::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void NiNode::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiNode::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -39,7 +39,7 @@ string NiNode::asString( bool verbose ) const { return InternalAsString( verbose ); } -void NiNode::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiNode::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); //Connect children to their parents and remove any NULL ones for ( vector< NiAVObjectRef >::iterator it = children.begin(); it != children.end(); ) { @@ -148,7 +148,7 @@ void NiNode::RemoveSkin( NiSkinInstance * skin_inst ) { vector<NiNodeRef> bones; for ( list<NiSkinInstance*>::iterator it = skins.begin(); it != skins.end(); ++it ) { bones = (*it)->GetBones(); - for ( uint i = 0; i < bones.size(); ++i ) { + for ( unsigned int i = 0; i < bones.size(); ++i ) { bones[i]->SetSkinFlag(true); } } @@ -184,12 +184,12 @@ void NiNode::GoToSkeletonBindPosition() { } //Loop through all bones influencing this skin - for ( uint i = 0; i < bone_nodes.size(); ++i ) { + for ( unsigned int i = 0; i < bone_nodes.size(); ++i ) { //Get current offset Matrix for this bone Matrix44 parent_offset = skin_data->GetBoneTransform(i); //Loop through all bones again, checking for any that have this bone as a parent - for ( uint j = 0; j < bone_nodes.size(); ++j ) { + for ( unsigned int j = 0; j < bone_nodes.size(); ++j ) { if ( bone_nodes[j]->GetParent() == bone_nodes[i] ) { //Node 2 has node 1 as a parent diff --git a/src/obj/NiObject.cpp b/src/obj/NiObject.cpp index 1e3ec034ae3edbacd2814665d247c3012c6ff80f..381b20cc29e5a250fd978c8bc189155da105868a 100644 --- a/src/obj/NiObject.cpp +++ b/src/obj/NiObject.cpp @@ -78,13 +78,13 @@ NiObjectRef NiObject::Clone( unsigned int version, unsigned int user_version ) { NiObjectRef clone = CreateObject( this->GetType().GetTypeName() ); //Dummy map - map<NiObjectRef,uint> link_map; + map<NiObjectRef,unsigned int> link_map; //Write this object's data to the stream this->Write( tmp, link_map, version, user_version ); //Dummy stack - list<uint> link_stack; + list<unsigned int> link_stack; //Read the data back from the stream into the clone clone->Read( tmp, link_stack, version, user_version ); diff --git a/src/obj/NiObjectNET.cpp b/src/obj/NiObjectNET.cpp index fe4cdede5ff169ab883a8e557948ccaa435fbe73..4f60789c9a4efb22c4e31364c67305a6756808c7 100644 --- a/src/obj/NiObjectNET.cpp +++ b/src/obj/NiObjectNET.cpp @@ -17,11 +17,11 @@ NiObjectNET::~NiObjectNET() { ClearControllers(); } -void NiObjectNET::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiObjectNET::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void NiObjectNET::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiObjectNET::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -29,7 +29,7 @@ string NiObjectNET::asString( bool verbose ) const { return InternalAsString( verbose ); } -void NiObjectNET::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiObjectNET::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } @@ -52,7 +52,7 @@ string NiObjectNET::GetIDString() { return out.str(); } -void NiObjectNET::AddExtraData( NiExtraData * obj, uint version ) { +void NiObjectNET::AddExtraData( NiExtraData * obj, unsigned int version ) { if ( version >= VER_10_0_1_0 ) { //In later versions, extra data is just stored in a vector extraDataList.push_back( NiExtraDataRef(obj) ); diff --git a/src/obj/NiPSysAgeDeathModifier.cpp b/src/obj/NiPSysAgeDeathModifier.cpp index 97ec2df77bb43f58129f2764a2f672c512510640..8b78bad29341c4ff6a52c8a260c87527d07f1848 100644 --- a/src/obj/NiPSysAgeDeathModifier.cpp +++ b/src/obj/NiPSysAgeDeathModifier.cpp @@ -12,11 +12,11 @@ NiPSysAgeDeathModifier::NiPSysAgeDeathModifier() NI_P_SYS_AGE_DEATH_MODIFIER_CON NiPSysAgeDeathModifier::~NiPSysAgeDeathModifier() {} -void NiPSysAgeDeathModifier::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiPSysAgeDeathModifier::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void NiPSysAgeDeathModifier::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiPSysAgeDeathModifier::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -24,7 +24,7 @@ string NiPSysAgeDeathModifier::asString( bool verbose ) const { return InternalAsString( verbose ); } -void NiPSysAgeDeathModifier::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiPSysAgeDeathModifier::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } diff --git a/src/obj/NiPSysBombModifier.cpp b/src/obj/NiPSysBombModifier.cpp index b6313032340d7dcd85bd0070e3a6cf6a66ef86ad..acdfdcdae2814db0a2ccca54986dceadb58ff9ab 100644 --- a/src/obj/NiPSysBombModifier.cpp +++ b/src/obj/NiPSysBombModifier.cpp @@ -12,11 +12,11 @@ NiPSysBombModifier::NiPSysBombModifier() NI_P_SYS_BOMB_MODIFIER_CONSTRUCT {} NiPSysBombModifier::~NiPSysBombModifier() {} -void NiPSysBombModifier::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiPSysBombModifier::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void NiPSysBombModifier::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiPSysBombModifier::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -24,7 +24,7 @@ string NiPSysBombModifier::asString( bool verbose ) const { return InternalAsString( verbose ); } -void NiPSysBombModifier::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiPSysBombModifier::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } diff --git a/src/obj/NiPSysBoundUpdateModifier.cpp b/src/obj/NiPSysBoundUpdateModifier.cpp index c274745cbc747c564dc1a38aefcf140a733e70c6..dbad4a294f939903cc30f4c10f92077e21a4de4d 100644 --- a/src/obj/NiPSysBoundUpdateModifier.cpp +++ b/src/obj/NiPSysBoundUpdateModifier.cpp @@ -11,11 +11,11 @@ NiPSysBoundUpdateModifier::NiPSysBoundUpdateModifier() NI_P_SYS_BOUND_UPDATE_MOD NiPSysBoundUpdateModifier::~NiPSysBoundUpdateModifier() {} -void NiPSysBoundUpdateModifier::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiPSysBoundUpdateModifier::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void NiPSysBoundUpdateModifier::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiPSysBoundUpdateModifier::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -23,7 +23,7 @@ string NiPSysBoundUpdateModifier::asString( bool verbose ) const { return InternalAsString( verbose ); } -void NiPSysBoundUpdateModifier::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiPSysBoundUpdateModifier::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } diff --git a/src/obj/NiPSysBoxEmitter.cpp b/src/obj/NiPSysBoxEmitter.cpp index b91afb09616d8356382d70d291fb43e85d258396..9114cf3765a0f81ec0a128016332b6b20c18973d 100644 --- a/src/obj/NiPSysBoxEmitter.cpp +++ b/src/obj/NiPSysBoxEmitter.cpp @@ -11,11 +11,11 @@ NiPSysBoxEmitter::NiPSysBoxEmitter() NI_P_SYS_BOX_EMITTER_CONSTRUCT {} NiPSysBoxEmitter::~NiPSysBoxEmitter() {} -void NiPSysBoxEmitter::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiPSysBoxEmitter::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void NiPSysBoxEmitter::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiPSysBoxEmitter::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -23,7 +23,7 @@ string NiPSysBoxEmitter::asString( bool verbose ) const { return InternalAsString( verbose ); } -void NiPSysBoxEmitter::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiPSysBoxEmitter::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } diff --git a/src/obj/NiPSysColliderManager.cpp b/src/obj/NiPSysColliderManager.cpp index 12f6b388b6c3f67ba49f7b6f377ef2617ab44e8e..356583d7463ace27dea47d61515d50c14f50c5c6 100644 --- a/src/obj/NiPSysColliderManager.cpp +++ b/src/obj/NiPSysColliderManager.cpp @@ -12,11 +12,11 @@ NiPSysColliderManager::NiPSysColliderManager() NI_P_SYS_COLLIDER_MANAGER_CONSTRU NiPSysColliderManager::~NiPSysColliderManager() {} -void NiPSysColliderManager::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiPSysColliderManager::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void NiPSysColliderManager::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiPSysColliderManager::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -24,7 +24,7 @@ string NiPSysColliderManager::asString( bool verbose ) const { return InternalAsString( verbose ); } -void NiPSysColliderManager::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiPSysColliderManager::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } diff --git a/src/obj/NiPSysColorModifier.cpp b/src/obj/NiPSysColorModifier.cpp index b8243e44d34ded7486d9297d3857a9bf3137fa83..69a114329d0d5f75971d96f8cfbeb762e40ae741 100644 --- a/src/obj/NiPSysColorModifier.cpp +++ b/src/obj/NiPSysColorModifier.cpp @@ -12,11 +12,11 @@ NiPSysColorModifier::NiPSysColorModifier() NI_P_SYS_COLOR_MODIFIER_CONSTRUCT {} NiPSysColorModifier::~NiPSysColorModifier() {} -void NiPSysColorModifier::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiPSysColorModifier::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void NiPSysColorModifier::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiPSysColorModifier::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -24,7 +24,7 @@ string NiPSysColorModifier::asString( bool verbose ) const { return InternalAsString( verbose ); } -void NiPSysColorModifier::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiPSysColorModifier::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } diff --git a/src/obj/NiPSysCylinderEmitter.cpp b/src/obj/NiPSysCylinderEmitter.cpp index b3f4635cdf52b1568540aee2c6e05a25060b968b..1db140c742481b6106a23bd1a966e8daf18573ad 100644 --- a/src/obj/NiPSysCylinderEmitter.cpp +++ b/src/obj/NiPSysCylinderEmitter.cpp @@ -11,11 +11,11 @@ NiPSysCylinderEmitter::NiPSysCylinderEmitter() NI_P_SYS_CYLINDER_EMITTER_CONSTRU NiPSysCylinderEmitter::~NiPSysCylinderEmitter() {} -void NiPSysCylinderEmitter::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiPSysCylinderEmitter::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void NiPSysCylinderEmitter::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiPSysCylinderEmitter::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -23,7 +23,7 @@ string NiPSysCylinderEmitter::asString( bool verbose ) const { return InternalAsString( verbose ); } -void NiPSysCylinderEmitter::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiPSysCylinderEmitter::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } diff --git a/src/obj/NiPSysData.cpp b/src/obj/NiPSysData.cpp index 29c10c078853d5dbbf9fe2f080940b1b886248ae..b0334a73a8e3e71dd364b54d0b17171d59d28c3e 100644 --- a/src/obj/NiPSysData.cpp +++ b/src/obj/NiPSysData.cpp @@ -11,11 +11,11 @@ NiPSysData::NiPSysData() NI_P_SYS_DATA_CONSTRUCT {} NiPSysData::~NiPSysData() {} -void NiPSysData::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiPSysData::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void NiPSysData::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiPSysData::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -23,7 +23,7 @@ string NiPSysData::asString( bool verbose ) const { return InternalAsString( verbose ); } -void NiPSysData::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiPSysData::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } diff --git a/src/obj/NiPSysDragModifier.cpp b/src/obj/NiPSysDragModifier.cpp index 0b9956f3e2b521fea7c379f1b8afce11d70ff68a..4d44bc4e7faeb94d44b0e1df8d89e5640a581763 100644 --- a/src/obj/NiPSysDragModifier.cpp +++ b/src/obj/NiPSysDragModifier.cpp @@ -12,11 +12,11 @@ NiPSysDragModifier::NiPSysDragModifier() NI_P_SYS_DRAG_MODIFIER_CONSTRUCT {} NiPSysDragModifier::~NiPSysDragModifier() {} -void NiPSysDragModifier::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiPSysDragModifier::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void NiPSysDragModifier::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiPSysDragModifier::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -24,7 +24,7 @@ string NiPSysDragModifier::asString( bool verbose ) const { return InternalAsString( verbose ); } -void NiPSysDragModifier::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiPSysDragModifier::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } diff --git a/src/obj/NiPSysEmitter.cpp b/src/obj/NiPSysEmitter.cpp index d32c432b63404f8c62e69010002fbc07d0f1cf73..f4a761b26f4a050ce644ff937f0f5561051e423c 100644 --- a/src/obj/NiPSysEmitter.cpp +++ b/src/obj/NiPSysEmitter.cpp @@ -11,11 +11,11 @@ NiPSysEmitter::NiPSysEmitter() NI_P_SYS_EMITTER_CONSTRUCT {} NiPSysEmitter::~NiPSysEmitter() {} -void NiPSysEmitter::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiPSysEmitter::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void NiPSysEmitter::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiPSysEmitter::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -23,7 +23,7 @@ string NiPSysEmitter::asString( bool verbose ) const { return InternalAsString( verbose ); } -void NiPSysEmitter::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiPSysEmitter::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } diff --git a/src/obj/NiPSysEmitterCtlr.cpp b/src/obj/NiPSysEmitterCtlr.cpp index dc1f6aef366c6bb8becee3b748109baa1a6440d6..835fa3a6d9eeea032532d20eb74c50cca97ca5c5 100644 --- a/src/obj/NiPSysEmitterCtlr.cpp +++ b/src/obj/NiPSysEmitterCtlr.cpp @@ -13,11 +13,11 @@ NiPSysEmitterCtlr::NiPSysEmitterCtlr() NI_P_SYS_EMITTER_CTLR_CONSTRUCT {} NiPSysEmitterCtlr::~NiPSysEmitterCtlr() {} -void NiPSysEmitterCtlr::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiPSysEmitterCtlr::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void NiPSysEmitterCtlr::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiPSysEmitterCtlr::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -25,7 +25,7 @@ string NiPSysEmitterCtlr::asString( bool verbose ) const { return InternalAsString( verbose ); } -void NiPSysEmitterCtlr::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiPSysEmitterCtlr::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } diff --git a/src/obj/NiPSysEmitterCtlrData.cpp b/src/obj/NiPSysEmitterCtlrData.cpp index 12462de2f2ec8a2d14567ed5ad3e480967133ac0..015a6d8e01d65005e4f35b35ecf50142e16d9bad 100644 --- a/src/obj/NiPSysEmitterCtlrData.cpp +++ b/src/obj/NiPSysEmitterCtlrData.cpp @@ -12,11 +12,11 @@ NiPSysEmitterCtlrData::NiPSysEmitterCtlrData() NI_P_SYS_EMITTER_CTLR_DATA_CONSTR NiPSysEmitterCtlrData::~NiPSysEmitterCtlrData() {} -void NiPSysEmitterCtlrData::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiPSysEmitterCtlrData::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void NiPSysEmitterCtlrData::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiPSysEmitterCtlrData::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -24,7 +24,7 @@ string NiPSysEmitterCtlrData::asString( bool verbose ) const { return InternalAsString( verbose ); } -void NiPSysEmitterCtlrData::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiPSysEmitterCtlrData::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } diff --git a/src/obj/NiPSysEmitterDeclinationCtlr.cpp b/src/obj/NiPSysEmitterDeclinationCtlr.cpp index 106627565569556859dd5bef07ae2919c35a4262..64a0608b3cab0fea61ebad7bdb414a1fcb880099 100644 --- a/src/obj/NiPSysEmitterDeclinationCtlr.cpp +++ b/src/obj/NiPSysEmitterDeclinationCtlr.cpp @@ -11,11 +11,11 @@ NiPSysEmitterDeclinationCtlr::NiPSysEmitterDeclinationCtlr() NI_P_SYS_EMITTER_DE NiPSysEmitterDeclinationCtlr::~NiPSysEmitterDeclinationCtlr() {} -void NiPSysEmitterDeclinationCtlr::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiPSysEmitterDeclinationCtlr::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void NiPSysEmitterDeclinationCtlr::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiPSysEmitterDeclinationCtlr::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -23,7 +23,7 @@ string NiPSysEmitterDeclinationCtlr::asString( bool verbose ) const { return InternalAsString( verbose ); } -void NiPSysEmitterDeclinationCtlr::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiPSysEmitterDeclinationCtlr::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } diff --git a/src/obj/NiPSysEmitterDeclinationVarCtlr.cpp b/src/obj/NiPSysEmitterDeclinationVarCtlr.cpp index 9a7264bd329f21ead46b7dbabf66d5bca749dcca..0e4506f082e76e1c1d96b9289c26db16a26f9faf 100644 --- a/src/obj/NiPSysEmitterDeclinationVarCtlr.cpp +++ b/src/obj/NiPSysEmitterDeclinationVarCtlr.cpp @@ -11,11 +11,11 @@ NiPSysEmitterDeclinationVarCtlr::NiPSysEmitterDeclinationVarCtlr() NI_P_SYS_EMIT NiPSysEmitterDeclinationVarCtlr::~NiPSysEmitterDeclinationVarCtlr() {} -void NiPSysEmitterDeclinationVarCtlr::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiPSysEmitterDeclinationVarCtlr::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void NiPSysEmitterDeclinationVarCtlr::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiPSysEmitterDeclinationVarCtlr::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -23,7 +23,7 @@ string NiPSysEmitterDeclinationVarCtlr::asString( bool verbose ) const { return InternalAsString( verbose ); } -void NiPSysEmitterDeclinationVarCtlr::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiPSysEmitterDeclinationVarCtlr::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } diff --git a/src/obj/NiPSysEmitterInitialRadiusCtlr.cpp b/src/obj/NiPSysEmitterInitialRadiusCtlr.cpp index d8fb4a7120b3c960acee746c67c9ca6b75687e0d..3f4e9097f51141dd9d173e45b89b34324f893b38 100644 --- a/src/obj/NiPSysEmitterInitialRadiusCtlr.cpp +++ b/src/obj/NiPSysEmitterInitialRadiusCtlr.cpp @@ -11,11 +11,11 @@ NiPSysEmitterInitialRadiusCtlr::NiPSysEmitterInitialRadiusCtlr() NI_P_SYS_EMITTE NiPSysEmitterInitialRadiusCtlr::~NiPSysEmitterInitialRadiusCtlr() {} -void NiPSysEmitterInitialRadiusCtlr::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiPSysEmitterInitialRadiusCtlr::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void NiPSysEmitterInitialRadiusCtlr::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiPSysEmitterInitialRadiusCtlr::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -23,7 +23,7 @@ string NiPSysEmitterInitialRadiusCtlr::asString( bool verbose ) const { return InternalAsString( verbose ); } -void NiPSysEmitterInitialRadiusCtlr::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiPSysEmitterInitialRadiusCtlr::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } diff --git a/src/obj/NiPSysEmitterLifeSpanCtlr.cpp b/src/obj/NiPSysEmitterLifeSpanCtlr.cpp index fd5a92cfeacf22c813640545c7284a9dd61ad1af..1a3a78cb197f6f7100765011a35884b89b93be22 100644 --- a/src/obj/NiPSysEmitterLifeSpanCtlr.cpp +++ b/src/obj/NiPSysEmitterLifeSpanCtlr.cpp @@ -12,11 +12,11 @@ NiPSysEmitterLifeSpanCtlr::NiPSysEmitterLifeSpanCtlr() NI_P_SYS_EMITTER_LIFE_SPA NiPSysEmitterLifeSpanCtlr::~NiPSysEmitterLifeSpanCtlr() {} -void NiPSysEmitterLifeSpanCtlr::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiPSysEmitterLifeSpanCtlr::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void NiPSysEmitterLifeSpanCtlr::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiPSysEmitterLifeSpanCtlr::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -24,7 +24,7 @@ string NiPSysEmitterLifeSpanCtlr::asString( bool verbose ) const { return InternalAsString( verbose ); } -void NiPSysEmitterLifeSpanCtlr::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiPSysEmitterLifeSpanCtlr::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } diff --git a/src/obj/NiPSysEmitterSpeedCtlr.cpp b/src/obj/NiPSysEmitterSpeedCtlr.cpp index 3134115e7fc2f10c1ca8eba56236c99835a575be..c0b2b82419381934f1ba98b90ee02787f6f54396 100644 --- a/src/obj/NiPSysEmitterSpeedCtlr.cpp +++ b/src/obj/NiPSysEmitterSpeedCtlr.cpp @@ -13,11 +13,11 @@ NiPSysEmitterSpeedCtlr::NiPSysEmitterSpeedCtlr() NI_P_SYS_EMITTER_SPEED_CTLR_CON NiPSysEmitterSpeedCtlr::~NiPSysEmitterSpeedCtlr() {} -void NiPSysEmitterSpeedCtlr::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiPSysEmitterSpeedCtlr::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void NiPSysEmitterSpeedCtlr::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiPSysEmitterSpeedCtlr::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -25,7 +25,7 @@ string NiPSysEmitterSpeedCtlr::asString( bool verbose ) const { return InternalAsString( verbose ); } -void NiPSysEmitterSpeedCtlr::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiPSysEmitterSpeedCtlr::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } diff --git a/src/obj/NiPSysGravityModifier.cpp b/src/obj/NiPSysGravityModifier.cpp index a1eac3365a71bdf63a43eb2c65aa99cf91a17ad8..dc13b2675d6ff4e60cd5301d12f51c0831cd6e5f 100644 --- a/src/obj/NiPSysGravityModifier.cpp +++ b/src/obj/NiPSysGravityModifier.cpp @@ -12,11 +12,11 @@ NiPSysGravityModifier::NiPSysGravityModifier() NI_P_SYS_GRAVITY_MODIFIER_CONSTRU NiPSysGravityModifier::~NiPSysGravityModifier() {} -void NiPSysGravityModifier::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiPSysGravityModifier::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void NiPSysGravityModifier::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiPSysGravityModifier::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -24,7 +24,7 @@ string NiPSysGravityModifier::asString( bool verbose ) const { return InternalAsString( verbose ); } -void NiPSysGravityModifier::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiPSysGravityModifier::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } diff --git a/src/obj/NiPSysGravityStrengthCtlr.cpp b/src/obj/NiPSysGravityStrengthCtlr.cpp index 48dff0e9882d2ab31eb5db517c3525f662fcda08..db3dfb5cd1be8105418d56fefdb516d9774baa11 100644 --- a/src/obj/NiPSysGravityStrengthCtlr.cpp +++ b/src/obj/NiPSysGravityStrengthCtlr.cpp @@ -12,11 +12,11 @@ NiPSysGravityStrengthCtlr::NiPSysGravityStrengthCtlr() NI_P_SYS_GRAVITY_STRENGTH NiPSysGravityStrengthCtlr::~NiPSysGravityStrengthCtlr() {} -void NiPSysGravityStrengthCtlr::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiPSysGravityStrengthCtlr::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void NiPSysGravityStrengthCtlr::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiPSysGravityStrengthCtlr::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -24,7 +24,7 @@ string NiPSysGravityStrengthCtlr::asString( bool verbose ) const { return InternalAsString( verbose ); } -void NiPSysGravityStrengthCtlr::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiPSysGravityStrengthCtlr::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } diff --git a/src/obj/NiPSysGrowFadeModifier.cpp b/src/obj/NiPSysGrowFadeModifier.cpp index dbee229925fb5884c3230eae2395842274a57817..44b3224909fea04028aa29e834258e936e6d01e4 100644 --- a/src/obj/NiPSysGrowFadeModifier.cpp +++ b/src/obj/NiPSysGrowFadeModifier.cpp @@ -11,11 +11,11 @@ NiPSysGrowFadeModifier::NiPSysGrowFadeModifier() NI_P_SYS_GROW_FADE_MODIFIER_CON NiPSysGrowFadeModifier::~NiPSysGrowFadeModifier() {} -void NiPSysGrowFadeModifier::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiPSysGrowFadeModifier::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void NiPSysGrowFadeModifier::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiPSysGrowFadeModifier::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -23,7 +23,7 @@ string NiPSysGrowFadeModifier::asString( bool verbose ) const { return InternalAsString( verbose ); } -void NiPSysGrowFadeModifier::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiPSysGrowFadeModifier::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } diff --git a/src/obj/NiPSysMeshEmitter.cpp b/src/obj/NiPSysMeshEmitter.cpp index 645d0647a44c0de27d0e8597e29464b42a86d11f..131269d254414f74fda7e329c57a0e33fab446c2 100644 --- a/src/obj/NiPSysMeshEmitter.cpp +++ b/src/obj/NiPSysMeshEmitter.cpp @@ -12,11 +12,11 @@ NiPSysMeshEmitter::NiPSysMeshEmitter() NI_P_SYS_MESH_EMITTER_CONSTRUCT {} NiPSysMeshEmitter::~NiPSysMeshEmitter() {} -void NiPSysMeshEmitter::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiPSysMeshEmitter::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void NiPSysMeshEmitter::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiPSysMeshEmitter::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -24,7 +24,7 @@ string NiPSysMeshEmitter::asString( bool verbose ) const { return InternalAsString( verbose ); } -void NiPSysMeshEmitter::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiPSysMeshEmitter::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } diff --git a/src/obj/NiPSysMeshUpdateModifier.cpp b/src/obj/NiPSysMeshUpdateModifier.cpp index a9f5ce97839872d9122154ded4bfb2050a8ff133..4e9578590390dd95f7dfdc2a9e17f634d5d63f3e 100644 --- a/src/obj/NiPSysMeshUpdateModifier.cpp +++ b/src/obj/NiPSysMeshUpdateModifier.cpp @@ -12,11 +12,11 @@ NiPSysMeshUpdateModifier::NiPSysMeshUpdateModifier() NI_P_SYS_MESH_UPDATE_MODIFI NiPSysMeshUpdateModifier::~NiPSysMeshUpdateModifier() {} -void NiPSysMeshUpdateModifier::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiPSysMeshUpdateModifier::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void NiPSysMeshUpdateModifier::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiPSysMeshUpdateModifier::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -24,7 +24,7 @@ string NiPSysMeshUpdateModifier::asString( bool verbose ) const { return InternalAsString( verbose ); } -void NiPSysMeshUpdateModifier::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiPSysMeshUpdateModifier::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } diff --git a/src/obj/NiPSysModifier.cpp b/src/obj/NiPSysModifier.cpp index 5ba7154b23b4ae4232cf8df4d607284c0b2a24a8..0d9fe360aff19c5407f8529523bbbd2236fe8f49 100644 --- a/src/obj/NiPSysModifier.cpp +++ b/src/obj/NiPSysModifier.cpp @@ -12,11 +12,11 @@ NiPSysModifier::NiPSysModifier() NI_P_SYS_MODIFIER_CONSTRUCT {} NiPSysModifier::~NiPSysModifier() {} -void NiPSysModifier::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiPSysModifier::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void NiPSysModifier::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiPSysModifier::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -24,7 +24,7 @@ string NiPSysModifier::asString( bool verbose ) const { return InternalAsString( verbose ); } -void NiPSysModifier::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiPSysModifier::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } diff --git a/src/obj/NiPSysModifierActiveCtlr.cpp b/src/obj/NiPSysModifierActiveCtlr.cpp index a2dad5eaba04175ef06fe604728f88ec44bc812c..289e3aaf5e304548277dc62d7c3c83ee6c05a787 100644 --- a/src/obj/NiPSysModifierActiveCtlr.cpp +++ b/src/obj/NiPSysModifierActiveCtlr.cpp @@ -11,11 +11,11 @@ NiPSysModifierActiveCtlr::NiPSysModifierActiveCtlr() NI_P_SYS_MODIFIER_ACTIVE_CT NiPSysModifierActiveCtlr::~NiPSysModifierActiveCtlr() {} -void NiPSysModifierActiveCtlr::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiPSysModifierActiveCtlr::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void NiPSysModifierActiveCtlr::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiPSysModifierActiveCtlr::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -23,7 +23,7 @@ string NiPSysModifierActiveCtlr::asString( bool verbose ) const { return InternalAsString( verbose ); } -void NiPSysModifierActiveCtlr::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiPSysModifierActiveCtlr::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } diff --git a/src/obj/NiPSysPlanarCollider.cpp b/src/obj/NiPSysPlanarCollider.cpp index d787d493ef01ea2763432f98a0fba5965d5bba24..b8c01c59bb35a951e000cb16eea2078e9ee3a23e 100644 --- a/src/obj/NiPSysPlanarCollider.cpp +++ b/src/obj/NiPSysPlanarCollider.cpp @@ -14,11 +14,11 @@ NiPSysPlanarCollider::NiPSysPlanarCollider() NI_P_SYS_PLANAR_COLLIDER_CONSTRUCT NiPSysPlanarCollider::~NiPSysPlanarCollider() {} -void NiPSysPlanarCollider::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiPSysPlanarCollider::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void NiPSysPlanarCollider::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiPSysPlanarCollider::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -26,7 +26,7 @@ string NiPSysPlanarCollider::asString( bool verbose ) const { return InternalAsString( verbose ); } -void NiPSysPlanarCollider::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiPSysPlanarCollider::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } diff --git a/src/obj/NiPSysPositionModifier.cpp b/src/obj/NiPSysPositionModifier.cpp index 666a68f3c762daeb47b0b45f9b8bf6b151befce9..8cafe0dcb785727d7eac310d614260617706bd21 100644 --- a/src/obj/NiPSysPositionModifier.cpp +++ b/src/obj/NiPSysPositionModifier.cpp @@ -11,11 +11,11 @@ NiPSysPositionModifier::NiPSysPositionModifier() NI_P_SYS_POSITION_MODIFIER_CONS NiPSysPositionModifier::~NiPSysPositionModifier() {} -void NiPSysPositionModifier::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiPSysPositionModifier::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void NiPSysPositionModifier::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiPSysPositionModifier::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -23,7 +23,7 @@ string NiPSysPositionModifier::asString( bool verbose ) const { return InternalAsString( verbose ); } -void NiPSysPositionModifier::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiPSysPositionModifier::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } diff --git a/src/obj/NiPSysResetOnLoopCtlr.cpp b/src/obj/NiPSysResetOnLoopCtlr.cpp index 44a390d11234c3a85ad99d9199d2aad9cffc20ba..9627a33d62a7ee8fa1017edc73496ab51a8e0579 100644 --- a/src/obj/NiPSysResetOnLoopCtlr.cpp +++ b/src/obj/NiPSysResetOnLoopCtlr.cpp @@ -11,11 +11,11 @@ NiPSysResetOnLoopCtlr::NiPSysResetOnLoopCtlr() NI_P_SYS_RESET_ON_LOOP_CTLR_CONST NiPSysResetOnLoopCtlr::~NiPSysResetOnLoopCtlr() {} -void NiPSysResetOnLoopCtlr::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiPSysResetOnLoopCtlr::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void NiPSysResetOnLoopCtlr::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiPSysResetOnLoopCtlr::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -23,7 +23,7 @@ string NiPSysResetOnLoopCtlr::asString( bool verbose ) const { return InternalAsString( verbose ); } -void NiPSysResetOnLoopCtlr::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiPSysResetOnLoopCtlr::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } diff --git a/src/obj/NiPSysRotationModifier.cpp b/src/obj/NiPSysRotationModifier.cpp index a6ab3c52a3d666808f9fdd2bd0a26df7501ede35..4b2c0b0ad70cd51ff23fcaea45e7262fe66e54d9 100644 --- a/src/obj/NiPSysRotationModifier.cpp +++ b/src/obj/NiPSysRotationModifier.cpp @@ -11,11 +11,11 @@ NiPSysRotationModifier::NiPSysRotationModifier() NI_P_SYS_ROTATION_MODIFIER_CONS NiPSysRotationModifier::~NiPSysRotationModifier() {} -void NiPSysRotationModifier::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiPSysRotationModifier::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void NiPSysRotationModifier::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiPSysRotationModifier::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -23,7 +23,7 @@ string NiPSysRotationModifier::asString( bool verbose ) const { return InternalAsString( verbose ); } -void NiPSysRotationModifier::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiPSysRotationModifier::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } diff --git a/src/obj/NiPSysSpawnModifier.cpp b/src/obj/NiPSysSpawnModifier.cpp index 3ce816b2bb4422e393e452be6b23c07d4a1acadf..835fcf34adcd9bf238d2ab7447461cda9a8a702f 100644 --- a/src/obj/NiPSysSpawnModifier.cpp +++ b/src/obj/NiPSysSpawnModifier.cpp @@ -11,11 +11,11 @@ NiPSysSpawnModifier::NiPSysSpawnModifier() NI_P_SYS_SPAWN_MODIFIER_CONSTRUCT {} NiPSysSpawnModifier::~NiPSysSpawnModifier() {} -void NiPSysSpawnModifier::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiPSysSpawnModifier::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void NiPSysSpawnModifier::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiPSysSpawnModifier::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -23,7 +23,7 @@ string NiPSysSpawnModifier::asString( bool verbose ) const { return InternalAsString( verbose ); } -void NiPSysSpawnModifier::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiPSysSpawnModifier::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } diff --git a/src/obj/NiPSysSphereEmitter.cpp b/src/obj/NiPSysSphereEmitter.cpp index 1dba9a7f126a0634d7c79cfa569651d4663ac89f..89f42da2255848b8b339d427ba77030e6e9282a5 100644 --- a/src/obj/NiPSysSphereEmitter.cpp +++ b/src/obj/NiPSysSphereEmitter.cpp @@ -11,11 +11,11 @@ NiPSysSphereEmitter::NiPSysSphereEmitter() NI_P_SYS_SPHERE_EMITTER_CONSTRUCT {} NiPSysSphereEmitter::~NiPSysSphereEmitter() {} -void NiPSysSphereEmitter::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiPSysSphereEmitter::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void NiPSysSphereEmitter::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiPSysSphereEmitter::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -23,7 +23,7 @@ string NiPSysSphereEmitter::asString( bool verbose ) const { return InternalAsString( verbose ); } -void NiPSysSphereEmitter::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiPSysSphereEmitter::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } diff --git a/src/obj/NiPSysUpdateCtlr.cpp b/src/obj/NiPSysUpdateCtlr.cpp index 817f9758dddb28e4b7e07567913f488c5c5cff28..ff1d08db3c8c8254836476f2c1420ec3362b1527 100644 --- a/src/obj/NiPSysUpdateCtlr.cpp +++ b/src/obj/NiPSysUpdateCtlr.cpp @@ -11,11 +11,11 @@ NiPSysUpdateCtlr::NiPSysUpdateCtlr() NI_P_SYS_UPDATE_CTLR_CONSTRUCT {} NiPSysUpdateCtlr::~NiPSysUpdateCtlr() {} -void NiPSysUpdateCtlr::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiPSysUpdateCtlr::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void NiPSysUpdateCtlr::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiPSysUpdateCtlr::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -23,7 +23,7 @@ string NiPSysUpdateCtlr::asString( bool verbose ) const { return InternalAsString( verbose ); } -void NiPSysUpdateCtlr::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiPSysUpdateCtlr::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } diff --git a/src/obj/NiPSysVolumeEmitter.cpp b/src/obj/NiPSysVolumeEmitter.cpp index 46d7fd7de4bc30dbdc58d004b2b9c0391b9a0afc..dafd494d68285b9e0036b83fd8234baccc6c159e 100644 --- a/src/obj/NiPSysVolumeEmitter.cpp +++ b/src/obj/NiPSysVolumeEmitter.cpp @@ -12,11 +12,11 @@ NiPSysVolumeEmitter::NiPSysVolumeEmitter() NI_P_SYS_VOLUME_EMITTER_CONSTRUCT {} NiPSysVolumeEmitter::~NiPSysVolumeEmitter() {} -void NiPSysVolumeEmitter::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiPSysVolumeEmitter::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void NiPSysVolumeEmitter::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiPSysVolumeEmitter::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -24,7 +24,7 @@ string NiPSysVolumeEmitter::asString( bool verbose ) const { return InternalAsString( verbose ); } -void NiPSysVolumeEmitter::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiPSysVolumeEmitter::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } diff --git a/src/obj/NiPalette.cpp b/src/obj/NiPalette.cpp index aae09469b644720687a54196cc6e8f7ff2f67275..c3b52455d39bc9173f695d7c6b978272756d7793 100644 --- a/src/obj/NiPalette.cpp +++ b/src/obj/NiPalette.cpp @@ -11,11 +11,11 @@ NiPalette::NiPalette() NI_PALETTE_CONSTRUCT {} NiPalette::~NiPalette() {} -void NiPalette::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiPalette::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void NiPalette::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiPalette::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -23,7 +23,7 @@ string NiPalette::asString( bool verbose ) const { return InternalAsString( verbose ); } -void NiPalette::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiPalette::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } @@ -38,7 +38,7 @@ const Type & NiPalette::GetType() const { vector<Color4> NiPalette::GetPalette() const { vector<Color4> color_pal(256); - for ( uint i = 0; i < 256; ++i ) { + for ( unsigned int i = 0; i < 256; ++i ) { color_pal[i].r = float(palette[i][0]) / 255.0f; color_pal[i].g = float(palette[i][1]) / 255.0f; @@ -54,7 +54,7 @@ void NiPalette::SetPalette( const vector<Color4> & new_pal ) { throw runtime_error( "Palette size must be 256" ); } - for ( uint i = 0; i < 256; ++i ) { + for ( unsigned int i = 0; i < 256; ++i ) { palette[i][0] = int( new_pal[i].r * 255.0f ); palette[i][1] = int( new_pal[i].g * 255.0f ); palette[i][2] = int( new_pal[i].b * 255.0f ); diff --git a/src/obj/NiParticleBomb.cpp b/src/obj/NiParticleBomb.cpp index 83ec36a581f40d7c512d3dec84876a523f66307d..80c0c0fa41cac278539fc89cf9d726a08d00003e 100644 --- a/src/obj/NiParticleBomb.cpp +++ b/src/obj/NiParticleBomb.cpp @@ -11,11 +11,11 @@ NiParticleBomb::NiParticleBomb() NI_PARTICLE_BOMB_CONSTRUCT {} NiParticleBomb::~NiParticleBomb() {} -void NiParticleBomb::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiParticleBomb::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void NiParticleBomb::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiParticleBomb::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -23,7 +23,7 @@ string NiParticleBomb::asString( bool verbose ) const { return InternalAsString( verbose ); } -void NiParticleBomb::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiParticleBomb::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } diff --git a/src/obj/NiParticleColorModifier.cpp b/src/obj/NiParticleColorModifier.cpp index c34345d71b4ff2363167093e2f153174febfde62..c58778a7961dff85a8523b1163a3e95664fd4135 100644 --- a/src/obj/NiParticleColorModifier.cpp +++ b/src/obj/NiParticleColorModifier.cpp @@ -12,11 +12,11 @@ NiParticleColorModifier::NiParticleColorModifier() NI_PARTICLE_COLOR_MODIFIER_CO NiParticleColorModifier::~NiParticleColorModifier() {} -void NiParticleColorModifier::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiParticleColorModifier::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void NiParticleColorModifier::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiParticleColorModifier::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -24,7 +24,7 @@ string NiParticleColorModifier::asString( bool verbose ) const { return InternalAsString( verbose ); } -void NiParticleColorModifier::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiParticleColorModifier::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } diff --git a/src/obj/NiParticleGrowFade.cpp b/src/obj/NiParticleGrowFade.cpp index bb58d92836239b11b737cf6ed96597f797c6837d..cec81697849f0565a254f6d9782be432d8c6cf98 100644 --- a/src/obj/NiParticleGrowFade.cpp +++ b/src/obj/NiParticleGrowFade.cpp @@ -11,11 +11,11 @@ NiParticleGrowFade::NiParticleGrowFade() NI_PARTICLE_GROW_FADE_CONSTRUCT {} NiParticleGrowFade::~NiParticleGrowFade() {} -void NiParticleGrowFade::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiParticleGrowFade::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void NiParticleGrowFade::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiParticleGrowFade::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -23,7 +23,7 @@ string NiParticleGrowFade::asString( bool verbose ) const { return InternalAsString( verbose ); } -void NiParticleGrowFade::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiParticleGrowFade::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } diff --git a/src/obj/NiParticleMeshModifier.cpp b/src/obj/NiParticleMeshModifier.cpp index b8093db86bd65c868079db9b6067476b6d3be9dd..ae16d774b9fcd0af5e593346e31b7677c054ec0c 100644 --- a/src/obj/NiParticleMeshModifier.cpp +++ b/src/obj/NiParticleMeshModifier.cpp @@ -12,11 +12,11 @@ NiParticleMeshModifier::NiParticleMeshModifier() NI_PARTICLE_MESH_MODIFIER_CONST NiParticleMeshModifier::~NiParticleMeshModifier() {} -void NiParticleMeshModifier::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiParticleMeshModifier::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void NiParticleMeshModifier::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiParticleMeshModifier::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -24,7 +24,7 @@ string NiParticleMeshModifier::asString( bool verbose ) const { return InternalAsString( verbose ); } -void NiParticleMeshModifier::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiParticleMeshModifier::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } diff --git a/src/obj/NiParticleMeshes.cpp b/src/obj/NiParticleMeshes.cpp index 9716483107672bc3996c94dbe5ba3d44b8583ec2..807e969514141e11fdadf81d0c342aa65fde66ee 100644 --- a/src/obj/NiParticleMeshes.cpp +++ b/src/obj/NiParticleMeshes.cpp @@ -11,11 +11,11 @@ NiParticleMeshes::NiParticleMeshes() NI_PARTICLE_MESHES_CONSTRUCT {} NiParticleMeshes::~NiParticleMeshes() {} -void NiParticleMeshes::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiParticleMeshes::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void NiParticleMeshes::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiParticleMeshes::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -23,7 +23,7 @@ string NiParticleMeshes::asString( bool verbose ) const { return InternalAsString( verbose ); } -void NiParticleMeshes::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiParticleMeshes::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } diff --git a/src/obj/NiParticleMeshesData.cpp b/src/obj/NiParticleMeshesData.cpp index 7eb7093054face54bc0cf0d89e999e085d4f0a21..a42cd461fd3a2a91dc7f3aa1cf48455c58892756 100644 --- a/src/obj/NiParticleMeshesData.cpp +++ b/src/obj/NiParticleMeshesData.cpp @@ -12,11 +12,11 @@ NiParticleMeshesData::NiParticleMeshesData() NI_PARTICLE_MESHES_DATA_CONSTRUCT { NiParticleMeshesData::~NiParticleMeshesData() {} -void NiParticleMeshesData::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiParticleMeshesData::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void NiParticleMeshesData::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiParticleMeshesData::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -24,7 +24,7 @@ string NiParticleMeshesData::asString( bool verbose ) const { return InternalAsString( verbose ); } -void NiParticleMeshesData::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiParticleMeshesData::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } diff --git a/src/obj/NiParticleRotation.cpp b/src/obj/NiParticleRotation.cpp index dba0ff4463426d9c2fa4abce30601284df98b83f..1bdc2240ddc12bd952439a861337b1b3ae941cb2 100644 --- a/src/obj/NiParticleRotation.cpp +++ b/src/obj/NiParticleRotation.cpp @@ -11,11 +11,11 @@ NiParticleRotation::NiParticleRotation() NI_PARTICLE_ROTATION_CONSTRUCT {} NiParticleRotation::~NiParticleRotation() {} -void NiParticleRotation::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiParticleRotation::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void NiParticleRotation::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiParticleRotation::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -23,7 +23,7 @@ string NiParticleRotation::asString( bool verbose ) const { return InternalAsString( verbose ); } -void NiParticleRotation::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiParticleRotation::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } diff --git a/src/obj/NiParticleSystem.cpp b/src/obj/NiParticleSystem.cpp index b6fa769d50f58894d40558bca75993bb9468209f..9d1d0700d05201b58bd0bb199314d72c007b0783 100644 --- a/src/obj/NiParticleSystem.cpp +++ b/src/obj/NiParticleSystem.cpp @@ -12,11 +12,11 @@ NiParticleSystem::NiParticleSystem() NI_PARTICLE_SYSTEM_CONSTRUCT {} NiParticleSystem::~NiParticleSystem() {} -void NiParticleSystem::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiParticleSystem::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void NiParticleSystem::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiParticleSystem::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -24,7 +24,7 @@ string NiParticleSystem::asString( bool verbose ) const { return InternalAsString( verbose ); } -void NiParticleSystem::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiParticleSystem::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } diff --git a/src/obj/NiParticleSystemController.cpp b/src/obj/NiParticleSystemController.cpp index 04741c36ed9410316da82fb8972cae67b0c97b1e..9c53401cd7f797a080328b3f46e8c9bebaf92177 100644 --- a/src/obj/NiParticleSystemController.cpp +++ b/src/obj/NiParticleSystemController.cpp @@ -14,11 +14,11 @@ NiParticleSystemController::NiParticleSystemController() NI_PARTICLE_SYSTEM_CONT NiParticleSystemController::~NiParticleSystemController() {} -void NiParticleSystemController::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiParticleSystemController::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void NiParticleSystemController::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiParticleSystemController::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -26,7 +26,7 @@ string NiParticleSystemController::asString( bool verbose ) const { return InternalAsString( verbose ); } -void NiParticleSystemController::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiParticleSystemController::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } diff --git a/src/obj/NiParticles.cpp b/src/obj/NiParticles.cpp index 23a38d86e14f931abb3dea44284e514efa4f5c9d..9944a7a1cf12eabf04f511cb632e16c1fdd6a206 100644 --- a/src/obj/NiParticles.cpp +++ b/src/obj/NiParticles.cpp @@ -11,11 +11,11 @@ NiParticles::NiParticles() NI_PARTICLES_CONSTRUCT {} NiParticles::~NiParticles() {} -void NiParticles::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiParticles::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void NiParticles::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiParticles::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -23,7 +23,7 @@ string NiParticles::asString( bool verbose ) const { return InternalAsString( verbose ); } -void NiParticles::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiParticles::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } diff --git a/src/obj/NiParticlesData.cpp b/src/obj/NiParticlesData.cpp index ad3e48f14a2eb3992a247fd56650e1ab86665850..e6f882e3a6af20999fd1ccffa80d666a6fe859d9 100644 --- a/src/obj/NiParticlesData.cpp +++ b/src/obj/NiParticlesData.cpp @@ -11,11 +11,11 @@ NiParticlesData::NiParticlesData() NI_PARTICLES_DATA_CONSTRUCT {} NiParticlesData::~NiParticlesData() {} -void NiParticlesData::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiParticlesData::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void NiParticlesData::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiParticlesData::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -23,7 +23,7 @@ string NiParticlesData::asString( bool verbose ) const { return InternalAsString( verbose ); } -void NiParticlesData::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiParticlesData::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } diff --git a/src/obj/NiPathController.cpp b/src/obj/NiPathController.cpp index a096f6e56258c3ab046c0be5f4330a379cd13984..755bd6b4906390218c4d95f4be3a488f9c23e4c5 100644 --- a/src/obj/NiPathController.cpp +++ b/src/obj/NiPathController.cpp @@ -13,11 +13,11 @@ NiPathController::NiPathController() NI_PATH_CONTROLLER_CONSTRUCT {} NiPathController::~NiPathController() {} -void NiPathController::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiPathController::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void NiPathController::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiPathController::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -25,7 +25,7 @@ string NiPathController::asString( bool verbose ) const { return InternalAsString( verbose ); } -void NiPathController::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiPathController::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } diff --git a/src/obj/NiPathInterpolator.cpp b/src/obj/NiPathInterpolator.cpp index ccfb4efe0f9522db71e886352db462442e5cf31b..035a3c400b58b6177b96309f06c231ef650a853b 100644 --- a/src/obj/NiPathInterpolator.cpp +++ b/src/obj/NiPathInterpolator.cpp @@ -13,11 +13,11 @@ NiPathInterpolator::NiPathInterpolator() NI_PATH_INTERPOLATOR_CONSTRUCT {} NiPathInterpolator::~NiPathInterpolator() {} -void NiPathInterpolator::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiPathInterpolator::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void NiPathInterpolator::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiPathInterpolator::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -25,7 +25,7 @@ string NiPathInterpolator::asString( bool verbose ) const { return InternalAsString( verbose ); } -void NiPathInterpolator::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiPathInterpolator::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } diff --git a/src/obj/NiPixelData.cpp b/src/obj/NiPixelData.cpp index 4abe4ae7a177683910eb07746041511db78e1966..f03d62beebe3222dd530e747f390f7e1088784d4 100644 --- a/src/obj/NiPixelData.cpp +++ b/src/obj/NiPixelData.cpp @@ -14,11 +14,11 @@ NiPixelData::NiPixelData() NI_PIXEL_DATA_CONSTRUCT {} NiPixelData::~NiPixelData() {} -void NiPixelData::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiPixelData::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void NiPixelData::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiPixelData::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -26,7 +26,7 @@ string NiPixelData::asString( bool verbose ) const { return InternalAsString( verbose ); } -void NiPixelData::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiPixelData::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } @@ -152,7 +152,7 @@ vector<Color4> NiPixelData::GetColors() const { pixels.resize( mipmaps[0].width * mipmaps[0].height ); switch(pixelFormat) { case PX_FMT_RGB8: - for ( uint i = 0; i < pixels.size(); ++i ) { + for ( unsigned int i = 0; i < pixels.size(); ++i ) { pixels[i].r = float(pixelData.data[i * 3]) / 255.0f; pixels[i].g = float(pixelData.data[i * 3 + 1]) / 255.0f; pixels[i].b = float(pixelData.data[i * 3 + 2]) / 255.0f; @@ -160,7 +160,7 @@ vector<Color4> NiPixelData::GetColors() const { } break; case PX_FMT_RGBA8: - for ( uint i = 0; i < pixels.size(); ++i ) { + for ( unsigned int i = 0; i < pixels.size(); ++i ) { pixels[i].r = float(pixelData.data[i * 4]) / 255.0f; pixels[i].g = float(pixelData.data[i * 4 + 1]) / 255.0f; pixels[i].b = float(pixelData.data[i * 4 + 2]) / 255.0f; @@ -198,7 +198,7 @@ void NiPixelData::SetColors( const vector<Color4> & new_pixels, bool generate_mi throw runtime_error("You must pass one color for every pixel in the image. There should be height * width colors."); } - uint size = 0; + unsigned int size = 0; mipmaps.resize(1); size = (mipmaps[0].height * mipmaps[0].width * bitsPerPixel) / 8; @@ -234,19 +234,19 @@ void NiPixelData::SetColors( const vector<Color4> & new_pixels, bool generate_mi //Copy pixels to Color4 C array Color4 * tmp_image = new Color4[new_pixels.size()]; - for (uint i = 0; i < new_pixels.size(); ++i ) { + for (unsigned int i = 0; i < new_pixels.size(); ++i ) { tmp_image[i] = new_pixels[i]; } //Pack pixel data - for (uint i = 0; i < mipmaps.size(); ++i ) { + for (unsigned int i = 0; i < mipmaps.size(); ++i ) { if ( i > 0 ) { //Allocate space to store re-sized image. Color4 * resized = new Color4[ mipmaps[i].width * mipmaps[i].height ]; //Visit every other pixel in each row and column of the previous image - for ( uint w = 0; w < mipmaps[i-1].width; w+=2 ) { - for ( uint h = 0; h < mipmaps[i-1].height; h+=2 ) { + for ( unsigned int w = 0; w < mipmaps[i-1].width; w+=2 ) { + for ( unsigned int h = 0; h < mipmaps[i-1].height; h+=2 ) { Color4 & av = resized[(h/2) * mipmaps[i].width + (w/2)]; //Start with the value of the current pixel @@ -313,7 +313,7 @@ void NiPixelData::SetColors( const vector<Color4> & new_pixels, bool generate_mi switch(pixelFormat) { case PX_FMT_RGB8: - for ( uint j = 0; j < mipmaps[i].width * mipmaps[i].height; ++j ) { + for ( unsigned int j = 0; j < mipmaps[i].width * mipmaps[i].height; ++j ) { map[j * 3] = int( tmp_image[j].r * 255.0f ); map[j * 3 + 1] = int( tmp_image[j].g * 255.0f ); map[j * 3 + 2] = int( tmp_image[j].b * 255.0f ); @@ -326,7 +326,7 @@ void NiPixelData::SetColors( const vector<Color4> & new_pixels, bool generate_mi //#endif break; case PX_FMT_RGBA8: - for ( uint j = 0; j < mipmaps[i].width * mipmaps[i].height; ++j ) { + for ( unsigned int j = 0; j < mipmaps[i].width * mipmaps[i].height; ++j ) { map[j * 4] = int( tmp_image[j].r * 255.0f ); map[j * 4 + 1] = int( tmp_image[j].g * 255.0f ); map[j * 4 + 2] = int( tmp_image[j].b * 255.0f ); diff --git a/src/obj/NiPlanarCollider.cpp b/src/obj/NiPlanarCollider.cpp index b72889ffd843169348a663f31e2969478cdae3e8..e5c3ebaa82ee4fce50eaf9b384fb09b735117b07 100644 --- a/src/obj/NiPlanarCollider.cpp +++ b/src/obj/NiPlanarCollider.cpp @@ -11,11 +11,11 @@ NiPlanarCollider::NiPlanarCollider() NI_PLANAR_COLLIDER_CONSTRUCT {} NiPlanarCollider::~NiPlanarCollider() {} -void NiPlanarCollider::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiPlanarCollider::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void NiPlanarCollider::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiPlanarCollider::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -23,7 +23,7 @@ string NiPlanarCollider::asString( bool verbose ) const { return InternalAsString( verbose ); } -void NiPlanarCollider::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiPlanarCollider::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } diff --git a/src/obj/NiPoint3Interpolator.cpp b/src/obj/NiPoint3Interpolator.cpp index 6b5eb303bfa2f6004e89b7ad3344fb40f215d66d..39078d42115e3bc2b9a962f37a9dda0b72b93a71 100644 --- a/src/obj/NiPoint3Interpolator.cpp +++ b/src/obj/NiPoint3Interpolator.cpp @@ -12,11 +12,11 @@ NiPoint3Interpolator::NiPoint3Interpolator() NI_POINT3_INTERPOLATOR_CONSTRUCT {} NiPoint3Interpolator::~NiPoint3Interpolator() {} -void NiPoint3Interpolator::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiPoint3Interpolator::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void NiPoint3Interpolator::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiPoint3Interpolator::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -24,7 +24,7 @@ string NiPoint3Interpolator::asString( bool verbose ) const { return InternalAsString( verbose ); } -void NiPoint3Interpolator::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiPoint3Interpolator::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } diff --git a/src/obj/NiPointLight.cpp b/src/obj/NiPointLight.cpp index 09f4793a70ccacbf52ab2067567b6d5d6d2a463b..828a1a6f76dabbe85c0059700917da346ea048aa 100644 --- a/src/obj/NiPointLight.cpp +++ b/src/obj/NiPointLight.cpp @@ -11,11 +11,11 @@ NiPointLight::NiPointLight() NI_POINT_LIGHT_CONSTRUCT {} NiPointLight::~NiPointLight() {} -void NiPointLight::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiPointLight::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void NiPointLight::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiPointLight::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -23,7 +23,7 @@ string NiPointLight::asString( bool verbose ) const { return InternalAsString( verbose ); } -void NiPointLight::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiPointLight::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } diff --git a/src/obj/NiPosData.cpp b/src/obj/NiPosData.cpp index dc8d337331b6180322e9d78add712756bf16b1e2..081bb5b988f3d8ad3213e3541d358f205b040415 100644 --- a/src/obj/NiPosData.cpp +++ b/src/obj/NiPosData.cpp @@ -12,11 +12,11 @@ NiPosData::NiPosData() NI_POS_DATA_CONSTRUCT {} NiPosData::~NiPosData() {} -void NiPosData::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiPosData::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void NiPosData::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiPosData::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -24,7 +24,7 @@ string NiPosData::asString( bool verbose ) const { return InternalAsString( verbose ); } -void NiPosData::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiPosData::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } diff --git a/src/obj/NiProperty.cpp b/src/obj/NiProperty.cpp index a43690df52ee49702555723c7335a2e40b585f7c..d1b79dc3c2cc8c511105e094110503ca134d96be 100644 --- a/src/obj/NiProperty.cpp +++ b/src/obj/NiProperty.cpp @@ -11,11 +11,11 @@ NiProperty::NiProperty() NI_PROPERTY_CONSTRUCT {} NiProperty::~NiProperty() {} -void NiProperty::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiProperty::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void NiProperty::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiProperty::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -23,7 +23,7 @@ string NiProperty::asString( bool verbose ) const { return InternalAsString( verbose ); } -void NiProperty::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiProperty::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } diff --git a/src/obj/NiRangeLODData.cpp b/src/obj/NiRangeLODData.cpp index af2087f4452c824ed02cc5669a50416bb740be2e..3ac50fb2d9f36ae0f1d3ee2116fa25a7b4be9188 100644 --- a/src/obj/NiRangeLODData.cpp +++ b/src/obj/NiRangeLODData.cpp @@ -12,11 +12,11 @@ NiRangeLODData::NiRangeLODData() NI_RANGE_L_O_D_DATA_CONSTRUCT {} NiRangeLODData::~NiRangeLODData() {} -void NiRangeLODData::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiRangeLODData::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void NiRangeLODData::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiRangeLODData::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -24,7 +24,7 @@ string NiRangeLODData::asString( bool verbose ) const { return InternalAsString( verbose ); } -void NiRangeLODData::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiRangeLODData::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } diff --git a/src/obj/NiRotatingParticles.cpp b/src/obj/NiRotatingParticles.cpp index 52c55e77cd56474f1b645c9f2d6643a2c97ea741..a09852b04ac340ab5c30ef3f3a229d77a70badf5 100644 --- a/src/obj/NiRotatingParticles.cpp +++ b/src/obj/NiRotatingParticles.cpp @@ -11,11 +11,11 @@ NiRotatingParticles::NiRotatingParticles() NI_ROTATING_PARTICLES_CONSTRUCT {} NiRotatingParticles::~NiRotatingParticles() {} -void NiRotatingParticles::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiRotatingParticles::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void NiRotatingParticles::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiRotatingParticles::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -23,7 +23,7 @@ string NiRotatingParticles::asString( bool verbose ) const { return InternalAsString( verbose ); } -void NiRotatingParticles::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiRotatingParticles::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } diff --git a/src/obj/NiRotatingParticlesData.cpp b/src/obj/NiRotatingParticlesData.cpp index 0ec661b8b25bccf50f42e57c707c1bd283b777f0..e743a607e64ce2d37505878f622131ab4d0989e4 100644 --- a/src/obj/NiRotatingParticlesData.cpp +++ b/src/obj/NiRotatingParticlesData.cpp @@ -11,11 +11,11 @@ NiRotatingParticlesData::NiRotatingParticlesData() NI_ROTATING_PARTICLES_DATA_CO NiRotatingParticlesData::~NiRotatingParticlesData() {} -void NiRotatingParticlesData::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiRotatingParticlesData::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void NiRotatingParticlesData::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiRotatingParticlesData::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -23,7 +23,7 @@ string NiRotatingParticlesData::asString( bool verbose ) const { return InternalAsString( verbose ); } -void NiRotatingParticlesData::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiRotatingParticlesData::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } diff --git a/src/obj/NiScreenLODData.cpp b/src/obj/NiScreenLODData.cpp index 3674325421d3040253953dd213d7c0e682391ee6..c285ce21082c15468080584d29f6f0956716e488 100644 --- a/src/obj/NiScreenLODData.cpp +++ b/src/obj/NiScreenLODData.cpp @@ -11,11 +11,11 @@ NiScreenLODData::NiScreenLODData() NI_SCREEN_L_O_D_DATA_CONSTRUCT {} NiScreenLODData::~NiScreenLODData() {} -void NiScreenLODData::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiScreenLODData::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void NiScreenLODData::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiScreenLODData::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -23,7 +23,7 @@ string NiScreenLODData::asString( bool verbose ) const { return InternalAsString( verbose ); } -void NiScreenLODData::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiScreenLODData::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } diff --git a/src/obj/NiSequenceStreamHelper.cpp b/src/obj/NiSequenceStreamHelper.cpp index 16dc4bc2fed08026981867bfb68cb0d6623ba65b..ad8e778ac518d92eeeaaf0107fd037e12a78f669 100644 --- a/src/obj/NiSequenceStreamHelper.cpp +++ b/src/obj/NiSequenceStreamHelper.cpp @@ -11,11 +11,11 @@ NiSequenceStreamHelper::NiSequenceStreamHelper() NI_SEQUENCE_STREAM_HELPER_CONST NiSequenceStreamHelper::~NiSequenceStreamHelper() {} -void NiSequenceStreamHelper::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiSequenceStreamHelper::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void NiSequenceStreamHelper::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiSequenceStreamHelper::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -23,7 +23,7 @@ string NiSequenceStreamHelper::asString( bool verbose ) const { return InternalAsString( verbose ); } -void NiSequenceStreamHelper::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiSequenceStreamHelper::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } diff --git a/src/obj/NiShadeProperty.cpp b/src/obj/NiShadeProperty.cpp index d35e6e76eab65e3eb692134217d074645858865d..1692e5a4cc4472508397b127bb7040c4dea48882 100644 --- a/src/obj/NiShadeProperty.cpp +++ b/src/obj/NiShadeProperty.cpp @@ -11,11 +11,11 @@ NiShadeProperty::NiShadeProperty() NI_SHADE_PROPERTY_CONSTRUCT {} NiShadeProperty::~NiShadeProperty() {} -void NiShadeProperty::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiShadeProperty::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void NiShadeProperty::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiShadeProperty::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -23,7 +23,7 @@ string NiShadeProperty::asString( bool verbose ) const { return InternalAsString( verbose ); } -void NiShadeProperty::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiShadeProperty::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } @@ -35,10 +35,10 @@ const Type & NiShadeProperty::GetType() const { return TYPE; }; -ushort NiShadeProperty::GetFlags() const { +unsigned short NiShadeProperty::GetFlags() const { return flags; } -void NiShadeProperty::SetFlags( ushort n ) { +void NiShadeProperty::SetFlags( unsigned short n ) { flags = n; } diff --git a/src/obj/NiSingleInterpolatorController.cpp b/src/obj/NiSingleInterpolatorController.cpp index bfd8fe5ebc3895162459fb1f64ba6076f8ff1ba3..dad4acf37b52ea2e0e54145cee333b46588037ed 100644 --- a/src/obj/NiSingleInterpolatorController.cpp +++ b/src/obj/NiSingleInterpolatorController.cpp @@ -12,11 +12,11 @@ NiSingleInterpolatorController::NiSingleInterpolatorController() NI_SINGLE_INTER NiSingleInterpolatorController::~NiSingleInterpolatorController() {} -void NiSingleInterpolatorController::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiSingleInterpolatorController::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void NiSingleInterpolatorController::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiSingleInterpolatorController::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -24,7 +24,7 @@ string NiSingleInterpolatorController::asString( bool verbose ) const { return InternalAsString( verbose ); } -void NiSingleInterpolatorController::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiSingleInterpolatorController::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } diff --git a/src/obj/NiSkinData.cpp b/src/obj/NiSkinData.cpp index 3f32783806b9cc1511a06c34c606f46eb68e8dcc..50e90189df1cb65c2c839060a35bf871fab22c83 100644 --- a/src/obj/NiSkinData.cpp +++ b/src/obj/NiSkinData.cpp @@ -17,11 +17,11 @@ NiSkinData::NiSkinData() NI_SKIN_DATA_CONSTRUCT {} NiSkinData::~NiSkinData() {} -void NiSkinData::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiSkinData::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void NiSkinData::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiSkinData::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -29,7 +29,7 @@ string NiSkinData::asString( bool verbose ) const { return InternalAsString( verbose ); } -void NiSkinData::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiSkinData::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } @@ -41,11 +41,11 @@ const Type & NiSkinData::GetType() const { return TYPE; }; -uint NiSkinData::GetBoneCount() const { - return uint( boneList.size() ); +unsigned int NiSkinData::GetBoneCount() const { + return unsigned int( boneList.size() ); } -Matrix44 NiSkinData::GetBoneTransform( uint bone_index ) const { +Matrix44 NiSkinData::GetBoneTransform( unsigned int bone_index ) const { if ( bone_index > boneList.size() ) { throw runtime_error( "The specified bone index was larger than the number of bones in this NiSkinData." ); } @@ -53,7 +53,7 @@ Matrix44 NiSkinData::GetBoneTransform( uint bone_index ) const { return Matrix44( boneList[bone_index].translation, boneList[bone_index].rotation, boneList[bone_index].scale ); } -vector<SkinWeight> NiSkinData::GetBoneWeights( uint bone_index ) const { +vector<SkinWeight> NiSkinData::GetBoneWeights( unsigned int bone_index ) const { if ( bone_index > boneList.size() ) { throw runtime_error( "The specified bone index was larger than the number of bones in this NiSkinData." ); } @@ -61,7 +61,7 @@ vector<SkinWeight> NiSkinData::GetBoneWeights( uint bone_index ) const { return boneList[bone_index].vertexWeights; } -void NiSkinData::SetBoneWeights( uint bone_index, const vector<SkinWeight> & n, Vector3 center, float radius ) { +void NiSkinData::SetBoneWeights( unsigned int bone_index, const vector<SkinWeight> & n, Vector3 center, float radius ) { if ( bone_index > boneList.size() ) { throw runtime_error( "The specified bone index was larger than the number of bones in this NiSkinData." ); } @@ -149,7 +149,7 @@ void NiSkinData::ResetOffsets( const Ref<NiGeometry> & owner ) { //--Calculate Bone Offsets--// Matrix44 res_mat; Matrix44 bone_mat; - for (uint i = 0; i < boneList.size(); ++i ) { + for (unsigned int i = 0; i < boneList.size(); ++i ) { //--Get Bone Bind Pose--// //Get bone world position diff --git a/src/obj/NiSkinInstance.cpp b/src/obj/NiSkinInstance.cpp index 0b8c3bd7300b894fee0d7fbd1d7ce597adf8094c..d3ad7536010a7911ff9eb8bad3bc59fd2a12ed06 100644 --- a/src/obj/NiSkinInstance.cpp +++ b/src/obj/NiSkinInstance.cpp @@ -15,7 +15,7 @@ NiSkinInstance::NiSkinInstance() NI_SKIN_INSTANCE_CONSTRUCT {} NiSkinInstance::NiSkinInstance( Ref<NiNode> skeleton_root, vector< Ref<NiNode> > bone_nodes ) NI_SKIN_INSTANCE_CONSTRUCT { //Ensure that all bones are below the skeleton root node on the scene graph - for ( uint i = 0; i < bone_nodes.size(); ++i ) { + for ( unsigned int i = 0; i < bone_nodes.size(); ++i ) { bool is_decended = false; NiNodeRef node = bone_nodes[i]; while ( node != NULL ) { @@ -32,12 +32,12 @@ NiSkinInstance::NiSkinInstance( Ref<NiNode> skeleton_root, vector< Ref<NiNode> > //Add the bones to the internal list bones.resize( bone_nodes.size() ); - for ( uint i = 0; i < bone_nodes.size(); ++i ) { + for ( unsigned int i = 0; i < bone_nodes.size(); ++i ) { bones[i] = bone_nodes[i]; } //Flag any bones that are part of this skin instance - for ( uint i = 0; i < bones.size(); ++i ) { + for ( unsigned int i = 0; i < bones.size(); ++i ) { bones[i]->SetSkinFlag(true); } @@ -48,7 +48,7 @@ NiSkinInstance::NiSkinInstance( Ref<NiNode> skeleton_root, vector< Ref<NiNode> > NiSkinInstance::~NiSkinInstance() { //Unflag any bones that were part of this skin instance - for ( uint i = 0; i < bones.size(); ++i ) { + for ( unsigned int i = 0; i < bones.size(); ++i ) { bones[i]->SetSkinFlag(false); } @@ -59,11 +59,11 @@ NiSkinInstance::~NiSkinInstance() { } } -void NiSkinInstance::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiSkinInstance::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void NiSkinInstance::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiSkinInstance::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -71,7 +71,7 @@ string NiSkinInstance::asString( bool verbose ) const { return InternalAsString( verbose ); } -void NiSkinInstance::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiSkinInstance::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); //Inform newly fixed skeleton root of attachment @@ -80,7 +80,7 @@ void NiSkinInstance::FixLinks( const map<unsigned int,NiObjectRef> & objects, li } //Ensure that bones have the flag set properly - for ( uint i = 0; i < bones.size(); ++i ) { + for ( unsigned int i = 0; i < bones.size(); ++i ) { bones[i]->SetSkinFlag(true); } } @@ -95,7 +95,7 @@ const Type & NiSkinInstance::GetType() const { vector< Ref<NiNode> > NiSkinInstance::GetBones() const { vector<NiNodeRef> ref_bones( bones.size() ); - for (uint i = 0; i < bones.size(); ++i ) { + for (unsigned int i = 0; i < bones.size(); ++i ) { ref_bones[i] = bones[i]; } return ref_bones; @@ -128,8 +128,8 @@ void NiSkinInstance::SkeletonLost() { skinPartition = NULL; } -uint NiSkinInstance::GetBoneCount() const { - return uint(bones.size()); +unsigned int NiSkinInstance::GetBoneCount() const { + return unsigned int(bones.size()); } Ref<NiNode> NiSkinInstance::GetSkeletonRoot() const { diff --git a/src/obj/NiSourceTexture.cpp b/src/obj/NiSourceTexture.cpp index 4fa58a2726a40fab608b037be97b094c513ef31b..55189b94520f6702fe07a043c0f6a3f1af0e86b1 100644 --- a/src/obj/NiSourceTexture.cpp +++ b/src/obj/NiSourceTexture.cpp @@ -13,11 +13,11 @@ NiSourceTexture::NiSourceTexture() NI_SOURCE_TEXTURE_CONSTRUCT {} NiSourceTexture::~NiSourceTexture() {} -void NiSourceTexture::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiSourceTexture::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void NiSourceTexture::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiSourceTexture::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -25,7 +25,7 @@ string NiSourceTexture::asString( bool verbose ) const { return InternalAsString( verbose ); } -void NiSourceTexture::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiSourceTexture::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } diff --git a/src/obj/NiSpecularProperty.cpp b/src/obj/NiSpecularProperty.cpp index 1f86e0ba03afd8a957b79ce68599e349336c30d3..d8538a3e6e2d27b1644ac1cf701b7604f1f197d6 100644 --- a/src/obj/NiSpecularProperty.cpp +++ b/src/obj/NiSpecularProperty.cpp @@ -11,11 +11,11 @@ NiSpecularProperty::NiSpecularProperty() NI_SPECULAR_PROPERTY_CONSTRUCT {} NiSpecularProperty::~NiSpecularProperty() {} -void NiSpecularProperty::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiSpecularProperty::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void NiSpecularProperty::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiSpecularProperty::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -23,7 +23,7 @@ string NiSpecularProperty::asString( bool verbose ) const { return InternalAsString( verbose ); } -void NiSpecularProperty::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiSpecularProperty::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } @@ -35,10 +35,10 @@ const Type & NiSpecularProperty::GetType() const { return TYPE; }; -ushort NiSpecularProperty::GetFlags() const { +unsigned short NiSpecularProperty::GetFlags() const { return flags; } -void NiSpecularProperty::SetFlags( ushort n ) { +void NiSpecularProperty::SetFlags( unsigned short n ) { flags = n; } diff --git a/src/obj/NiSphericalCollider.cpp b/src/obj/NiSphericalCollider.cpp index d13fd3f872085d5edf27ff468a74b069e2a4eff5..612efafb787cb2bbbfbca6fcfa600f2150496fb3 100644 --- a/src/obj/NiSphericalCollider.cpp +++ b/src/obj/NiSphericalCollider.cpp @@ -11,11 +11,11 @@ NiSphericalCollider::NiSphericalCollider() NI_SPHERICAL_COLLIDER_CONSTRUCT {} NiSphericalCollider::~NiSphericalCollider() {} -void NiSphericalCollider::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiSphericalCollider::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void NiSphericalCollider::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiSphericalCollider::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -23,7 +23,7 @@ string NiSphericalCollider::asString( bool verbose ) const { return InternalAsString( verbose ); } -void NiSphericalCollider::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiSphericalCollider::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } diff --git a/src/obj/NiSpotLight.cpp b/src/obj/NiSpotLight.cpp index 780e3aa5bab1db8e540bb58db02c25ce5edd4d88..1dc0e6e0ff3ba1bce0b89f2f0e1a8971292831c9 100644 --- a/src/obj/NiSpotLight.cpp +++ b/src/obj/NiSpotLight.cpp @@ -11,11 +11,11 @@ NiSpotLight::NiSpotLight() NI_SPOT_LIGHT_CONSTRUCT {} NiSpotLight::~NiSpotLight() {} -void NiSpotLight::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiSpotLight::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void NiSpotLight::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiSpotLight::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -23,7 +23,7 @@ string NiSpotLight::asString( bool verbose ) const { return InternalAsString( verbose ); } -void NiSpotLight::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiSpotLight::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } diff --git a/src/obj/NiStencilProperty.cpp b/src/obj/NiStencilProperty.cpp index d42202f36b5f3a5d7ef94183154c8c07a175ecd1..008e7767bf1cac25778ed33182b9737b8fe3e690 100644 --- a/src/obj/NiStencilProperty.cpp +++ b/src/obj/NiStencilProperty.cpp @@ -11,11 +11,11 @@ NiStencilProperty::NiStencilProperty() NI_STENCIL_PROPERTY_CONSTRUCT {} NiStencilProperty::~NiStencilProperty() {} -void NiStencilProperty::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiStencilProperty::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void NiStencilProperty::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiStencilProperty::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -23,7 +23,7 @@ string NiStencilProperty::asString( bool verbose ) const { return InternalAsString( verbose ); } -void NiStencilProperty::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiStencilProperty::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } @@ -35,11 +35,11 @@ const Type & NiStencilProperty::GetType() const { return TYPE; }; -ushort NiStencilProperty::GetFlags() const { +unsigned short NiStencilProperty::GetFlags() const { return flags; } -void NiStencilProperty::SetFlags(ushort value) { +void NiStencilProperty::SetFlags(unsigned short value) { flags = value; } @@ -59,19 +59,19 @@ void NiStencilProperty::SetStencilFunction(CompareMode value) { stencilFunction = value; } -uint NiStencilProperty::GetStencilRef() const { +unsigned int NiStencilProperty::GetStencilRef() const { return stencilRef; } -void NiStencilProperty::SetStencilRef(uint value) { +void NiStencilProperty::SetStencilRef(unsigned int value) { stencilRef = value; } -uint NiStencilProperty::GetStencilMask() const { +unsigned int NiStencilProperty::GetStencilMask() const { return stencilMask; } -void NiStencilProperty::SetStencilMask(uint value) { +void NiStencilProperty::SetStencilMask(unsigned int value) { stencilMask = value; } diff --git a/src/obj/NiStringExtraData.cpp b/src/obj/NiStringExtraData.cpp index ec512a3c01c58a9ee28c165990b9caccf9cc9bcc..9b11037f1440631d8e5b1cd4f7918fc4cafdc13d 100644 --- a/src/obj/NiStringExtraData.cpp +++ b/src/obj/NiStringExtraData.cpp @@ -11,11 +11,11 @@ NiStringExtraData::NiStringExtraData() NI_STRING_EXTRA_DATA_CONSTRUCT {} NiStringExtraData::~NiStringExtraData() {} -void NiStringExtraData::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiStringExtraData::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void NiStringExtraData::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiStringExtraData::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -23,7 +23,7 @@ string NiStringExtraData::asString( bool verbose ) const { return InternalAsString( verbose ); } -void NiStringExtraData::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiStringExtraData::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } @@ -41,5 +41,5 @@ string NiStringExtraData::GetData() const { void NiStringExtraData::SetData( const string & n ) { stringData = n; - bytesRemaining = uint(stringData.size()) + 4; + bytesRemaining = unsigned int(stringData.size()) + 4; } diff --git a/src/obj/NiStringPalette.cpp b/src/obj/NiStringPalette.cpp index 72e673ef41f5e285e192b3b1539a4cd9a9c2775c..a766bf7845eb847f78b465014883646e732fbecc 100644 --- a/src/obj/NiStringPalette.cpp +++ b/src/obj/NiStringPalette.cpp @@ -12,11 +12,11 @@ NiStringPalette::NiStringPalette() NI_STRING_PALETTE_CONSTRUCT {} NiStringPalette::~NiStringPalette() {} -void NiStringPalette::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiStringPalette::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void NiStringPalette::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiStringPalette::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -24,7 +24,7 @@ string NiStringPalette::asString( bool verbose ) const { return InternalAsString( verbose ); } -void NiStringPalette::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiStringPalette::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } @@ -52,7 +52,7 @@ string NiStringPalette::GetSubStr( short offset ) const { return out; } - for ( uint i = offset; i < palette.palette.size(); ++i ) { + for ( unsigned int i = offset; i < palette.palette.size(); ++i ) { if ( palette.palette[i] == '\0' ) { break; } @@ -65,11 +65,11 @@ string NiStringPalette::GetSubStr( short offset ) const { unsigned int NiStringPalette::AddSubStr( const string & n ) { //Search for the string // When searching for strings also search for ending null. - uint offset = (uint)palette.palette.find( n.c_str(), 0, n.size()+1 ); + unsigned int offset = (unsigned int)palette.palette.find( n.c_str(), 0, n.size()+1 ); //If string was not found, append it if ( offset == 0xFFFFFFFF ) { - offset = (uint)palette.palette.size(); + offset = (unsigned int)palette.palette.size(); palette.palette.append( n + '\0' ); } diff --git a/src/obj/NiStringsExtraData.cpp b/src/obj/NiStringsExtraData.cpp index ca6911abdbfd09816ac1aba057db8436d975a49b..3b0e5b4cd7393032fe2a6a8ce2fd671a9540c9e2 100644 --- a/src/obj/NiStringsExtraData.cpp +++ b/src/obj/NiStringsExtraData.cpp @@ -11,11 +11,11 @@ NiStringsExtraData::NiStringsExtraData() NI_STRINGS_EXTRA_DATA_CONSTRUCT {} NiStringsExtraData::~NiStringsExtraData() {} -void NiStringsExtraData::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiStringsExtraData::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void NiStringsExtraData::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiStringsExtraData::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -23,7 +23,7 @@ string NiStringsExtraData::asString( bool verbose ) const { return InternalAsString( verbose ); } -void NiStringsExtraData::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiStringsExtraData::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } @@ -40,6 +40,6 @@ vector<string> NiStringsExtraData::GetData() const { }; void NiStringsExtraData::SetData( const vector<string> & n ) { - numStrings = uint(n.size()); + numStrings = unsigned int(n.size()); data = n; }; diff --git a/src/obj/NiTextKeyExtraData.cpp b/src/obj/NiTextKeyExtraData.cpp index fb6104a61139d95b9def6aed0e73ded94b46b669..d5f418c9db1c80f66123a0eb6a5d6dd1b9cfe0c0 100644 --- a/src/obj/NiTextKeyExtraData.cpp +++ b/src/obj/NiTextKeyExtraData.cpp @@ -11,11 +11,11 @@ NiTextKeyExtraData::NiTextKeyExtraData() NI_TEXT_KEY_EXTRA_DATA_CONSTRUCT {} NiTextKeyExtraData::~NiTextKeyExtraData() {} -void NiTextKeyExtraData::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiTextKeyExtraData::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void NiTextKeyExtraData::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiTextKeyExtraData::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -23,7 +23,7 @@ string NiTextKeyExtraData::asString( bool verbose ) const { return InternalAsString( verbose ); } -void NiTextKeyExtraData::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiTextKeyExtraData::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } diff --git a/src/obj/NiTextureEffect.cpp b/src/obj/NiTextureEffect.cpp index 5ec879bcb6377a80bbdd19563a20171f3910f760..faa3b5e92bff52ea35a614effb189e11bd7a1a67 100644 --- a/src/obj/NiTextureEffect.cpp +++ b/src/obj/NiTextureEffect.cpp @@ -12,11 +12,11 @@ NiTextureEffect::NiTextureEffect() NI_TEXTURE_EFFECT_CONSTRUCT {} NiTextureEffect::~NiTextureEffect() {} -void NiTextureEffect::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiTextureEffect::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void NiTextureEffect::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiTextureEffect::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -24,7 +24,7 @@ string NiTextureEffect::asString( bool verbose ) const { return InternalAsString( verbose ); } -void NiTextureEffect::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiTextureEffect::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } @@ -68,19 +68,19 @@ void NiTextureEffect::SetTextureClamping( TexClampMode value ) { textureClamping = value; } -uint NiTextureEffect::GetTextureType() const { +unsigned int NiTextureEffect::GetTextureType() const { return textureType; } -void NiTextureEffect::SetTextureType( uint value ) { +void NiTextureEffect::SetTextureType( unsigned int value ) { textureType = value; } -uint NiTextureEffect::GetCoordinateGenerationType() const { +unsigned int NiTextureEffect::GetCoordinateGenerationType() const { return coordinateGenerationType; } -void NiTextureEffect::SetCoordinateGenerationType( uint value ) { +void NiTextureEffect::SetCoordinateGenerationType( unsigned int value ) { coordinateGenerationType = value; } @@ -100,19 +100,19 @@ void NiTextureEffect::SetClippingPlane( byte value ) { clippingPlane = value; } -ushort NiTextureEffect::GetPs2L() const { +unsigned short NiTextureEffect::GetPs2L() const { return ps2L; } -void NiTextureEffect::SetPs2L( ushort value ) { +void NiTextureEffect::SetPs2L( unsigned short value ) { ps2L = value; } -ushort NiTextureEffect::GetPs2K() const { +unsigned short NiTextureEffect::GetPs2K() const { return ps2K; } -void NiTextureEffect::SetPs2K( ushort value ) { +void NiTextureEffect::SetPs2K( unsigned short value ) { ps2K = value; } diff --git a/src/obj/NiTextureModeProperty.cpp b/src/obj/NiTextureModeProperty.cpp index f1476951dcacc35e622e5b596c22c693047617b4..a3098a931e15cbf4af40155dbe2cb35d4fff40c3 100644 --- a/src/obj/NiTextureModeProperty.cpp +++ b/src/obj/NiTextureModeProperty.cpp @@ -11,11 +11,11 @@ NiTextureModeProperty::NiTextureModeProperty() NI_TEXTURE_MODE_PROPERTY_CONSTRUC NiTextureModeProperty::~NiTextureModeProperty() {} -void NiTextureModeProperty::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiTextureModeProperty::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void NiTextureModeProperty::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiTextureModeProperty::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -23,7 +23,7 @@ string NiTextureModeProperty::asString( bool verbose ) const { return InternalAsString( verbose ); } -void NiTextureModeProperty::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiTextureModeProperty::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } diff --git a/src/obj/NiTextureProperty.cpp b/src/obj/NiTextureProperty.cpp index 450da0c47157390a198635edb94736488835f81a..a01329398893f2e3b793336aba866dc4c07ad0c6 100644 --- a/src/obj/NiTextureProperty.cpp +++ b/src/obj/NiTextureProperty.cpp @@ -12,11 +12,11 @@ NiTextureProperty::NiTextureProperty() NI_TEXTURE_PROPERTY_CONSTRUCT {} NiTextureProperty::~NiTextureProperty() {} -void NiTextureProperty::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiTextureProperty::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void NiTextureProperty::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiTextureProperty::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -24,7 +24,7 @@ string NiTextureProperty::asString( bool verbose ) const { return InternalAsString( verbose ); } -void NiTextureProperty::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiTextureProperty::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } diff --git a/src/obj/NiTextureTransformController.cpp b/src/obj/NiTextureTransformController.cpp index 7255f713b0fe02abc964b2bc95bf2b46f889859b..a7df8bf10b8756689fe933fadd805204201148d8 100644 --- a/src/obj/NiTextureTransformController.cpp +++ b/src/obj/NiTextureTransformController.cpp @@ -12,11 +12,11 @@ NiTextureTransformController::NiTextureTransformController() NI_TEXTURE_TRANSFOR NiTextureTransformController::~NiTextureTransformController() {} -void NiTextureTransformController::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiTextureTransformController::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void NiTextureTransformController::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiTextureTransformController::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -24,7 +24,7 @@ string NiTextureTransformController::asString( bool verbose ) const { return InternalAsString( verbose ); } -void NiTextureTransformController::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiTextureTransformController::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } diff --git a/src/obj/NiTexturingProperty.cpp b/src/obj/NiTexturingProperty.cpp index 907db770d0d4dd9eee519adde626b6f53c35d473..cc730962efc7a9c173cb03f22ef6914ab8e52dfb 100644 --- a/src/obj/NiTexturingProperty.cpp +++ b/src/obj/NiTexturingProperty.cpp @@ -13,11 +13,11 @@ NiTexturingProperty::NiTexturingProperty() NI_TEXTURING_PROPERTY_CONSTRUCT {} NiTexturingProperty::~NiTexturingProperty() {} -void NiTexturingProperty::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiTexturingProperty::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void NiTexturingProperty::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiTexturingProperty::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -25,7 +25,7 @@ string NiTexturingProperty::asString( bool verbose ) const { return InternalAsString( verbose ); } -void NiTexturingProperty::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiTexturingProperty::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } diff --git a/src/obj/NiTimeController.cpp b/src/obj/NiTimeController.cpp index 1efc9654842f1cd77d64c94aa150215eb8d7df5a..982051b28f1840013103bfc2edcbfa81e47c8a5e 100644 --- a/src/obj/NiTimeController.cpp +++ b/src/obj/NiTimeController.cpp @@ -12,11 +12,11 @@ NiTimeController::NiTimeController() NI_TIME_CONTROLLER_CONSTRUCT {} NiTimeController::~NiTimeController() {} -void NiTimeController::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiTimeController::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void NiTimeController::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiTimeController::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -24,7 +24,7 @@ string NiTimeController::asString( bool verbose ) const { return InternalAsString( verbose ); } -void NiTimeController::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiTimeController::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } @@ -52,11 +52,11 @@ Ref<NiObjectNET> NiTimeController::GetTarget() { return target; } -ushort NiTimeController::GetFlags() const { +unsigned short NiTimeController::GetFlags() const { return flags; } -void NiTimeController::SetFlags( ushort n ) { +void NiTimeController::SetFlags( unsigned short n ) { flags = n; } diff --git a/src/obj/NiTransformController.cpp b/src/obj/NiTransformController.cpp index 7b62e9133e475205eaa7bd8512b851147dc57b1c..512a29cd4b36df0ee2cad25c9f765cb2f1b40b30 100644 --- a/src/obj/NiTransformController.cpp +++ b/src/obj/NiTransformController.cpp @@ -11,11 +11,11 @@ NiTransformController::NiTransformController() NI_TRANSFORM_CONTROLLER_CONSTRUCT NiTransformController::~NiTransformController() {} -void NiTransformController::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiTransformController::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void NiTransformController::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiTransformController::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -23,7 +23,7 @@ string NiTransformController::asString( bool verbose ) const { return InternalAsString( verbose ); } -void NiTransformController::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiTransformController::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } diff --git a/src/obj/NiTransformData.cpp b/src/obj/NiTransformData.cpp index 4bc2f3d346710529a14dc146cf5af1c3ff973c12..85ba95f00df7d09910e33852b601494411cd529c 100644 --- a/src/obj/NiTransformData.cpp +++ b/src/obj/NiTransformData.cpp @@ -11,11 +11,11 @@ NiTransformData::NiTransformData() NI_TRANSFORM_DATA_CONSTRUCT {} NiTransformData::~NiTransformData() {} -void NiTransformData::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiTransformData::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void NiTransformData::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiTransformData::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -23,7 +23,7 @@ string NiTransformData::asString( bool verbose ) const { return InternalAsString( verbose ); } -void NiTransformData::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiTransformData::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } diff --git a/src/obj/NiTransformInterpolator.cpp b/src/obj/NiTransformInterpolator.cpp index 5a6e1adceaee3d4158e9a795e57dd466df423474..82784ebfbf3d45562b65fcb14a19f34f1b703d27 100644 --- a/src/obj/NiTransformInterpolator.cpp +++ b/src/obj/NiTransformInterpolator.cpp @@ -12,11 +12,11 @@ NiTransformInterpolator::NiTransformInterpolator() NI_TRANSFORM_INTERPOLATOR_CON NiTransformInterpolator::~NiTransformInterpolator() {} -void NiTransformInterpolator::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiTransformInterpolator::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void NiTransformInterpolator::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiTransformInterpolator::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -24,7 +24,7 @@ string NiTransformInterpolator::asString( bool verbose ) const { return InternalAsString( verbose ); } -void NiTransformInterpolator::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiTransformInterpolator::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } diff --git a/src/obj/NiTriBasedGeom.cpp b/src/obj/NiTriBasedGeom.cpp index 9471443914b4caec77f853302e5d95c0605e132b..3ef76ff92cecb2300110249d7c986a3805eda2ce 100644 --- a/src/obj/NiTriBasedGeom.cpp +++ b/src/obj/NiTriBasedGeom.cpp @@ -18,11 +18,11 @@ NiTriBasedGeom::NiTriBasedGeom() NI_TRI_BASED_GEOM_CONSTRUCT {} NiTriBasedGeom::~NiTriBasedGeom() {} -void NiTriBasedGeom::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiTriBasedGeom::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void NiTriBasedGeom::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiTriBasedGeom::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -30,7 +30,7 @@ string NiTriBasedGeom::asString( bool verbose ) const { return InternalAsString( verbose ); } -void NiTriBasedGeom::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiTriBasedGeom::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } diff --git a/src/obj/NiTriBasedGeomData.cpp b/src/obj/NiTriBasedGeomData.cpp index 59d1f8d661b3e96427a784875f950539779048cb..b860127fee06c57042ad216320c09aba38149729 100644 --- a/src/obj/NiTriBasedGeomData.cpp +++ b/src/obj/NiTriBasedGeomData.cpp @@ -12,11 +12,11 @@ NiTriBasedGeomData::NiTriBasedGeomData() NI_TRI_BASED_GEOM_DATA_CONSTRUCT {} NiTriBasedGeomData::~NiTriBasedGeomData() {} -void NiTriBasedGeomData::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiTriBasedGeomData::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void NiTriBasedGeomData::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiTriBasedGeomData::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -24,7 +24,7 @@ string NiTriBasedGeomData::asString( bool verbose ) const { return InternalAsString( verbose ); } -void NiTriBasedGeomData::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiTriBasedGeomData::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } diff --git a/src/obj/NiTriShape.cpp b/src/obj/NiTriShape.cpp index 430b50214675374694f716af750e56e5acf8a4c5..88356f78358beb8ac6c879be26dcdc3ae88525e5 100644 --- a/src/obj/NiTriShape.cpp +++ b/src/obj/NiTriShape.cpp @@ -11,11 +11,11 @@ NiTriShape::NiTriShape() NI_TRI_SHAPE_CONSTRUCT {} NiTriShape::~NiTriShape() {} -void NiTriShape::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiTriShape::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void NiTriShape::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiTriShape::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -23,7 +23,7 @@ string NiTriShape::asString( bool verbose ) const { return InternalAsString( verbose ); } -void NiTriShape::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiTriShape::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } diff --git a/src/obj/NiTriShapeData.cpp b/src/obj/NiTriShapeData.cpp index fe43245d1895ab37ad7ec59bc8b74b9356f4eaf5..7cb8497e770bf726845bba45f1018140081abbbf 100644 --- a/src/obj/NiTriShapeData.cpp +++ b/src/obj/NiTriShapeData.cpp @@ -12,11 +12,11 @@ NiTriShapeData::NiTriShapeData() NI_TRI_SHAPE_DATA_CONSTRUCT {} NiTriShapeData::~NiTriShapeData() {} -void NiTriShapeData::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiTriShapeData::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void NiTriShapeData::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiTriShapeData::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -24,7 +24,7 @@ string NiTriShapeData::asString( bool verbose ) const { return InternalAsString( verbose ); } -void NiTriShapeData::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiTriShapeData::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } @@ -51,9 +51,9 @@ void NiTriShapeData::SetVertices( const vector<Vector3> & in ) { void NiTriShapeData::DoMatchDetection() { matchGroups.resize( vertices.size() ); - for ( uint i = 0; i < matchGroups.size(); ++i ){ + for ( unsigned int i = 0; i < matchGroups.size(); ++i ){ // Find all vertices that match this one. - for ( ushort j = 0; j < vertices.size(); ++j ) { + for ( unsigned short j = 0; j < vertices.size(); ++j ) { if ( vertices[i] == vertices[j] ) { matchGroups[i].vertexIndices.push_back(j); } @@ -87,7 +87,7 @@ void NiTriShapeData::SetTriangles( const vector<Triangle> & in ) { hasTriangles = ( triangles.size() != 0 ); //Set nuber of triangles - numTriangles = uint(triangles.size()); + numTriangles = unsigned int(triangles.size()); //Set number of trianble points to the number of triangles times 3 numTrianglePoints = numTriangles * 3; diff --git a/src/obj/NiTriStrips.cpp b/src/obj/NiTriStrips.cpp index a85d4b6caaf988a59785ae66b70e29fc94fa5d07..e800a0486228915eefb341035b6762763478cf7c 100644 --- a/src/obj/NiTriStrips.cpp +++ b/src/obj/NiTriStrips.cpp @@ -11,11 +11,11 @@ NiTriStrips::NiTriStrips() NI_TRI_STRIPS_CONSTRUCT {} NiTriStrips::~NiTriStrips() {} -void NiTriStrips::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiTriStrips::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void NiTriStrips::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiTriStrips::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -23,7 +23,7 @@ string NiTriStrips::asString( bool verbose ) const { return InternalAsString( verbose ); } -void NiTriStrips::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiTriStrips::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } diff --git a/src/obj/NiUVController.cpp b/src/obj/NiUVController.cpp index c8212636bd79a15214208717651c96922e059a13..611f1aaaf0da4faf2a9bbd426491ae2c1bbd324e 100644 --- a/src/obj/NiUVController.cpp +++ b/src/obj/NiUVController.cpp @@ -12,11 +12,11 @@ NiUVController::NiUVController() NI_U_V_CONTROLLER_CONSTRUCT {} NiUVController::~NiUVController() {} -void NiUVController::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiUVController::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void NiUVController::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiUVController::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -24,7 +24,7 @@ string NiUVController::asString( bool verbose ) const { return InternalAsString( verbose ); } -void NiUVController::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiUVController::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } diff --git a/src/obj/NiUVData.cpp b/src/obj/NiUVData.cpp index e675d247dcc97c1280bc2d4592a26de483048dff..e9618252c21498d1568f67da58fd09db884b220f 100644 --- a/src/obj/NiUVData.cpp +++ b/src/obj/NiUVData.cpp @@ -12,11 +12,11 @@ NiUVData::NiUVData() NI_U_V_DATA_CONSTRUCT {} NiUVData::~NiUVData() {} -void NiUVData::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiUVData::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void NiUVData::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiUVData::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -24,7 +24,7 @@ string NiUVData::asString( bool verbose ) const { return InternalAsString( verbose ); } -void NiUVData::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiUVData::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } diff --git a/src/obj/NiVectorExtraData.cpp b/src/obj/NiVectorExtraData.cpp index 39fd171237902c99b5c84076a7ef76173a93529c..f1997461dd54f1edc8960b040e2a2cb6bab3e50b 100644 --- a/src/obj/NiVectorExtraData.cpp +++ b/src/obj/NiVectorExtraData.cpp @@ -11,11 +11,11 @@ NiVectorExtraData::NiVectorExtraData() NI_VECTOR_EXTRA_DATA_CONSTRUCT {} NiVectorExtraData::~NiVectorExtraData() {} -void NiVectorExtraData::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiVectorExtraData::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void NiVectorExtraData::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiVectorExtraData::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -23,7 +23,7 @@ string NiVectorExtraData::asString( bool verbose ) const { return InternalAsString( verbose ); } -void NiVectorExtraData::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiVectorExtraData::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } diff --git a/src/obj/NiVertWeightsExtraData.cpp b/src/obj/NiVertWeightsExtraData.cpp index 36e93b8f420763a4af0a7ae5e52fafc265022444..9c6f8ec19d304bebd4c16bca7c729b8f8d3cfc54 100644 --- a/src/obj/NiVertWeightsExtraData.cpp +++ b/src/obj/NiVertWeightsExtraData.cpp @@ -11,11 +11,11 @@ NiVertWeightsExtraData::NiVertWeightsExtraData() NI_VERT_WEIGHTS_EXTRA_DATA_CONS NiVertWeightsExtraData::~NiVertWeightsExtraData() {} -void NiVertWeightsExtraData::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiVertWeightsExtraData::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void NiVertWeightsExtraData::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiVertWeightsExtraData::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -23,7 +23,7 @@ string NiVertWeightsExtraData::asString( bool verbose ) const { return InternalAsString( verbose ); } -void NiVertWeightsExtraData::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiVertWeightsExtraData::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } @@ -40,7 +40,7 @@ vector<float> NiVertWeightsExtraData::GetData() const { } void NiVertWeightsExtraData::SetData( const vector<float> & n ) { - numVertices = uint(n.size()); + numVertices = unsigned int(n.size()); numBytes = numVertices + 2; weight = n; } diff --git a/src/obj/NiVertexColorProperty.cpp b/src/obj/NiVertexColorProperty.cpp index 35de5324d63cc097e183f4b2c4664305fee8d8e4..476e228cddac4ff584b5cca82b86574ea71ece68 100644 --- a/src/obj/NiVertexColorProperty.cpp +++ b/src/obj/NiVertexColorProperty.cpp @@ -11,11 +11,11 @@ NiVertexColorProperty::NiVertexColorProperty() NI_VERTEX_COLOR_PROPERTY_CONSTRUC NiVertexColorProperty::~NiVertexColorProperty() {} -void NiVertexColorProperty::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiVertexColorProperty::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void NiVertexColorProperty::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiVertexColorProperty::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -23,7 +23,7 @@ string NiVertexColorProperty::asString( bool verbose ) const { return InternalAsString( verbose ); } -void NiVertexColorProperty::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiVertexColorProperty::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } @@ -35,11 +35,11 @@ const Type & NiVertexColorProperty::GetType() const { return TYPE; }; -ushort NiVertexColorProperty::GetFlags() const { +unsigned short NiVertexColorProperty::GetFlags() const { return flags; } -void NiVertexColorProperty::SetFlags(ushort value) { +void NiVertexColorProperty::SetFlags(unsigned short value) { flags = value; } diff --git a/src/obj/NiVisController.cpp b/src/obj/NiVisController.cpp index 2e9b496ca1ab9b4688b32150d05c2767cce3f431..add3d2841bf7e5921a4006dedbadd10f8ea91722 100644 --- a/src/obj/NiVisController.cpp +++ b/src/obj/NiVisController.cpp @@ -12,11 +12,11 @@ NiVisController::NiVisController() NI_VIS_CONTROLLER_CONSTRUCT {} NiVisController::~NiVisController() {} -void NiVisController::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiVisController::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void NiVisController::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiVisController::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -24,7 +24,7 @@ string NiVisController::asString( bool verbose ) const { return InternalAsString( verbose ); } -void NiVisController::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiVisController::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } diff --git a/src/obj/NiVisData.cpp b/src/obj/NiVisData.cpp index f549cc4a7ff657f3712f7986f765db482559dd95..57a3eca7086ed39bec021d0c701b256317f4f2de 100644 --- a/src/obj/NiVisData.cpp +++ b/src/obj/NiVisData.cpp @@ -11,11 +11,11 @@ NiVisData::NiVisData() NI_VIS_DATA_CONSTRUCT {} NiVisData::~NiVisData() {} -void NiVisData::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiVisData::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void NiVisData::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiVisData::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -23,7 +23,7 @@ string NiVisData::asString( bool verbose ) const { return InternalAsString( verbose ); } -void NiVisData::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiVisData::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } diff --git a/src/obj/NiWireframeProperty.cpp b/src/obj/NiWireframeProperty.cpp index 3bd47b842cd3972316a085601b106d98c37eb3ac..8a81dbb0d3c6645362b3218ae138ed7db869adec 100644 --- a/src/obj/NiWireframeProperty.cpp +++ b/src/obj/NiWireframeProperty.cpp @@ -11,11 +11,11 @@ NiWireframeProperty::NiWireframeProperty() NI_WIREFRAME_PROPERTY_CONSTRUCT {} NiWireframeProperty::~NiWireframeProperty() {} -void NiWireframeProperty::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiWireframeProperty::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void NiWireframeProperty::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiWireframeProperty::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -23,7 +23,7 @@ string NiWireframeProperty::asString( bool verbose ) const { return InternalAsString( verbose ); } -void NiWireframeProperty::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiWireframeProperty::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } @@ -35,11 +35,11 @@ const Type & NiWireframeProperty::GetType() const { return TYPE; }; -ushort NiWireframeProperty::GetFlags() const { +unsigned short NiWireframeProperty::GetFlags() const { return flags; } -void NiWireframeProperty::SetFlags(ushort value) { +void NiWireframeProperty::SetFlags(unsigned short value) { flags = value; } diff --git a/src/obj/NiZBufferProperty.cpp b/src/obj/NiZBufferProperty.cpp index d3134952b6f84763dc799406b4c268481c9d060c..7dcff18dfc220d2f954dd52843933368ffb52fa0 100644 --- a/src/obj/NiZBufferProperty.cpp +++ b/src/obj/NiZBufferProperty.cpp @@ -11,11 +11,11 @@ NiZBufferProperty::NiZBufferProperty() NI_Z_BUFFER_PROPERTY_CONSTRUCT {} NiZBufferProperty::~NiZBufferProperty() {} -void NiZBufferProperty::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiZBufferProperty::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void NiZBufferProperty::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void NiZBufferProperty::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -23,7 +23,7 @@ string NiZBufferProperty::asString( bool verbose ) const { return InternalAsString( verbose ); } -void NiZBufferProperty::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void NiZBufferProperty::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } @@ -35,11 +35,11 @@ const Type & NiZBufferProperty::GetType() const { return TYPE; }; -ushort NiZBufferProperty::GetFlags() const { +unsigned short NiZBufferProperty::GetFlags() const { return flags; } -void NiZBufferProperty::SetFlags(ushort value) { +void NiZBufferProperty::SetFlags(unsigned short value) { flags = value; } diff --git a/src/obj/RootCollisionNode.cpp b/src/obj/RootCollisionNode.cpp index b665f677de762b4a89c73d2af4b6a3929684ea29..61b2126a1f5d574c00d63b576c0f64c6a3216e1b 100644 --- a/src/obj/RootCollisionNode.cpp +++ b/src/obj/RootCollisionNode.cpp @@ -11,11 +11,11 @@ RootCollisionNode::RootCollisionNode() ROOT_COLLISION_NODE_CONSTRUCT {} RootCollisionNode::~RootCollisionNode() {} -void RootCollisionNode::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void RootCollisionNode::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void RootCollisionNode::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void RootCollisionNode::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -23,7 +23,7 @@ string RootCollisionNode::asString( bool verbose ) const { return InternalAsString( verbose ); } -void RootCollisionNode::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void RootCollisionNode::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } diff --git a/src/obj/bhkBlendCollisionObject.cpp b/src/obj/bhkBlendCollisionObject.cpp index c98574a13c7c08fe126adcbcc690445138662815..43f63205e87d77b83760adc6842c6a8a0cc4e11f 100644 --- a/src/obj/bhkBlendCollisionObject.cpp +++ b/src/obj/bhkBlendCollisionObject.cpp @@ -11,11 +11,11 @@ bhkBlendCollisionObject::bhkBlendCollisionObject() BHK_BLEND_COLLISION_OBJECT_CO bhkBlendCollisionObject::~bhkBlendCollisionObject() {} -void bhkBlendCollisionObject::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void bhkBlendCollisionObject::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void bhkBlendCollisionObject::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void bhkBlendCollisionObject::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -23,7 +23,7 @@ string bhkBlendCollisionObject::asString( bool verbose ) const { return InternalAsString( verbose ); } -void bhkBlendCollisionObject::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void bhkBlendCollisionObject::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } diff --git a/src/obj/bhkBlendController.cpp b/src/obj/bhkBlendController.cpp index 98740b868571cfbd28aea7502a97dca16fff473f..0265b2d607789e3604f4cfd332814577b196276b 100644 --- a/src/obj/bhkBlendController.cpp +++ b/src/obj/bhkBlendController.cpp @@ -11,11 +11,11 @@ bhkBlendController::bhkBlendController() BHK_BLEND_CONTROLLER_CONSTRUCT {} bhkBlendController::~bhkBlendController() {} -void bhkBlendController::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void bhkBlendController::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void bhkBlendController::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void bhkBlendController::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -23,7 +23,7 @@ string bhkBlendController::asString( bool verbose ) const { return InternalAsString( verbose ); } -void bhkBlendController::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void bhkBlendController::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } diff --git a/src/obj/bhkBoxShape.cpp b/src/obj/bhkBoxShape.cpp index 1eb196078b30a80e98a4d0cc56138c05c529fd04..337d0995b25ad6005935743f648d8a165a4b609a 100644 --- a/src/obj/bhkBoxShape.cpp +++ b/src/obj/bhkBoxShape.cpp @@ -11,11 +11,11 @@ bhkBoxShape::bhkBoxShape() BHK_BOX_SHAPE_CONSTRUCT {} bhkBoxShape::~bhkBoxShape() {} -void bhkBoxShape::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void bhkBoxShape::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void bhkBoxShape::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void bhkBoxShape::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -23,7 +23,7 @@ string bhkBoxShape::asString( bool verbose ) const { return InternalAsString( verbose ); } -void bhkBoxShape::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void bhkBoxShape::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } diff --git a/src/obj/bhkCapsuleShape.cpp b/src/obj/bhkCapsuleShape.cpp index b0c22334c2bc2d5924f119c1162bed10f4214f0a..967ddb60397da5027f8be88685354498ddd3f728 100644 --- a/src/obj/bhkCapsuleShape.cpp +++ b/src/obj/bhkCapsuleShape.cpp @@ -11,11 +11,11 @@ bhkCapsuleShape::bhkCapsuleShape() BHK_CAPSULE_SHAPE_CONSTRUCT {} bhkCapsuleShape::~bhkCapsuleShape() {} -void bhkCapsuleShape::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void bhkCapsuleShape::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void bhkCapsuleShape::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void bhkCapsuleShape::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -23,7 +23,7 @@ string bhkCapsuleShape::asString( bool verbose ) const { return InternalAsString( verbose ); } -void bhkCapsuleShape::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void bhkCapsuleShape::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } diff --git a/src/obj/bhkCollisionObject.cpp b/src/obj/bhkCollisionObject.cpp index ba3a78ea89a12995f637bf235cde1ce149ab8d5d..36a8c4fbca5591d4615f5ff64f96d9767dd9d1de 100644 --- a/src/obj/bhkCollisionObject.cpp +++ b/src/obj/bhkCollisionObject.cpp @@ -11,11 +11,11 @@ bhkCollisionObject::bhkCollisionObject() BHK_COLLISION_OBJECT_CONSTRUCT {} bhkCollisionObject::~bhkCollisionObject() {} -void bhkCollisionObject::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void bhkCollisionObject::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void bhkCollisionObject::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void bhkCollisionObject::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -23,7 +23,7 @@ string bhkCollisionObject::asString( bool verbose ) const { return InternalAsString( verbose ); } -void bhkCollisionObject::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void bhkCollisionObject::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } diff --git a/src/obj/bhkConvexShape.cpp b/src/obj/bhkConvexShape.cpp index 70d8c6ec9f5f66f246b314f3e6400d6860580bbe..a6672c94b7d4bfe06830134d98862b538d24412b 100644 --- a/src/obj/bhkConvexShape.cpp +++ b/src/obj/bhkConvexShape.cpp @@ -11,11 +11,11 @@ bhkConvexShape::bhkConvexShape() BHK_CONVEX_SHAPE_CONSTRUCT {} bhkConvexShape::~bhkConvexShape() {} -void bhkConvexShape::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void bhkConvexShape::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void bhkConvexShape::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void bhkConvexShape::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -23,7 +23,7 @@ string bhkConvexShape::asString( bool verbose ) const { return InternalAsString( verbose ); } -void bhkConvexShape::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void bhkConvexShape::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } diff --git a/src/obj/bhkConvexTransformShape.cpp b/src/obj/bhkConvexTransformShape.cpp index ee47d71da91b2795d3ab7aecc4832724c60c2f05..35f5ed79e882ba0d2239c8363f8e9037b21f3151 100644 --- a/src/obj/bhkConvexTransformShape.cpp +++ b/src/obj/bhkConvexTransformShape.cpp @@ -11,11 +11,11 @@ bhkConvexTransformShape::bhkConvexTransformShape() BHK_CONVEX_TRANSFORM_SHAPE_CO bhkConvexTransformShape::~bhkConvexTransformShape() {} -void bhkConvexTransformShape::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void bhkConvexTransformShape::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void bhkConvexTransformShape::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void bhkConvexTransformShape::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -23,7 +23,7 @@ string bhkConvexTransformShape::asString( bool verbose ) const { return InternalAsString( verbose ); } -void bhkConvexTransformShape::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void bhkConvexTransformShape::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } diff --git a/src/obj/bhkConvexVerticesShape.cpp b/src/obj/bhkConvexVerticesShape.cpp index 1795dbddc3abfdafe9745fde5244e93d4058af1f..0274288d96b24fbda49884343172a7333e9cf519 100644 --- a/src/obj/bhkConvexVerticesShape.cpp +++ b/src/obj/bhkConvexVerticesShape.cpp @@ -11,11 +11,11 @@ bhkConvexVerticesShape::bhkConvexVerticesShape() BHK_CONVEX_VERTICES_SHAPE_CONST bhkConvexVerticesShape::~bhkConvexVerticesShape() {} -void bhkConvexVerticesShape::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void bhkConvexVerticesShape::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void bhkConvexVerticesShape::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void bhkConvexVerticesShape::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -23,7 +23,7 @@ string bhkConvexVerticesShape::asString( bool verbose ) const { return InternalAsString( verbose ); } -void bhkConvexVerticesShape::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void bhkConvexVerticesShape::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } diff --git a/src/obj/bhkEntity.cpp b/src/obj/bhkEntity.cpp index 2fcf5997abfcb21baa162fd18d3406422353dc2e..68179305f28a148a8f0c16200e170c2d5780f734 100644 --- a/src/obj/bhkEntity.cpp +++ b/src/obj/bhkEntity.cpp @@ -12,11 +12,11 @@ bhkEntity::bhkEntity() BHK_ENTITY_CONSTRUCT {} bhkEntity::~bhkEntity() {} -void bhkEntity::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void bhkEntity::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void bhkEntity::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void bhkEntity::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -24,7 +24,7 @@ string bhkEntity::asString( bool verbose ) const { return InternalAsString( verbose ); } -void bhkEntity::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void bhkEntity::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } diff --git a/src/obj/bhkHingeConstraint.cpp b/src/obj/bhkHingeConstraint.cpp index 215e82bbf7ea7bbea90d3e43914ea1239a33dbfa..5eced250b263ed0311d30f953e2ea63a575cd46c 100644 --- a/src/obj/bhkHingeConstraint.cpp +++ b/src/obj/bhkHingeConstraint.cpp @@ -11,11 +11,11 @@ bhkHingeConstraint::bhkHingeConstraint() BHK_HINGE_CONSTRAINT_CONSTRUCT {} bhkHingeConstraint::~bhkHingeConstraint() {} -void bhkHingeConstraint::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void bhkHingeConstraint::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void bhkHingeConstraint::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void bhkHingeConstraint::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -23,7 +23,7 @@ string bhkHingeConstraint::asString( bool verbose ) const { return InternalAsString( verbose ); } -void bhkHingeConstraint::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void bhkHingeConstraint::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } diff --git a/src/obj/bhkLimitedHingeConstraint.cpp b/src/obj/bhkLimitedHingeConstraint.cpp index 6d9bff3cf372708bee9c4d4616638cb104e44b4b..0d19a4814132b0f2e8fec23d3c75c65ba79b3eff 100644 --- a/src/obj/bhkLimitedHingeConstraint.cpp +++ b/src/obj/bhkLimitedHingeConstraint.cpp @@ -12,11 +12,11 @@ bhkLimitedHingeConstraint::bhkLimitedHingeConstraint() BHK_LIMITED_HINGE_CONSTRA bhkLimitedHingeConstraint::~bhkLimitedHingeConstraint() {} -void bhkLimitedHingeConstraint::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void bhkLimitedHingeConstraint::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void bhkLimitedHingeConstraint::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void bhkLimitedHingeConstraint::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -24,7 +24,7 @@ string bhkLimitedHingeConstraint::asString( bool verbose ) const { return InternalAsString( verbose ); } -void bhkLimitedHingeConstraint::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void bhkLimitedHingeConstraint::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } diff --git a/src/obj/bhkListShape.cpp b/src/obj/bhkListShape.cpp index b4365502f27b45404a5d9f13f7351abeff29672e..18d536d6df259dfeac654596b9a815c85e9ef822 100644 --- a/src/obj/bhkListShape.cpp +++ b/src/obj/bhkListShape.cpp @@ -12,11 +12,11 @@ bhkListShape::bhkListShape() BHK_LIST_SHAPE_CONSTRUCT {} bhkListShape::~bhkListShape() {} -void bhkListShape::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void bhkListShape::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void bhkListShape::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void bhkListShape::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -24,7 +24,7 @@ string bhkListShape::asString( bool verbose ) const { return InternalAsString( verbose ); } -void bhkListShape::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void bhkListShape::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } diff --git a/src/obj/bhkMalleableConstraint.cpp b/src/obj/bhkMalleableConstraint.cpp index 89f6f91cdf47e363275f60c8804322fed22efc2d..5ffcddbc674ffd78d4dc83d466e968df327effe7 100644 --- a/src/obj/bhkMalleableConstraint.cpp +++ b/src/obj/bhkMalleableConstraint.cpp @@ -14,11 +14,11 @@ bhkMalleableConstraint::bhkMalleableConstraint() BHK_MALLEABLE_CONSTRAINT_CONSTR bhkMalleableConstraint::~bhkMalleableConstraint() {} -void bhkMalleableConstraint::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void bhkMalleableConstraint::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void bhkMalleableConstraint::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void bhkMalleableConstraint::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -26,7 +26,7 @@ string bhkMalleableConstraint::asString( bool verbose ) const { return InternalAsString( verbose ); } -void bhkMalleableConstraint::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void bhkMalleableConstraint::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } diff --git a/src/obj/bhkMoppBvTreeShape.cpp b/src/obj/bhkMoppBvTreeShape.cpp index 647e140cccc623b57f055a93b49c86de35a90b1d..33cb0c40675415542ba7d13fe9eb60f310531e2c 100644 --- a/src/obj/bhkMoppBvTreeShape.cpp +++ b/src/obj/bhkMoppBvTreeShape.cpp @@ -12,11 +12,11 @@ bhkMoppBvTreeShape::bhkMoppBvTreeShape() BHK_MOPP_BV_TREE_SHAPE_CONSTRUCT {} bhkMoppBvTreeShape::~bhkMoppBvTreeShape() {} -void bhkMoppBvTreeShape::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void bhkMoppBvTreeShape::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void bhkMoppBvTreeShape::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void bhkMoppBvTreeShape::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -24,7 +24,7 @@ string bhkMoppBvTreeShape::asString( bool verbose ) const { return InternalAsString( verbose ); } -void bhkMoppBvTreeShape::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void bhkMoppBvTreeShape::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } diff --git a/src/obj/bhkMultiSphereShape.cpp b/src/obj/bhkMultiSphereShape.cpp index 2c1cf492f2a56184f95fcfb22879a6fbdee1863e..d03fc81140cfa511762ed63892e17c2e8167e7de 100644 --- a/src/obj/bhkMultiSphereShape.cpp +++ b/src/obj/bhkMultiSphereShape.cpp @@ -12,11 +12,11 @@ bhkMultiSphereShape::bhkMultiSphereShape() BHK_MULTI_SPHERE_SHAPE_CONSTRUCT {} bhkMultiSphereShape::~bhkMultiSphereShape() {} -void bhkMultiSphereShape::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void bhkMultiSphereShape::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void bhkMultiSphereShape::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void bhkMultiSphereShape::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -24,7 +24,7 @@ string bhkMultiSphereShape::asString( bool verbose ) const { return InternalAsString( verbose ); } -void bhkMultiSphereShape::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void bhkMultiSphereShape::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } diff --git a/src/obj/bhkNiTriStripsShape.cpp b/src/obj/bhkNiTriStripsShape.cpp index 0e5afaa95185dc851d3f25bbb8ad185470173e13..d1af2461542e5f66662c0a10b52e0e6889781c29 100644 --- a/src/obj/bhkNiTriStripsShape.cpp +++ b/src/obj/bhkNiTriStripsShape.cpp @@ -12,11 +12,11 @@ bhkNiTriStripsShape::bhkNiTriStripsShape() BHK_NI_TRI_STRIPS_SHAPE_CONSTRUCT {} bhkNiTriStripsShape::~bhkNiTriStripsShape() {} -void bhkNiTriStripsShape::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void bhkNiTriStripsShape::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void bhkNiTriStripsShape::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void bhkNiTriStripsShape::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -24,7 +24,7 @@ string bhkNiTriStripsShape::asString( bool verbose ) const { return InternalAsString( verbose ); } -void bhkNiTriStripsShape::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void bhkNiTriStripsShape::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } diff --git a/src/obj/bhkPackedNiTriStripsShape.cpp b/src/obj/bhkPackedNiTriStripsShape.cpp index 73562875a7c3114ece314675f90e53423bbe3dae..e53a44d7b4b5cc5c0c5d7a7d20e598e23104f1dd 100644 --- a/src/obj/bhkPackedNiTriStripsShape.cpp +++ b/src/obj/bhkPackedNiTriStripsShape.cpp @@ -12,11 +12,11 @@ bhkPackedNiTriStripsShape::bhkPackedNiTriStripsShape() BHK_PACKED_NI_TRI_STRIPS_ bhkPackedNiTriStripsShape::~bhkPackedNiTriStripsShape() {} -void bhkPackedNiTriStripsShape::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void bhkPackedNiTriStripsShape::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void bhkPackedNiTriStripsShape::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void bhkPackedNiTriStripsShape::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -24,7 +24,7 @@ string bhkPackedNiTriStripsShape::asString( bool verbose ) const { return InternalAsString( verbose ); } -void bhkPackedNiTriStripsShape::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void bhkPackedNiTriStripsShape::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } diff --git a/src/obj/bhkPrismaticConstraint.cpp b/src/obj/bhkPrismaticConstraint.cpp index 7eedb3c9726b013835c35387f159e5687e2ddadd..33918a6a2b2f287da9d52ed803f513460ad35c8d 100644 --- a/src/obj/bhkPrismaticConstraint.cpp +++ b/src/obj/bhkPrismaticConstraint.cpp @@ -11,11 +11,11 @@ bhkPrismaticConstraint::bhkPrismaticConstraint() BHK_PRISMATIC_CONSTRAINT_CONSTR bhkPrismaticConstraint::~bhkPrismaticConstraint() {} -void bhkPrismaticConstraint::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void bhkPrismaticConstraint::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void bhkPrismaticConstraint::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void bhkPrismaticConstraint::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -23,7 +23,7 @@ string bhkPrismaticConstraint::asString( bool verbose ) const { return InternalAsString( verbose ); } -void bhkPrismaticConstraint::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void bhkPrismaticConstraint::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } diff --git a/src/obj/bhkRagdollConstraint.cpp b/src/obj/bhkRagdollConstraint.cpp index a94142b52f823f295df44798dc25d28284dd8f83..f139cd0b8e723b5b8208f6ada4f88b0f6692ea4e 100644 --- a/src/obj/bhkRagdollConstraint.cpp +++ b/src/obj/bhkRagdollConstraint.cpp @@ -11,11 +11,11 @@ bhkRagdollConstraint::bhkRagdollConstraint() BHK_RAGDOLL_CONSTRAINT_CONSTRUCT {} bhkRagdollConstraint::~bhkRagdollConstraint() {} -void bhkRagdollConstraint::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void bhkRagdollConstraint::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void bhkRagdollConstraint::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void bhkRagdollConstraint::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -23,7 +23,7 @@ string bhkRagdollConstraint::asString( bool verbose ) const { return InternalAsString( verbose ); } -void bhkRagdollConstraint::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void bhkRagdollConstraint::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } diff --git a/src/obj/bhkRefObject.cpp b/src/obj/bhkRefObject.cpp index 3bf2f3401c3aff6487aed33380325581df3f1193..8aef13a3fe9ce0581ee2d03e80d3014f2a029405 100644 --- a/src/obj/bhkRefObject.cpp +++ b/src/obj/bhkRefObject.cpp @@ -11,11 +11,11 @@ bhkRefObject::bhkRefObject() BHK_REF_OBJECT_CONSTRUCT {} bhkRefObject::~bhkRefObject() {} -void bhkRefObject::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void bhkRefObject::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void bhkRefObject::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void bhkRefObject::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -23,7 +23,7 @@ string bhkRefObject::asString( bool verbose ) const { return InternalAsString( verbose ); } -void bhkRefObject::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void bhkRefObject::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } diff --git a/src/obj/bhkRigidBody.cpp b/src/obj/bhkRigidBody.cpp index 907beccbcfb7d3c6f047872708700489d1d88ad1..19e66caccaed95fd640ac9e7ff81c14174f835f2 100644 --- a/src/obj/bhkRigidBody.cpp +++ b/src/obj/bhkRigidBody.cpp @@ -13,11 +13,11 @@ bhkRigidBody::bhkRigidBody() BHK_RIGID_BODY_CONSTRUCT {} bhkRigidBody::~bhkRigidBody() {} -void bhkRigidBody::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void bhkRigidBody::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void bhkRigidBody::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void bhkRigidBody::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -25,7 +25,7 @@ string bhkRigidBody::asString( bool verbose ) const { return InternalAsString( verbose ); } -void bhkRigidBody::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void bhkRigidBody::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } diff --git a/src/obj/bhkRigidBodyT.cpp b/src/obj/bhkRigidBodyT.cpp index dec256ba181599121f50ad6ac98a99572564dfc4..fef46c95118e3e0b7efdc162fd10ebb4da27c6c1 100644 --- a/src/obj/bhkRigidBodyT.cpp +++ b/src/obj/bhkRigidBodyT.cpp @@ -11,11 +11,11 @@ bhkRigidBodyT::bhkRigidBodyT() BHK_RIGID_BODY_T_CONSTRUCT {} bhkRigidBodyT::~bhkRigidBodyT() {} -void bhkRigidBodyT::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void bhkRigidBodyT::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void bhkRigidBodyT::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void bhkRigidBodyT::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -23,7 +23,7 @@ string bhkRigidBodyT::asString( bool verbose ) const { return InternalAsString( verbose ); } -void bhkRigidBodyT::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void bhkRigidBodyT::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } diff --git a/src/obj/bhkSPCollisionObject.cpp b/src/obj/bhkSPCollisionObject.cpp index 2c904aa5e60fd733f682c3cbbe287646f9cb9536..114c372057170485832047506bb0bd01c1bd08fa 100644 --- a/src/obj/bhkSPCollisionObject.cpp +++ b/src/obj/bhkSPCollisionObject.cpp @@ -11,11 +11,11 @@ bhkSPCollisionObject::bhkSPCollisionObject() BHK_S_P_COLLISION_OBJECT_CONSTRUCT bhkSPCollisionObject::~bhkSPCollisionObject() {} -void bhkSPCollisionObject::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void bhkSPCollisionObject::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void bhkSPCollisionObject::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void bhkSPCollisionObject::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -23,7 +23,7 @@ string bhkSPCollisionObject::asString( bool verbose ) const { return InternalAsString( verbose ); } -void bhkSPCollisionObject::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void bhkSPCollisionObject::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } diff --git a/src/obj/bhkSerializable.cpp b/src/obj/bhkSerializable.cpp index 62b3cc6024bb9fc45b28e03b9ebe4da32cec70d8..2cebd50bcd6fb9dbe9603e3e9f3a890f41a10fe4 100644 --- a/src/obj/bhkSerializable.cpp +++ b/src/obj/bhkSerializable.cpp @@ -11,11 +11,11 @@ bhkSerializable::bhkSerializable() BHK_SERIALIZABLE_CONSTRUCT {} bhkSerializable::~bhkSerializable() {} -void bhkSerializable::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void bhkSerializable::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void bhkSerializable::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void bhkSerializable::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -23,7 +23,7 @@ string bhkSerializable::asString( bool verbose ) const { return InternalAsString( verbose ); } -void bhkSerializable::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void bhkSerializable::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } diff --git a/src/obj/bhkShape.cpp b/src/obj/bhkShape.cpp index cdcbccb2ba0fc8fcbfd66798507098a347e696c2..89245f103f5c5f9c21355d1891f0ab9aa23cc727 100644 --- a/src/obj/bhkShape.cpp +++ b/src/obj/bhkShape.cpp @@ -11,11 +11,11 @@ bhkShape::bhkShape() BHK_SHAPE_CONSTRUCT {} bhkShape::~bhkShape() {} -void bhkShape::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void bhkShape::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void bhkShape::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void bhkShape::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -23,7 +23,7 @@ string bhkShape::asString( bool verbose ) const { return InternalAsString( verbose ); } -void bhkShape::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void bhkShape::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } diff --git a/src/obj/bhkSimpleShapePhantom.cpp b/src/obj/bhkSimpleShapePhantom.cpp index a9eb30d985bfc4222b195a5772db7ad6924d2f11..2c34da5e05e66e1ff2b0a59ca81e0b373fe06851 100644 --- a/src/obj/bhkSimpleShapePhantom.cpp +++ b/src/obj/bhkSimpleShapePhantom.cpp @@ -11,11 +11,11 @@ bhkSimpleShapePhantom::bhkSimpleShapePhantom() BHK_SIMPLE_SHAPE_PHANTOM_CONSTRUC bhkSimpleShapePhantom::~bhkSimpleShapePhantom() {} -void bhkSimpleShapePhantom::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void bhkSimpleShapePhantom::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void bhkSimpleShapePhantom::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void bhkSimpleShapePhantom::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -23,7 +23,7 @@ string bhkSimpleShapePhantom::asString( bool verbose ) const { return InternalAsString( verbose ); } -void bhkSimpleShapePhantom::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void bhkSimpleShapePhantom::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } diff --git a/src/obj/bhkSphereRepShape.cpp b/src/obj/bhkSphereRepShape.cpp index 419b176314a30f100239b9f69eba0ad22164c378..a4ed2a5b43999e42fb90e23a394eb58e081eab15 100644 --- a/src/obj/bhkSphereRepShape.cpp +++ b/src/obj/bhkSphereRepShape.cpp @@ -11,11 +11,11 @@ bhkSphereRepShape::bhkSphereRepShape() BHK_SPHERE_REP_SHAPE_CONSTRUCT {} bhkSphereRepShape::~bhkSphereRepShape() {} -void bhkSphereRepShape::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void bhkSphereRepShape::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void bhkSphereRepShape::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void bhkSphereRepShape::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -23,7 +23,7 @@ string bhkSphereRepShape::asString( bool verbose ) const { return InternalAsString( verbose ); } -void bhkSphereRepShape::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void bhkSphereRepShape::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } diff --git a/src/obj/bhkSphereShape.cpp b/src/obj/bhkSphereShape.cpp index 9976a12c053209fcec7bc1cb5a8782e288f00502..c0145cc1028d4c793b2b174e814d70695c26a630 100644 --- a/src/obj/bhkSphereShape.cpp +++ b/src/obj/bhkSphereShape.cpp @@ -11,11 +11,11 @@ bhkSphereShape::bhkSphereShape() BHK_SPHERE_SHAPE_CONSTRUCT {} bhkSphereShape::~bhkSphereShape() {} -void bhkSphereShape::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void bhkSphereShape::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void bhkSphereShape::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void bhkSphereShape::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -23,7 +23,7 @@ string bhkSphereShape::asString( bool verbose ) const { return InternalAsString( verbose ); } -void bhkSphereShape::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void bhkSphereShape::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } diff --git a/src/obj/bhkStiffSpringConstraint.cpp b/src/obj/bhkStiffSpringConstraint.cpp index ae47902e4570442b533b2cb8dea78aca0ceb0088..cb4928e3b723377b8c2dae6f015174bbde05ded7 100644 --- a/src/obj/bhkStiffSpringConstraint.cpp +++ b/src/obj/bhkStiffSpringConstraint.cpp @@ -11,11 +11,11 @@ bhkStiffSpringConstraint::bhkStiffSpringConstraint() BHK_STIFF_SPRING_CONSTRAINT bhkStiffSpringConstraint::~bhkStiffSpringConstraint() {} -void bhkStiffSpringConstraint::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void bhkStiffSpringConstraint::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void bhkStiffSpringConstraint::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void bhkStiffSpringConstraint::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -23,7 +23,7 @@ string bhkStiffSpringConstraint::asString( bool verbose ) const { return InternalAsString( verbose ); } -void bhkStiffSpringConstraint::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void bhkStiffSpringConstraint::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } diff --git a/src/obj/bhkTransformShape.cpp b/src/obj/bhkTransformShape.cpp index 922138cd82a0a4e9326e88424db733784517bcd4..b6da0e04d6a5ec18111abfac936f326b480ee4e1 100644 --- a/src/obj/bhkTransformShape.cpp +++ b/src/obj/bhkTransformShape.cpp @@ -11,11 +11,11 @@ bhkTransformShape::bhkTransformShape() BHK_TRANSFORM_SHAPE_CONSTRUCT {} bhkTransformShape::~bhkTransformShape() {} -void bhkTransformShape::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void bhkTransformShape::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void bhkTransformShape::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void bhkTransformShape::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -23,7 +23,7 @@ string bhkTransformShape::asString( bool verbose ) const { return InternalAsString( verbose ); } -void bhkTransformShape::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void bhkTransformShape::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } diff --git a/src/obj/bhkWorldObject.cpp b/src/obj/bhkWorldObject.cpp index c824360ae8f01841d5fbad90b0119591c0be2f2c..b6f6ec1ce3d953d5d634ccebe0f93d98943ae2c9 100644 --- a/src/obj/bhkWorldObject.cpp +++ b/src/obj/bhkWorldObject.cpp @@ -11,11 +11,11 @@ bhkWorldObject::bhkWorldObject() BHK_WORLD_OBJECT_CONSTRUCT {} bhkWorldObject::~bhkWorldObject() {} -void bhkWorldObject::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void bhkWorldObject::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void bhkWorldObject::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void bhkWorldObject::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -23,7 +23,7 @@ string bhkWorldObject::asString( bool verbose ) const { return InternalAsString( verbose ); } -void bhkWorldObject::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void bhkWorldObject::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); } diff --git a/src/obj/hkPackedNiTriStripsData.cpp b/src/obj/hkPackedNiTriStripsData.cpp index 4030e0664ae9ce1d2cfacf1eb8776802a0f7f11a..665537def9a38553a9f0c6fe419e5cc312db68ad 100644 --- a/src/obj/hkPackedNiTriStripsData.cpp +++ b/src/obj/hkPackedNiTriStripsData.cpp @@ -12,11 +12,11 @@ hkPackedNiTriStripsData::hkPackedNiTriStripsData() HK_PACKED_NI_TRI_STRIPS_DATA_ hkPackedNiTriStripsData::~hkPackedNiTriStripsData() {} -void hkPackedNiTriStripsData::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void hkPackedNiTriStripsData::Read( istream& in, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalRead( in, link_stack, version, user_version ); } -void hkPackedNiTriStripsData::Write( ostream& out, const map<NiObjectRef,uint> & link_map, unsigned int version, unsigned int user_version ) const { +void hkPackedNiTriStripsData::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, unsigned int version, unsigned int user_version ) const { InternalWrite( out, link_map, version, user_version ); } @@ -24,7 +24,7 @@ string hkPackedNiTriStripsData::asString( bool verbose ) const { return InternalAsString( verbose ); } -void hkPackedNiTriStripsData::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) { +void hkPackedNiTriStripsData::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, unsigned int version, unsigned int user_version ) { InternalFixLinks( objects, link_stack, version, user_version ); }