diff --git a/src/NIF_IO.cpp b/src/NIF_IO.cpp index 6b5d7268b9b2e4f4512ac3bed3beaf60f964588e..7142c325a0be2c68b90f41ea57608a39b82ed3da 100644 --- a/src/NIF_IO.cpp +++ b/src/NIF_IO.cpp @@ -102,7 +102,7 @@ void WriteFloat( float val, ostream& out ){ } void WriteString( string const & val, ostream& out ) { - WriteUInt( unsigned int(val.size()), out ); + WriteUInt( (unsigned int)(val.size()), out ); out.write( val.c_str(), std::streamsize(val.size()) ); } @@ -428,7 +428,7 @@ string HexString( const byte * src, unsigned int len ) { out << hex << setfill('0'); for ( unsigned int i = 0; i < len; ++i ) { - out << uppercase << setw(2) << unsigned int(src[i]); + out << uppercase << setw(2) << (unsigned int)(src[i]); if (i % 16 == 15 || i == len - 1) out << endl; else if (i % 16 == 7) @@ -445,7 +445,7 @@ string HexString( const byte * src, unsigned int len ) { //Byte ostream & operator<<( ostream & out, byte const & val ) { - return out << unsigned int(val); + return out << (unsigned int)(val); } void NifStream( Key<Quaternion> & key, istream& file, unsigned int version, KeyType type ) { diff --git a/src/gen/Footer.cpp b/src/gen/Footer.cpp index 29d2491fffd6d70fbc7ad3b866962cc838755962..3f6159ee88bcd629e501199d12e2376ded158ede 100644 --- a/src/gen/Footer.cpp +++ b/src/gen/Footer.cpp @@ -36,7 +36,7 @@ void Footer::Read( istream& in, list<unsigned int> & link_stack, unsigned int ve } 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()); + numRoots = (unsigned int)(roots.size()); if ( version >= 0x0303000D ) { NifStream( numRoots, out, version ); for (unsigned int i2 = 0; i2 < roots.size(); i2++) { @@ -51,7 +51,7 @@ void Footer::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map string Footer::asString( bool verbose ) const { stringstream out; unsigned int array_output_count = 0; - numRoots = unsigned int(roots.size()); + numRoots = (unsigned int)(roots.size()); out << " Num Roots: " << numRoots << endl; array_output_count = 0; for (unsigned int i1 = 0; i1 < roots.size(); i1++) { diff --git a/src/gen/Header.cpp b/src/gen/Header.cpp index 0bc001c620a55463b30cd468fe1a5cccc22ccf60..a861387d0c9c963de5640a248fe92052474fcf5e 100644 --- a/src/gen/Header.cpp +++ b/src/gen/Header.cpp @@ -82,8 +82,8 @@ void Header::Read( istream& in ) { } void Header::Write( ostream& out ) const { - numBlockTypes = unsigned short(blockTypes.size()); - numBlocks = unsigned int(blockTypeIndex.size()); + numBlockTypes = (unsigned short)(blockTypes.size()); + numBlocks = (unsigned int)(blockTypeIndex.size()); NifStream( headerString, out, version ); if ( version <= 0x03010000 ) { for (unsigned int i2 = 0; i2 < 3; i2++) { @@ -132,8 +132,8 @@ void Header::Write( ostream& out ) const { string Header::asString( bool verbose ) const { stringstream out; unsigned int array_output_count = 0; - numBlockTypes = unsigned short(blockTypes.size()); - numBlocks = unsigned int(blockTypeIndex.size()); + numBlockTypes = (unsigned short)(blockTypes.size()); + numBlocks = (unsigned int)(blockTypeIndex.size()); out << " Header String: " << headerString << endl; array_output_count = 0; for (unsigned int i1 = 0; i1 < 3; i1++) { diff --git a/src/gen/enums.cpp b/src/gen/enums.cpp index 6bb538e795362e624b9e206812d4e13c9b3e06db..dabb4866eb769cf564b8239b28bfa6ba0b81f8d4 100644 --- a/src/gen/enums.cpp +++ b/src/gen/enums.cpp @@ -22,7 +22,7 @@ void NifStream( ForceType & val, istream& in, unsigned int version ) { } void NifStream( ForceType const & val, ostream& out, unsigned int version ) { - NifStream( unsigned int(val), out, version ); + NifStream( (unsigned int)(val), out, version ); } ostream & operator<<( ostream & out, ForceType const & val ) { @@ -30,7 +30,7 @@ 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! - " << unsigned int(val); + default: return out << "Invalid Value! - " << (unsigned int)(val); } } @@ -44,7 +44,7 @@ void NifStream( HavokMaterial & val, istream& in, unsigned int version ) { } void NifStream( HavokMaterial const & val, ostream& out, unsigned int version ) { - NifStream( unsigned int(val), out, version ); + NifStream( (unsigned int)(val), out, version ); } ostream & operator<<( ostream & out, HavokMaterial const & val ) { @@ -80,7 +80,7 @@ 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! - " << unsigned int(val); + default: return out << "Invalid Value! - " << (unsigned int)(val); } } @@ -94,7 +94,7 @@ void NifStream( CompareMode & val, istream& in, unsigned int version ) { } void NifStream( CompareMode const & val, ostream& out, unsigned int version ) { - NifStream( unsigned int(val), out, version ); + NifStream( (unsigned int)(val), out, version ); } ostream & operator<<( ostream & out, CompareMode const & val ) { @@ -106,7 +106,7 @@ 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! - " << unsigned int(val); + default: return out << "Invalid Value! - " << (unsigned int)(val); } } @@ -120,7 +120,7 @@ void NifStream( TexFilterMode & val, istream& in, unsigned int version ) { } void NifStream( TexFilterMode const & val, ostream& out, unsigned int version ) { - NifStream( unsigned int(val), out, version ); + NifStream( (unsigned int)(val), out, version ); } ostream & operator<<( ostream & out, TexFilterMode const & val ) { @@ -131,7 +131,7 @@ 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! - " << unsigned int(val); + default: return out << "Invalid Value! - " << (unsigned int)(val); } } @@ -145,14 +145,14 @@ void NifStream( LightMode & val, istream& in, unsigned int version ) { } void NifStream( LightMode const & val, ostream& out, unsigned int version ) { - NifStream( unsigned int(val), out, 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! - " << unsigned int(val); + default: return out << "Invalid Value! - " << (unsigned int)(val); } } @@ -166,7 +166,7 @@ void NifStream( MipMapFormat & val, istream& in, unsigned int version ) { } void NifStream( MipMapFormat const & val, ostream& out, unsigned int version ) { - NifStream( unsigned int(val), out, version ); + NifStream( (unsigned int)(val), out, version ); } ostream & operator<<( ostream & out, MipMapFormat const & val ) { @@ -174,7 +174,7 @@ 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! - " << unsigned int(val); + default: return out << "Invalid Value! - " << (unsigned int)(val); } } @@ -188,7 +188,7 @@ void NifStream( StencilAction & val, istream& in, unsigned int version ) { } void NifStream( StencilAction const & val, ostream& out, unsigned int version ) { - NifStream( unsigned int(val), out, version ); + NifStream( (unsigned int)(val), out, version ); } ostream & operator<<( ostream & out, StencilAction const & val ) { @@ -199,7 +199,7 @@ 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! - " << unsigned int(val); + default: return out << "Invalid Value! - " << (unsigned int)(val); } } @@ -213,7 +213,7 @@ void NifStream( OblivionLayer & val, istream& in, unsigned int version ) { } void NifStream( OblivionLayer const & val, ostream& out, unsigned int version ) { - NifStream( byte(val), out, version ); + NifStream( (byte)(val), out, version ); } ostream & operator<<( ostream & out, OblivionLayer const & val ) { @@ -276,7 +276,7 @@ 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! - " << unsigned int(val); + default: return out << "Invalid Value! - " << (unsigned int)(val); } } @@ -290,7 +290,7 @@ void NifStream( FaceDrawMode & val, istream& in, unsigned int version ) { } void NifStream( FaceDrawMode const & val, ostream& out, unsigned int version ) { - NifStream( unsigned int(val), out, version ); + NifStream( (unsigned int)(val), out, version ); } ostream & operator<<( ostream & out, FaceDrawMode const & val ) { @@ -299,7 +299,7 @@ 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! - " << unsigned int(val); + default: return out << "Invalid Value! - " << (unsigned int)(val); } } @@ -313,7 +313,7 @@ void NifStream( AlphaFormat & val, istream& in, unsigned int version ) { } void NifStream( AlphaFormat const & val, ostream& out, unsigned int version ) { - NifStream( unsigned int(val), out, version ); + NifStream( (unsigned int)(val), out, version ); } ostream & operator<<( ostream & out, AlphaFormat const & val ) { @@ -322,7 +322,7 @@ 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! - " << unsigned int(val); + default: return out << "Invalid Value! - " << (unsigned int)(val); } } @@ -336,7 +336,7 @@ void NifStream( KeyType & val, istream& in, unsigned int version ) { } void NifStream( KeyType const & val, ostream& out, unsigned int version ) { - NifStream( unsigned int(val), out, version ); + NifStream( (unsigned int)(val), out, version ); } ostream & operator<<( ostream & out, KeyType const & val ) { @@ -346,7 +346,7 @@ 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! - " << unsigned int(val); + default: return out << "Invalid Value! - " << (unsigned int)(val); } } @@ -360,7 +360,7 @@ void NifStream( VertMode & val, istream& in, unsigned int version ) { } void NifStream( VertMode const & val, ostream& out, unsigned int version ) { - NifStream( unsigned int(val), out, version ); + NifStream( (unsigned int)(val), out, version ); } ostream & operator<<( ostream & out, VertMode const & val ) { @@ -368,7 +368,7 @@ 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! - " << unsigned int(val); + default: return out << "Invalid Value! - " << (unsigned int)(val); } } @@ -382,7 +382,7 @@ void NifStream( ApplyMode & val, istream& in, unsigned int version ) { } void NifStream( ApplyMode const & val, ostream& out, unsigned int version ) { - NifStream( unsigned int(val), out, version ); + NifStream( (unsigned int)(val), out, version ); } ostream & operator<<( ostream & out, ApplyMode const & val ) { @@ -392,7 +392,7 @@ 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! - " << unsigned int(val); + default: return out << "Invalid Value! - " << (unsigned int)(val); } } @@ -406,14 +406,14 @@ void NifStream( MotionSystem & val, istream& in, unsigned int version ) { } void NifStream( MotionSystem const & val, ostream& out, unsigned int version ) { - NifStream( byte(val), out, version ); + NifStream( (byte)(val), out, version ); } 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! - " << unsigned int(val); + default: return out << "Invalid Value! - " << (unsigned int)(val); } } @@ -427,7 +427,7 @@ void NifStream( BillboardMode & val, istream& in, unsigned int version ) { } void NifStream( BillboardMode const & val, ostream& out, unsigned int version ) { - NifStream( unsigned short(val), out, version ); + NifStream( (unsigned short)(val), out, version ); } ostream & operator<<( ostream & out, BillboardMode const & val ) { @@ -437,7 +437,7 @@ 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! - " << unsigned int(val); + default: return out << "Invalid Value! - " << (unsigned int)(val); } } @@ -451,7 +451,7 @@ void NifStream( TexType & val, istream& in, unsigned int version ) { } void NifStream( TexType const & val, ostream& out, unsigned int version ) { - NifStream( unsigned int(val), out, version ); + NifStream( (unsigned int)(val), out, version ); } ostream & operator<<( ostream & out, TexType const & val ) { @@ -464,7 +464,7 @@ 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! - " << unsigned int(val); + default: return out << "Invalid Value! - " << (unsigned int)(val); } } @@ -478,7 +478,7 @@ void NifStream( PixelLayout & val, istream& in, unsigned int version ) { } void NifStream( PixelLayout const & val, ostream& out, unsigned int version ) { - NifStream( unsigned int(val), out, version ); + NifStream( (unsigned int)(val), out, version ); } ostream & operator<<( ostream & out, PixelLayout const & val ) { @@ -489,7 +489,7 @@ 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! - " << unsigned int(val); + default: return out << "Invalid Value! - " << (unsigned int)(val); } } @@ -503,7 +503,7 @@ void NifStream( TexClampMode & val, istream& in, unsigned int version ) { } void NifStream( TexClampMode const & val, ostream& out, unsigned int version ) { - NifStream( unsigned int(val), out, version ); + NifStream( (unsigned int)(val), out, version ); } ostream & operator<<( ostream & out, TexClampMode const & val ) { @@ -512,7 +512,7 @@ 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! - " << unsigned int(val); + default: return out << "Invalid Value! - " << (unsigned int)(val); } } @@ -526,7 +526,7 @@ void NifStream( MotionQuality & val, istream& in, unsigned int version ) { } void NifStream( MotionQuality const & val, ostream& out, unsigned int version ) { - NifStream( byte(val), out, version ); + NifStream( (byte)(val), out, version ); } ostream & operator<<( ostream & out, MotionQuality const & val ) { @@ -540,7 +540,7 @@ 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! - " << unsigned int(val); + default: return out << "Invalid Value! - " << (unsigned int)(val); } } @@ -554,7 +554,7 @@ void NifStream( PixelFormat & val, istream& in, unsigned int version ) { } void NifStream( PixelFormat const & val, ostream& out, unsigned int version ) { - NifStream( unsigned int(val), out, version ); + NifStream( (unsigned int)(val), out, version ); } ostream & operator<<( ostream & out, PixelFormat const & val ) { @@ -562,7 +562,7 @@ 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! - " << unsigned int(val); + default: return out << "Invalid Value! - " << (unsigned int)(val); } } @@ -576,7 +576,7 @@ void NifStream( CycleType & val, istream& in, unsigned int version ) { } void NifStream( CycleType const & val, ostream& out, unsigned int version ) { - NifStream( unsigned int(val), out, version ); + NifStream( (unsigned int)(val), out, version ); } ostream & operator<<( ostream & out, CycleType const & val ) { @@ -584,7 +584,7 @@ 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! - " << unsigned int(val); + default: return out << "Invalid Value! - " << (unsigned int)(val); } } @@ -598,14 +598,14 @@ void NifStream( FieldType & val, istream& in, unsigned int version ) { } void NifStream( FieldType const & val, ostream& out, unsigned int version ) { - NifStream( unsigned int(val), out, 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! - " << unsigned int(val); + default: return out << "Invalid Value! - " << (unsigned int)(val); } } diff --git a/src/gen/obj_impl.cpp b/src/gen/obj_impl.cpp index 8033a7e06516f18e78b5a690922e27eaabcb7c8d..2b452648a30ea16dd575fdd5cf8a0234e93022a1 100644 --- a/src/gen/obj_impl.cpp +++ b/src/gen/obj_impl.cpp @@ -375,7 +375,7 @@ void AbhkConstraint::InternalRead( istream& in, list<unsigned int> & link_stack, 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 = unsigned int(bodies.size()); + numBodies = (unsigned int)(bodies.size()); NifStream( numBodies, out, version ); for (unsigned int i1 = 0; i1 < bodies.size(); i1++) { if ( bodies[i1] != NULL ) @@ -390,7 +390,7 @@ std::string AbhkConstraint::InternalAsString( bool verbose ) const { stringstream out; unsigned int array_output_count = 0; out << bhkSerializable::asString(); - numBodies = unsigned int(bodies.size()); + numBodies = (unsigned int)(bodies.size()); out << " Num Bodies: " << numBodies << endl; array_output_count = 0; for (unsigned int i1 = 0; i1 < bodies.size(); i1++) { @@ -883,7 +883,7 @@ void NiObjectNET::InternalRead( istream& in, list<unsigned int> & link_stack, un 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 = unsigned int(extraDataList.size()); + numExtraDataList = (unsigned int)(extraDataList.size()); NifStream( name, out, version ); if ( version <= 0x04020200 ) { if ( extraData != NULL ) @@ -910,7 +910,7 @@ std::string NiObjectNET::InternalAsString( bool verbose ) const { stringstream out; unsigned int array_output_count = 0; out << NiObject::asString(); - numExtraDataList = unsigned int(extraDataList.size()); + numExtraDataList = (unsigned int)(extraDataList.size()); out << " Name: " << name << endl; out << " Extra Data: " << extraData << endl; out << " Num Extra Data List: " << numExtraDataList << endl; @@ -994,7 +994,7 @@ void NiAVObject::InternalRead( istream& in, list<unsigned int> & link_stack, uns 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 = unsigned int(properties.size()); + numProperties = (unsigned int)(properties.size()); NifStream( flags, out, version ); NifStream( translation, out, version ); NifStream( rotation, out, version ); @@ -1036,7 +1036,7 @@ std::string NiAVObject::InternalAsString( bool verbose ) const { stringstream out; unsigned int array_output_count = 0; out << NiObjectNET::asString(); - numProperties = unsigned int(properties.size()); + numProperties = (unsigned int)(properties.size()); out << " Flags: " << flags << endl; out << " Translation: " << translation << endl; out << " Rotation: " << rotation << endl; @@ -1119,7 +1119,7 @@ void NiDynamicEffect::InternalRead( istream& in, list<unsigned int> & link_stack 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 = unsigned int(affectedNodeListPointers.size()); + numAffectedNodes = (unsigned int)(affectedNodeListPointers.size()); if ( version >= 0x0A020000 ) { NifStream( switchState, out, version ); }; @@ -1144,7 +1144,7 @@ std::string NiDynamicEffect::InternalAsString( bool verbose ) const { stringstream out; unsigned int array_output_count = 0; out << NiAVObject::asString(); - numAffectedNodes = unsigned int(affectedNodeListPointers.size()); + numAffectedNodes = (unsigned int)(affectedNodeListPointers.size()); out << " Switch State: " << switchState << endl; out << " Num Affected Nodes: " << numAffectedNodes << endl; array_output_count = 0; @@ -1478,12 +1478,12 @@ void ABoneLODController::InternalRead( istream& in, list<unsigned int> & link_st 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 = unsigned int(nodeGroups.size()); + numNodeGroups = (unsigned int)(nodeGroups.size()); NifStream( unknownInt1, out, version ); NifStream( numNodeGroups, out, version ); NifStream( numNodeGroups2, out, version ); for (unsigned int i1 = 0; i1 < nodeGroups.size(); i1++) { - nodeGroups[i1].numNodes = unsigned int(nodeGroups[i1].nodes.size()); + nodeGroups[i1].numNodes = (unsigned int)(nodeGroups[i1].nodes.size()); NifStream( nodeGroups[i1].numNodes, out, version ); for (unsigned int i2 = 0; i2 < nodeGroups[i1].nodes.size(); i2++) { if ( nodeGroups[i1].nodes[i2] != NULL ) @@ -1498,7 +1498,7 @@ std::string ABoneLODController::InternalAsString( bool verbose ) const { stringstream out; unsigned int array_output_count = 0; out << NiTimeController::asString(); - numNodeGroups = unsigned int(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; @@ -1508,7 +1508,7 @@ std::string ABoneLODController::InternalAsString( bool verbose ) const { out << "<Data Truncated. Use verbose mode to see complete listing.>" << endl; break; }; - nodeGroups[i1].numNodes = unsigned int(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 (unsigned int i2 = 0; i2 < nodeGroups[i1].nodes.size(); i2++) { @@ -1804,9 +1804,9 @@ void NiGeometryData::InternalRead( istream& in, list<unsigned int> & link_stack, 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 = unsigned short(uvSets.size()); - numUvSets2 = byte(uvSets.size()); - numVertices = unsigned short(vertices.size()); + numUvSets = (unsigned short)(uvSets.size()); + numUvSets2 = (byte)(uvSets.size()); + numVertices = (unsigned short)(vertices.size()); if ( version >= 0x0A020000 ) { NifStream( name, out, version ); }; @@ -1881,9 +1881,9 @@ std::string NiGeometryData::InternalAsString( bool verbose ) const { stringstream out; unsigned int array_output_count = 0; out << NiObject::asString(); - numUvSets = unsigned short(uvSets.size()); - numUvSets2 = byte(uvSets.size()); - numVertices = unsigned short(vertices.size()); + numUvSets = (unsigned short)(uvSets.size()); + numUvSets2 = (byte)(uvSets.size()); + numVertices = (unsigned short)(vertices.size()); out << " Name: " << name << endl; out << " Num Vertices: " << numVertices << endl; out << " Unknown Short 1: " << unknownShort1 << endl; @@ -2345,8 +2345,8 @@ void bhkConvexVerticesShape::InternalRead( istream& in, list<unsigned int> & lin 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 = unsigned int(normals.size()); - numVertices = unsigned int(vertices.size()); + numNormals = (unsigned int)(normals.size()); + numVertices = (unsigned int)(vertices.size()); for (unsigned int i1 = 0; i1 < 7; i1++) { NifStream( unknownFloats1[i1], out, version ); }; @@ -2364,8 +2364,8 @@ std::string bhkConvexVerticesShape::InternalAsString( bool verbose ) const { stringstream out; unsigned int array_output_count = 0; out << bhkSphereRepShape::asString(); - numNormals = unsigned int(normals.size()); - numVertices = unsigned int(vertices.size()); + numNormals = (unsigned int)(normals.size()); + numVertices = (unsigned int)(vertices.size()); array_output_count = 0; for (unsigned int i1 = 0; i1 < 7; i1++) { if ( !verbose && ( array_output_count > MAXARRAYDUMP ) ) { @@ -2543,8 +2543,8 @@ void bhkListShape::InternalRead( istream& in, list<unsigned int> & link_stack, u 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 = unsigned int(unknownInts.size()); - numSubShapes = unsigned int(subShapes.size()); + numUnknownInts = (unsigned int)(unknownInts.size()); + numSubShapes = (unsigned int)(subShapes.size()); NifStream( numSubShapes, out, version ); for (unsigned int i1 = 0; i1 < subShapes.size(); i1++) { if ( subShapes[i1] != NULL ) @@ -2566,8 +2566,8 @@ std::string bhkListShape::InternalAsString( bool verbose ) const { stringstream out; unsigned int array_output_count = 0; out << AbhkShapeCollection::asString(); - numUnknownInts = unsigned int(unknownInts.size()); - numSubShapes = unsigned int(subShapes.size()); + numUnknownInts = (unsigned int)(unknownInts.size()); + numSubShapes = (unsigned int)(subShapes.size()); out << " Num Sub Shapes: " << numSubShapes << endl; array_output_count = 0; for (unsigned int i1 = 0; i1 < subShapes.size(); i1++) { @@ -2787,7 +2787,7 @@ void bhkMoppBvTreeShape::InternalRead( istream& in, list<unsigned int> & link_st 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 = unsigned int(unknownBytes2.size()); + numUnknownBytes2 = (unsigned int)(unknownBytes2.size()); if ( shape != NULL ) NifStream( link_map.find( StaticCast<NiObject>(shape) )->second, out, version ); else @@ -2809,7 +2809,7 @@ std::string bhkMoppBvTreeShape::InternalAsString( bool verbose ) const { stringstream out; unsigned int array_output_count = 0; out << bhkShape::asString(); - numUnknownBytes2 = unsigned int(unknownBytes2.size()); + numUnknownBytes2 = (unsigned int)(unknownBytes2.size()); out << " Shape: " << shape << endl; out << " Material: " << material << endl; array_output_count = 0; @@ -2871,7 +2871,7 @@ void bhkMultiSphereShape::InternalRead( istream& in, list<unsigned int> & link_s 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 = unsigned int(spheres.size()); + numSpheres = (unsigned int)(spheres.size()); NifStream( unknownFloat1, out, version ); NifStream( unknownFloat2, out, version ); NifStream( unknownFloat3, out, version ); @@ -2886,7 +2886,7 @@ std::string bhkMultiSphereShape::InternalAsString( bool verbose ) const { stringstream out; unsigned int array_output_count = 0; out << bhkSphereRepShape::asString(); - numSpheres = unsigned int(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; @@ -2941,8 +2941,8 @@ void bhkNiTriStripsShape::InternalRead( istream& in, list<unsigned int> & link_s 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 = unsigned int(dataLayers.size()); - numStripsData = unsigned int(stripsData.size()); + numDataLayers = (unsigned int)(dataLayers.size()); + numStripsData = (unsigned int)(stripsData.size()); NifStream( unknownFloat1, out, version ); NifStream( unknownInt1, out, version ); for (unsigned int i1 = 0; i1 < 4; i1++) { @@ -2970,8 +2970,8 @@ std::string bhkNiTriStripsShape::InternalAsString( bool verbose ) const { stringstream out; unsigned int array_output_count = 0; out << bhkSphereRepShape::asString(); - numDataLayers = unsigned int(dataLayers.size()); - numStripsData = unsigned int(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; @@ -3058,7 +3058,7 @@ void bhkPackedNiTriStripsShape::InternalRead( istream& in, list<unsigned int> & 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 = unsigned short(subShapes.size()); + numSubShapes = (unsigned short)(subShapes.size()); NifStream( numSubShapes, out, version ); for (unsigned int i1 = 0; i1 < subShapes.size(); i1++) { NifStream( subShapes[i1].layer, out, version ); @@ -3084,7 +3084,7 @@ std::string bhkPackedNiTriStripsShape::InternalAsString( bool verbose ) const { stringstream out; unsigned int array_output_count = 0; out << AbhkShapeCollection::asString(); - numSubShapes = unsigned short(subShapes.size()); + numSubShapes = (unsigned short)(subShapes.size()); out << " Num Sub Shapes: " << numSubShapes << endl; array_output_count = 0; for (unsigned int i1 = 0; i1 < subShapes.size(); i1++) { @@ -3281,7 +3281,7 @@ void bhkRigidBody::InternalRead( istream& in, list<unsigned int> & link_stack, u 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 = unsigned int(constraints.size()); + numConstraints = (unsigned int)(constraints.size()); for (unsigned int i1 = 0; i1 < 5; i1++) { NifStream( unknown5Floats[i1], out, version ); }; @@ -3337,7 +3337,7 @@ std::string bhkRigidBody::InternalAsString( bool verbose ) const { stringstream out; unsigned int array_output_count = 0; out << bhkEntity::asString(); - numConstraints = unsigned int(constraints.size()); + numConstraints = (unsigned int)(constraints.size()); array_output_count = 0; for (unsigned int i1 = 0; i1 < 5; i1++) { if ( !verbose && ( array_output_count > MAXARRAYDUMP ) ) { @@ -3755,7 +3755,7 @@ void BSFurnitureMarker::InternalRead( istream& in, list<unsigned int> & link_sta 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 = unsigned int(positions.size()); + numPositions = (unsigned int)(positions.size()); NifStream( numPositions, out, version ); for (unsigned int i1 = 0; i1 < positions.size(); i1++) { NifStream( positions[i1].offset, out, version ); @@ -3769,7 +3769,7 @@ std::string BSFurnitureMarker::InternalAsString( bool verbose ) const { stringstream out; unsigned int array_output_count = 0; out << NiExtraData::asString(); - numPositions = unsigned int(positions.size()); + numPositions = (unsigned int)(positions.size()); out << " Num Positions: " << numPositions << endl; array_output_count = 0; for (unsigned int i1 = 0; i1 < positions.size(); i1++) { @@ -3894,8 +3894,8 @@ void hkPackedNiTriStripsData::InternalRead( istream& in, list<unsigned int> & li 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 = unsigned int(vertices.size()); - numTriangles = unsigned int(triangles.size()); + numVertices = (unsigned int)(vertices.size()); + numTriangles = (unsigned int)(triangles.size()); NifStream( numTriangles, out, version ); for (unsigned int i1 = 0; i1 < triangles.size(); i1++) { NifStream( triangles[i1].triangle, out, version ); @@ -3912,8 +3912,8 @@ std::string hkPackedNiTriStripsData::InternalAsString( bool verbose ) const { stringstream out; unsigned int array_output_count = 0; out << AbhkShapeCollection::asString(); - numVertices = unsigned int(vertices.size()); - numTriangles = unsigned int(triangles.size()); + numVertices = (unsigned int)(vertices.size()); + numTriangles = (unsigned int)(triangles.size()); out << " Num Triangles: " << numTriangles << endl; array_output_count = 0; for (unsigned int i1 = 0; i1 < triangles.size(); i1++) { @@ -4141,7 +4141,7 @@ void NiBinaryExtraData::InternalRead( istream& in, list<unsigned int> & link_sta 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 = unsigned int(binaryData.data.size()); + binaryData.dataSize = (unsigned int)(binaryData.data.size()); NifStream( binaryData.dataSize, out, version ); for (unsigned int i1 = 0; i1 < binaryData.data.size(); i1++) { NifStream( binaryData.data[i1], out, version ); @@ -4152,7 +4152,7 @@ std::string NiBinaryExtraData::InternalAsString( bool verbose ) const { stringstream out; unsigned int array_output_count = 0; out << NiExtraData::asString(); - binaryData.dataSize = unsigned int(binaryData.data.size()); + binaryData.dataSize = (unsigned int)(binaryData.data.size()); out << " Data Size: " << binaryData.dataSize << endl; array_output_count = 0; for (unsigned int i1 = 0; i1 < binaryData.data.size(); i1++) { @@ -4313,11 +4313,11 @@ void NiBoneLODController::InternalRead( istream& in, list<unsigned int> & link_s 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 = unsigned int(shapeGroups2.size()); - numShapeGroups = unsigned int(shapeGroups1.size()); + numShapeGroups2 = (unsigned int)(shapeGroups2.size()); + numShapeGroups = (unsigned int)(shapeGroups1.size()); NifStream( numShapeGroups, out, version ); for (unsigned int i1 = 0; i1 < shapeGroups1.size(); i1++) { - shapeGroups1[i1].numLinkPairs = unsigned int(shapeGroups1[i1].linkPairs.size()); + shapeGroups1[i1].numLinkPairs = (unsigned int)(shapeGroups1[i1].linkPairs.size()); NifStream( shapeGroups1[i1].numLinkPairs, out, version ); for (unsigned int i2 = 0; i2 < shapeGroups1[i1].linkPairs.size(); i2++) { if ( shapeGroups1[i1].linkPairs[i2].shape != NULL ) @@ -4343,8 +4343,8 @@ std::string NiBoneLODController::InternalAsString( bool verbose ) const { stringstream out; unsigned int array_output_count = 0; out << ABoneLODController::asString(); - numShapeGroups2 = unsigned int(shapeGroups2.size()); - numShapeGroups = unsigned int(shapeGroups1.size()); + numShapeGroups2 = (unsigned int)(shapeGroups2.size()); + numShapeGroups = (unsigned int)(shapeGroups1.size()); out << " Num Shape Groups: " << numShapeGroups << endl; array_output_count = 0; for (unsigned int i1 = 0; i1 < shapeGroups1.size(); i1++) { @@ -4352,7 +4352,7 @@ std::string NiBoneLODController::InternalAsString( bool verbose ) const { out << "<Data Truncated. Use verbose mode to see complete listing.>" << endl; break; }; - shapeGroups1[i1].numLinkPairs = unsigned int(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 (unsigned int i2 = 0; i2 < shapeGroups1[i1].linkPairs.size(); i2++) { @@ -4425,7 +4425,7 @@ void NiBoolData::InternalRead( istream& in, list<unsigned int> & link_stack, uns 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 = unsigned int(data.keys.size()); + data.numKeys = (unsigned int)(data.keys.size()); NifStream( data.numKeys, out, version ); if ( (data.numKeys != 0) ) { NifStream( data.interpolation, out, version ); @@ -4439,7 +4439,7 @@ std::string NiBoolData::InternalAsString( bool verbose ) const { stringstream out; unsigned int array_output_count = 0; out << AKeyedData::asString(); - data.numKeys = unsigned int(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; @@ -4787,7 +4787,7 @@ void NiBSplineData::InternalRead( istream& in, list<unsigned int> & link_stack, 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 = unsigned int(controlPoints.size()); + count = (unsigned int)(controlPoints.size()); NifStream( unknownInt, out, version ); NifStream( count, out, version ); for (unsigned int i1 = 0; i1 < controlPoints.size(); i1++) { @@ -4799,7 +4799,7 @@ std::string NiBSplineData::InternalAsString( bool verbose ) const { stringstream out; unsigned int array_output_count = 0; out << NiObject::asString(); - count = unsigned int(controlPoints.size()); + count = (unsigned int)(controlPoints.size()); out << " Unknown Int: " << unknownInt << endl; out << " Count: " << count << endl; array_output_count = 0; @@ -5043,7 +5043,7 @@ void NiColorData::InternalRead( istream& in, list<unsigned int> & link_stack, un 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 = unsigned int(data.keys.size()); + data.numKeys = (unsigned int)(data.keys.size()); NifStream( data.numKeys, out, version ); if ( (data.numKeys != 0) ) { NifStream( data.interpolation, out, version ); @@ -5057,7 +5057,7 @@ std::string NiColorData::InternalAsString( bool verbose ) const { stringstream out; unsigned int array_output_count = 0; out << AKeyedData::asString(); - data.numKeys = unsigned int(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; @@ -5131,7 +5131,7 @@ void NiControllerManager::InternalRead( istream& in, list<unsigned int> & link_s 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 = unsigned int(controllerSequences.size()); + numControllerSequences = (unsigned int)(controllerSequences.size()); NifStream( cumulative, out, version ); NifStream( numControllerSequences, out, version ); for (unsigned int i1 = 0; i1 < controllerSequences.size(); i1++) { @@ -5150,7 +5150,7 @@ std::string NiControllerManager::InternalAsString( bool verbose ) const { stringstream out; unsigned int array_output_count = 0; out << NiTimeController::asString(); - numControllerSequences = unsigned int(controllerSequences.size()); + numControllerSequences = (unsigned int)(controllerSequences.size()); out << " Cumulative: " << cumulative << endl; out << " Num Controller Sequences: " << numControllerSequences << endl; array_output_count = 0; @@ -5294,7 +5294,7 @@ void NiControllerSequence::InternalRead( istream& in, list<unsigned int> & link_ 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 = unsigned int(controlledBlocks.size()); + numControlledBlocks = (unsigned int)(controlledBlocks.size()); NifStream( name, out, version ); if ( version <= 0x0A010000 ) { NifStream( textKeysName, out, version ); @@ -5416,7 +5416,7 @@ std::string NiControllerSequence::InternalAsString( bool verbose ) const { stringstream out; unsigned int array_output_count = 0; out << NiObject::asString(); - numControlledBlocks = unsigned int(controlledBlocks.size()); + numControlledBlocks = (unsigned int)(controlledBlocks.size()); out << " Name: " << name << endl; out << " Text Keys Name: " << textKeysName << endl; out << " Text Keys: " << textKeys << endl; @@ -5524,7 +5524,7 @@ void NiDefaultAVObjectPalette::InternalRead( istream& in, list<unsigned int> & l 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 = unsigned int(objs.size()); + numObjs = (unsigned int)(objs.size()); NifStream( unknownInt, out, version ); NifStream( numObjs, out, version ); for (unsigned int i1 = 0; i1 < objs.size(); i1++) { @@ -5540,7 +5540,7 @@ std::string NiDefaultAVObjectPalette::InternalAsString( bool verbose ) const { stringstream out; unsigned int array_output_count = 0; out << NiObject::asString(); - numObjs = unsigned int(objs.size()); + numObjs = (unsigned int)(objs.size()); out << " Unknown Int: " << unknownInt << endl; out << " Num Objs: " << numObjs << endl; array_output_count = 0; @@ -5641,7 +5641,7 @@ void NiFlipController::InternalRead( istream& in, list<unsigned int> & link_stac 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 = unsigned int(sources.size()); + numSources = (unsigned int)(sources.size()); NifStream( textureSlot, out, version ); if ( version <= 0x0A010000 ) { NifStream( unknownInt2, out, version ); @@ -5660,7 +5660,7 @@ std::string NiFlipController::InternalAsString( bool verbose ) const { stringstream out; unsigned int array_output_count = 0; out << NiSingleInterpolatorController::asString(); - numSources = unsigned int(sources.size()); + numSources = (unsigned int)(sources.size()); out << " Texture Slot: " << textureSlot << endl; out << " Unknown Int 2: " << unknownInt2 << endl; out << " Delta: " << delta << endl; @@ -5711,7 +5711,7 @@ void NiFloatData::InternalRead( istream& in, list<unsigned int> & link_stack, un 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 = unsigned int(data.keys.size()); + data.numKeys = (unsigned int)(data.keys.size()); NifStream( data.numKeys, out, version ); if ( (data.numKeys != 0) ) { NifStream( data.interpolation, out, version ); @@ -5725,7 +5725,7 @@ std::string NiFloatData::InternalAsString( bool verbose ) const { stringstream out; unsigned int array_output_count = 0; out << AKeyedData::asString(); - data.numKeys = unsigned int(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; @@ -5878,7 +5878,7 @@ void NiFloatsExtraData::InternalRead( istream& in, list<unsigned int> & link_sta 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 = unsigned int(data.size()); + numFloats = (unsigned int)(data.size()); NifStream( numFloats, out, version ); for (unsigned int i1 = 0; i1 < data.size(); i1++) { NifStream( data[i1], out, version ); @@ -5889,7 +5889,7 @@ std::string NiFloatsExtraData::InternalAsString( bool verbose ) const { stringstream out; unsigned int array_output_count = 0; out << NiExtraData::asString(); - numFloats = unsigned int(data.size()); + numFloats = (unsigned int)(data.size()); out << " Num Floats: " << numFloats << endl; array_output_count = 0; for (unsigned int i1 = 0; i1 < data.size(); i1++) { @@ -5981,8 +5981,8 @@ void NiGeomMorpherController::InternalRead( istream& in, list<unsigned int> & li 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 = unsigned int(unknownInts.size()); - numInterpolators = unsigned int(interpolators.size()); + numUnknownInts = (unsigned int)(unknownInts.size()); + numInterpolators = (unsigned int)(interpolators.size()); if ( version >= 0x0A010000 ) { NifStream( unknown, out, version ); }; @@ -6015,8 +6015,8 @@ std::string NiGeomMorpherController::InternalAsString( bool verbose ) const { stringstream out; unsigned int array_output_count = 0; out << NiTimeController::asString(); - numUnknownInts = unsigned int(unknownInts.size()); - numInterpolators = unsigned int(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; @@ -6151,7 +6151,7 @@ void NiIntegersExtraData::InternalRead( istream& in, list<unsigned int> & link_s 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 = unsigned int(data.size()); + numIntegers = (unsigned int)(data.size()); NifStream( numIntegers, out, version ); for (unsigned int i1 = 0; i1 < data.size(); i1++) { NifStream( data[i1], out, version ); @@ -6162,7 +6162,7 @@ std::string NiIntegersExtraData::InternalAsString( bool verbose ) const { stringstream out; unsigned int array_output_count = 0; out << NiExtraData::asString(); - numIntegers = unsigned int(data.size()); + numIntegers = (unsigned int)(data.size()); out << " Num Integers: " << numIntegers << endl; array_output_count = 0; for (unsigned int i1 = 0; i1 < data.size(); i1++) { @@ -6326,7 +6326,7 @@ void NiKeyframeData::InternalWrite( ostream& out, const map<NiObjectRef,unsigned }; if ( (rotationType == 4) ) { for (unsigned int i2 = 0; i2 < 3; i2++) { - xyzRotations[i2].numKeys = unsigned int(xyzRotations[i2].keys.size()); + 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 ); @@ -6336,7 +6336,7 @@ void NiKeyframeData::InternalWrite( ostream& out, const map<NiObjectRef,unsigned }; }; }; - translations.numKeys = unsigned int(translations.keys.size()); + translations.numKeys = (unsigned int)(translations.keys.size()); NifStream( translations.numKeys, out, version ); if ( (translations.numKeys != 0) ) { NifStream( translations.interpolation, out, version ); @@ -6344,7 +6344,7 @@ void NiKeyframeData::InternalWrite( ostream& out, const map<NiObjectRef,unsigned for (unsigned int i1 = 0; i1 < translations.keys.size(); i1++) { NifStream( translations.keys[i1], out, version, translations.interpolation ); }; - scales.numKeys = unsigned int(scales.keys.size()); + scales.numKeys = (unsigned int)(scales.keys.size()); NifStream( scales.numKeys, out, version ); if ( (scales.numKeys != 0) ) { NifStream( scales.interpolation, out, version ); @@ -6384,7 +6384,7 @@ std::string NiKeyframeData::InternalAsString( bool verbose ) const { out << "<Data Truncated. Use verbose mode to see complete listing.>" << endl; break; }; - xyzRotations[i2].numKeys = unsigned int(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; @@ -6403,7 +6403,7 @@ std::string NiKeyframeData::InternalAsString( bool verbose ) const { }; }; }; - translations.numKeys = unsigned int(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; @@ -6420,7 +6420,7 @@ std::string NiKeyframeData::InternalAsString( bool verbose ) const { out << " Keys[" << i1 << "]: " << translations.keys[i1] << endl; array_output_count++; }; - scales.numKeys = unsigned int(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; @@ -6827,7 +6827,7 @@ void NiMeshPSysData::InternalRead( istream& in, list<unsigned int> & link_stack, 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 = unsigned int(unknownLinks.size()); + numUnknownLinks = (unsigned int)(unknownLinks.size()); if ( version >= 0x14000005 ) { NifStream( unknownByte11, out, version ); }; @@ -6881,7 +6881,7 @@ std::string NiMeshPSysData::InternalAsString( bool verbose ) const { stringstream out; unsigned int array_output_count = 0; out << APSysData::asString(); - numUnknownLinks = unsigned int(unknownLinks.size()); + numUnknownLinks = (unsigned int)(unknownLinks.size()); out << " Unknown Byte 11: " << unknownByte11 << endl; array_output_count = 0; for (unsigned int i1 = 0; i1 < unknownFloats4.size(); i1++) { @@ -6995,12 +6995,12 @@ void NiMorphData::InternalRead( istream& in, list<unsigned int> & link_stack, un 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 = unsigned int(morphs.size()); + numMorphs = (unsigned int)(morphs.size()); NifStream( numMorphs, out, version ); NifStream( numVertices, out, version ); NifStream( unknownByte, out, version ); for (unsigned int i1 = 0; i1 < morphs.size(); i1++) { - morphs[i1].numKeys = unsigned int(morphs[i1].keys.size()); + morphs[i1].numKeys = (unsigned int)(morphs[i1].keys.size()); if ( version >= 0x0A01006A ) { NifStream( morphs[i1].frameName, out, version ); }; @@ -7024,7 +7024,7 @@ std::string NiMorphData::InternalAsString( bool verbose ) const { stringstream out; unsigned int array_output_count = 0; out << NiObject::asString(); - numMorphs = unsigned int(morphs.size()); + numMorphs = (unsigned int)(morphs.size()); out << " Num Morphs: " << numMorphs << endl; out << " Num Vertices: " << numVertices << endl; out << " Unknown Byte: " << unknownByte << endl; @@ -7034,7 +7034,7 @@ std::string NiMorphData::InternalAsString( bool verbose ) const { out << "<Data Truncated. Use verbose mode to see complete listing.>" << endl; break; }; - morphs[i1].numKeys = unsigned int(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; @@ -7090,7 +7090,7 @@ void NiMultiTargetTransformController::InternalRead( istream& in, list<unsigned 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 = unsigned short(extraTargets.size()); + numExtraTargets = (unsigned short)(extraTargets.size()); NifStream( numExtraTargets, out, version ); for (unsigned int i1 = 0; i1 < extraTargets.size(); i1++) { if ( extraTargets[i1] != NULL ) @@ -7104,7 +7104,7 @@ std::string NiMultiTargetTransformController::InternalAsString( bool verbose ) c stringstream out; unsigned int array_output_count = 0; out << NiTimeController::asString(); - numExtraTargets = unsigned short(extraTargets.size()); + numExtraTargets = (unsigned short)(extraTargets.size()); out << " Num Extra Targets: " << numExtraTargets << endl; array_output_count = 0; for (unsigned int i1 = 0; i1 < extraTargets.size(); i1++) { @@ -7155,8 +7155,8 @@ void NiNode::InternalRead( istream& in, list<unsigned int> & link_stack, unsigne 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 = unsigned int(effects.size()); - numChildren = unsigned int(children.size()); + numEffects = (unsigned int)(effects.size()); + numChildren = (unsigned int)(children.size()); NifStream( numChildren, out, version ); for (unsigned int i1 = 0; i1 < children.size(); i1++) { if ( children[i1] != NULL ) @@ -7177,8 +7177,8 @@ std::string NiNode::InternalAsString( bool verbose ) const { stringstream out; unsigned int array_output_count = 0; out << NiAVObject::asString(); - numEffects = unsigned int(effects.size()); - numChildren = unsigned int(children.size()); + numEffects = (unsigned int)(effects.size()); + numChildren = (unsigned int)(children.size()); out << " Num Children: " << numChildren << endl; array_output_count = 0; for (unsigned int i1 = 0; i1 < children.size(); i1++) { @@ -7344,7 +7344,7 @@ void FxRadioButton::InternalRead( istream& in, list<unsigned int> & link_stack, 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 = unsigned int(buttons.size()); + numButtons = (unsigned int)(buttons.size()); NifStream( unknownInt1, out, version ); NifStream( unknownInt2, out, version ); NifStream( unknownInt3, out, version ); @@ -7361,7 +7361,7 @@ std::string FxRadioButton::InternalAsString( bool verbose ) const { stringstream out; unsigned int array_output_count = 0; out << FxWidget::asString(); - numButtons = unsigned int(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; @@ -7502,7 +7502,7 @@ void NiLODNode::InternalRead( istream& in, list<unsigned int> & link_stack, unsi 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 = unsigned int(lodLevels.size()); + numLodLevels = (unsigned int)(lodLevels.size()); for (unsigned int i1 = 0; i1 < 4; i1++) { NifStream( unknown4Bytes[i1], out, version ); }; @@ -7527,7 +7527,7 @@ std::string NiLODNode::InternalAsString( bool verbose ) const { stringstream out; unsigned int array_output_count = 0; out << NiNode::asString(); - numLodLevels = unsigned int(lodLevels.size()); + numLodLevels = (unsigned int)(lodLevels.size()); array_output_count = 0; for (unsigned int i1 = 0; i1 < 4; i1++) { if ( !verbose && ( array_output_count > MAXARRAYDUMP ) ) { @@ -7767,7 +7767,7 @@ void NiParticleMeshModifier::InternalRead( istream& in, list<unsigned int> & lin 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 = unsigned int(particleMeshes.size()); + numParticleMeshes = (unsigned int)(particleMeshes.size()); NifStream( numParticleMeshes, out, version ); for (unsigned int i1 = 0; i1 < particleMeshes.size(); i1++) { if ( particleMeshes[i1] != NULL ) @@ -7781,7 +7781,7 @@ std::string NiParticleMeshModifier::InternalAsString( bool verbose ) const { stringstream out; unsigned int array_output_count = 0; out << AParticleModifier::asString(); - numParticleMeshes = unsigned int(particleMeshes.size()); + numParticleMeshes = (unsigned int)(particleMeshes.size()); out << " Num Particle Meshes: " << numParticleMeshes << endl; array_output_count = 0; for (unsigned int i1 = 0; i1 < particleMeshes.size(); i1++) { @@ -8070,7 +8070,7 @@ void NiParticleSystem::InternalRead( istream& in, list<unsigned int> & link_stac 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 = unsigned int(modifiers.size()); + numModifiers = (unsigned int)(modifiers.size()); if ( version >= 0x0A010000 ) { NifStream( unknownBool, out, version ); NifStream( numModifiers, out, version ); @@ -8087,7 +8087,7 @@ std::string NiParticleSystem::InternalAsString( bool verbose ) const { stringstream out; unsigned int array_output_count = 0; out << NiParticles::asString(); - numModifiers = unsigned int(modifiers.size()); + numModifiers = (unsigned int)(modifiers.size()); out << " Unknown Bool: " << unknownBool << endl; out << " Num Modifiers: " << numModifiers << endl; array_output_count = 0; @@ -8204,7 +8204,7 @@ void NiParticleSystemController::InternalRead( istream& in, list<unsigned int> & 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 = unsigned short(particles.size()); + numParticles = (unsigned short)(particles.size()); NifStream( speed, out, version ); NifStream( speedRandom, out, version ); NifStream( verticalDirection, out, version ); @@ -8266,7 +8266,7 @@ std::string NiParticleSystemController::InternalAsString( bool verbose ) const { stringstream out; unsigned int array_output_count = 0; out << NiTimeController::asString(); - numParticles = unsigned short(particles.size()); + numParticles = (unsigned short)(particles.size()); out << " Speed: " << speed << endl; out << " Speed Random: " << speedRandom << endl; out << " Vertical Direction: " << verticalDirection << endl; @@ -8527,7 +8527,7 @@ void NiPixelData::InternalRead( istream& in, list<unsigned int> & link_stack, un 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 = unsigned int(mipmaps.size()); + numMipmaps = (unsigned int)(mipmaps.size()); NifStream( pixelFormat, out, version ); if ( version <= 0x0A020000 ) { NifStream( redMask, out, version ); @@ -8558,7 +8558,7 @@ void NiPixelData::InternalWrite( ostream& out, const map<NiObjectRef,unsigned in NifStream( mipmaps[i1].height, out, version ); NifStream( mipmaps[i1].offset, out, version ); }; - pixelData.dataSize = unsigned int(pixelData.data.size()); + pixelData.dataSize = (unsigned int)(pixelData.data.size()); NifStream( pixelData.dataSize, out, version ); for (unsigned int i1 = 0; i1 < pixelData.data.size(); i1++) { NifStream( pixelData.data[i1], out, version ); @@ -8572,7 +8572,7 @@ std::string NiPixelData::InternalAsString( bool verbose ) const { stringstream out; unsigned int array_output_count = 0; out << NiObject::asString(); - numMipmaps = unsigned int(mipmaps.size()); + numMipmaps = (unsigned int)(mipmaps.size()); out << " Pixel Format: " << pixelFormat << endl; out << " Red Mask: " << redMask << endl; out << " Green Mask: " << greenMask << endl; @@ -8617,7 +8617,7 @@ std::string NiPixelData::InternalAsString( bool verbose ) const { out << " Height: " << mipmaps[i1].height << endl; out << " Offset: " << mipmaps[i1].offset << endl; }; - pixelData.dataSize = unsigned int(pixelData.data.size()); + pixelData.dataSize = (unsigned int)(pixelData.data.size()); out << " Data Size: " << pixelData.dataSize << endl; array_output_count = 0; for (unsigned int i1 = 0; i1 < pixelData.data.size(); i1++) { @@ -8822,7 +8822,7 @@ void NiPosData::InternalRead( istream& in, list<unsigned int> & link_stack, unsi 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 = unsigned int(data.keys.size()); + data.numKeys = (unsigned int)(data.keys.size()); NifStream( data.numKeys, out, version ); if ( (data.numKeys != 0) ) { NifStream( data.interpolation, out, version ); @@ -8836,7 +8836,7 @@ std::string NiPosData::InternalAsString( bool verbose ) const { stringstream out; unsigned int array_output_count = 0; out << AKeyedData::asString(); - data.numKeys = unsigned int(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; @@ -9444,8 +9444,8 @@ void NiPSysEmitterCtlrData::InternalRead( istream& in, list<unsigned int> & link 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_ = unsigned int(visibilityKeys_.size()); - floatKeys_.numKeys = unsigned int(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 ); @@ -9463,8 +9463,8 @@ std::string NiPSysEmitterCtlrData::InternalAsString( bool verbose ) const { stringstream out; unsigned int array_output_count = 0; out << NiObject::asString(); - numVisibilityKeys_ = unsigned int(visibilityKeys_.size()); - floatKeys_.numKeys = unsigned int(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; @@ -9813,7 +9813,7 @@ void NiPSysMeshEmitter::InternalRead( istream& in, list<unsigned int> & link_sta 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 = unsigned int(emitterMeshes.size()); + numEmitterMeshes = (unsigned int)(emitterMeshes.size()); NifStream( numEmitterMeshes, out, version ); for (unsigned int i1 = 0; i1 < emitterMeshes.size(); i1++) { if ( emitterMeshes[i1] != NULL ) @@ -9830,7 +9830,7 @@ std::string NiPSysMeshEmitter::InternalAsString( bool verbose ) const { stringstream out; unsigned int array_output_count = 0; out << NiPSysEmitter::asString(); - numEmitterMeshes = unsigned int(emitterMeshes.size()); + numEmitterMeshes = (unsigned int)(emitterMeshes.size()); out << " Num Emitter Meshes: " << numEmitterMeshes << endl; array_output_count = 0; for (unsigned int i1 = 0; i1 < emitterMeshes.size(); i1++) { @@ -9880,7 +9880,7 @@ void NiPSysMeshUpdateModifier::InternalRead( istream& in, list<unsigned int> & l 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 = unsigned int(meshes.size()); + numMeshes = (unsigned int)(meshes.size()); NifStream( numMeshes, out, version ); for (unsigned int i1 = 0; i1 < meshes.size(); i1++) { if ( meshes[i1] != NULL ) @@ -9894,7 +9894,7 @@ std::string NiPSysMeshUpdateModifier::InternalAsString( bool verbose ) const { stringstream out; unsigned int array_output_count = 0; out << NiPSysModifier::asString(); - numMeshes = unsigned int(meshes.size()); + numMeshes = (unsigned int)(meshes.size()); out << " Num Meshes: " << numMeshes << endl; array_output_count = 0; for (unsigned int i1 = 0; i1 < meshes.size(); i1++) { @@ -10285,7 +10285,7 @@ void NiRangeLODData::InternalRead( istream& in, list<unsigned int> & link_stack, 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 = unsigned int(lodLevels.size()); + numLodLevels = (unsigned int)(lodLevels.size()); NifStream( lodCenter, out, version ); NifStream( numLodLevels, out, version ); for (unsigned int i1 = 0; i1 < lodLevels.size(); i1++) { @@ -10298,7 +10298,7 @@ std::string NiRangeLODData::InternalAsString( bool verbose ) const { stringstream out; unsigned int array_output_count = 0; out << NiLODData::asString(); - numLodLevels = unsigned int(lodLevels.size()); + numLodLevels = (unsigned int)(lodLevels.size()); out << " LOD Center: " << lodCenter << endl; out << " Num LOD Levels: " << numLodLevels << endl; array_output_count = 0; @@ -10338,7 +10338,7 @@ void NiScreenLODData::InternalRead( istream& in, list<unsigned int> & link_stack 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 = unsigned int(proportionLevels.size()); + proportionCount = (unsigned int)(proportionLevels.size()); NifStream( boundCenter, out, version ); NifStream( boundRadius, out, version ); NifStream( worldCenter, out, version ); @@ -10353,7 +10353,7 @@ std::string NiScreenLODData::InternalAsString( bool verbose ) const { stringstream out; unsigned int array_output_count = 0; out << NiLODData::asString(); - proportionCount = unsigned int(proportionLevels.size()); + proportionCount = (unsigned int)(proportionLevels.size()); out << " Bound Center: " << boundCenter << endl; out << " Bound Radius: " << boundRadius << endl; out << " World Center: " << worldCenter << endl; @@ -10519,7 +10519,7 @@ void NiSkinData::InternalRead( istream& in, list<unsigned int> & link_stack, uns 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 = unsigned int(boneList.size()); + numBones = (unsigned int)(boneList.size()); NifStream( rotation, out, version ); NifStream( translation, out, version ); NifStream( scale, out, version ); @@ -10534,7 +10534,7 @@ void NiSkinData::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int NifStream( unknownByte, out, version ); }; for (unsigned int i1 = 0; i1 < boneList.size(); i1++) { - boneList[i1].numVertices = unsigned short(boneList[i1].vertexWeights.size()); + 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 ); @@ -10552,7 +10552,7 @@ std::string NiSkinData::InternalAsString( bool verbose ) const { stringstream out; unsigned int array_output_count = 0; out << NiObject::asString(); - numBones = unsigned int(boneList.size()); + numBones = (unsigned int)(boneList.size()); out << " Rotation: " << rotation << endl; out << " Translation: " << translation << endl; out << " Scale: " << scale << endl; @@ -10565,7 +10565,7 @@ std::string NiSkinData::InternalAsString( bool verbose ) const { out << "<Data Truncated. Use verbose mode to see complete listing.>" << endl; break; }; - boneList[i1].numVertices = unsigned short(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; @@ -10621,7 +10621,7 @@ void NiSkinInstance::InternalRead( istream& in, list<unsigned int> & link_stack, 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 = unsigned int(bones.size()); + numBones = (unsigned int)(bones.size()); if ( data != NULL ) NifStream( link_map.find( StaticCast<NiObject>(data) )->second, out, version ); else @@ -10649,7 +10649,7 @@ std::string NiSkinInstance::InternalAsString( bool verbose ) const { stringstream out; unsigned int array_output_count = 0; out << NiObject::asString(); - numBones = unsigned int(bones.size()); + numBones = (unsigned int)(bones.size()); out << " Data: " << data << endl; out << " Skin Partition: " << skinPartition << endl; out << " Skeleton Root: " << skeletonRoot << endl; @@ -10818,16 +10818,16 @@ void NiSkinPartition::InternalRead( istream& in, list<unsigned int> & link_stack 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 = unsigned int(skinPartitionBlocks.size()); + numSkinPartitionBlocks = (unsigned int)(skinPartitionBlocks.size()); NifStream( numSkinPartitionBlocks, out, version ); 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()); + 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 ); @@ -10910,7 +10910,7 @@ std::string NiSkinPartition::InternalAsString( bool verbose ) const { stringstream out; unsigned int array_output_count = 0; out << NiObject::asString(); - numSkinPartitionBlocks = unsigned int(skinPartitionBlocks.size()); + numSkinPartitionBlocks = (unsigned int)(skinPartitionBlocks.size()); out << " Num Skin Partition Blocks: " << numSkinPartitionBlocks << endl; array_output_count = 0; for (unsigned int i1 = 0; i1 < skinPartitionBlocks.size(); i1++) { @@ -10919,12 +10919,12 @@ std::string NiSkinPartition::InternalAsString( bool verbose ) const { break; }; 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()); + 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; @@ -11406,7 +11406,7 @@ void NiStringsExtraData::InternalRead( istream& in, list<unsigned int> & link_st 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 = unsigned int(data.size()); + numStrings = (unsigned int)(data.size()); NifStream( numStrings, out, version ); for (unsigned int i1 = 0; i1 < data.size(); i1++) { NifStream( data[i1], out, version ); @@ -11417,7 +11417,7 @@ std::string NiStringsExtraData::InternalAsString( bool verbose ) const { stringstream out; unsigned int array_output_count = 0; out << NiExtraData::asString(); - numStrings = unsigned int(data.size()); + numStrings = (unsigned int)(data.size()); out << " Num Strings: " << numStrings << endl; array_output_count = 0; for (unsigned int i1 = 0; i1 < data.size(); i1++) { @@ -11458,7 +11458,7 @@ void NiTextKeyExtraData::InternalRead( istream& in, list<unsigned int> & link_st 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 = unsigned int(textKeys.size()); + numTextKeys = (unsigned int)(textKeys.size()); if ( version <= 0x04020200 ) { NifStream( unknownInt1, out, version ); }; @@ -11472,7 +11472,7 @@ std::string NiTextKeyExtraData::InternalAsString( bool verbose ) const { stringstream out; unsigned int array_output_count = 0; out << NiExtraData::asString(); - numTextKeys = unsigned int(textKeys.size()); + numTextKeys = (unsigned int)(textKeys.size()); out << " Unknown Int 1: " << unknownInt1 << endl; out << " Num Text Keys: " << numTextKeys << endl; array_output_count = 0; @@ -12065,7 +12065,7 @@ void NiTexturingProperty::InternalRead( istream& in, list<unsigned int> & link_s 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 = unsigned int(shaderTextures.size()); + numShaderTextures = (unsigned int)(shaderTextures.size()); if ( version <= 0x0A000102 ) { NifStream( flags, out, version ); }; @@ -12389,7 +12389,7 @@ std::string NiTexturingProperty::InternalAsString( bool verbose ) const { stringstream out; unsigned int array_output_count = 0; out << NiProperty::asString(); - numShaderTextures = unsigned int(shaderTextures.size()); + numShaderTextures = (unsigned int)(shaderTextures.size()); out << " Flags: " << flags << endl; out << " Apply Mode: " << applyMode << endl; out << " Texture Count: " << textureCount << endl; @@ -12858,7 +12858,7 @@ void NiTriShapeData::InternalRead( istream& in, list<unsigned int> & link_stack, 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 = unsigned short(matchGroups.size()); + numMatchGroups = (unsigned short)(matchGroups.size()); NifStream( numTrianglePoints, out, version ); if ( version >= 0x0A010000 ) { NifStream( hasTriangles, out, version ); @@ -12877,7 +12877,7 @@ void NiTriShapeData::InternalWrite( ostream& out, const map<NiObjectRef,unsigned }; NifStream( numMatchGroups, out, version ); for (unsigned int i1 = 0; i1 < matchGroups.size(); i1++) { - matchGroups[i1].numVertices = unsigned short(matchGroups[i1].vertexIndices.size()); + matchGroups[i1].numVertices = (unsigned short)(matchGroups[i1].vertexIndices.size()); NifStream( matchGroups[i1].numVertices, out, version ); for (unsigned int i2 = 0; i2 < matchGroups[i1].vertexIndices.size(); i2++) { NifStream( matchGroups[i1].vertexIndices[i2], out, version ); @@ -12889,7 +12889,7 @@ std::string NiTriShapeData::InternalAsString( bool verbose ) const { stringstream out; unsigned int array_output_count = 0; out << NiTriBasedGeomData::asString(); - numMatchGroups = unsigned short(matchGroups.size()); + numMatchGroups = (unsigned short)(matchGroups.size()); out << " Num Triangle Points: " << numTrianglePoints << endl; out << " Has Triangles: " << hasTriangles << endl; array_output_count = 0; @@ -12911,7 +12911,7 @@ std::string NiTriShapeData::InternalAsString( bool verbose ) const { out << "<Data Truncated. Use verbose mode to see complete listing.>" << endl; break; }; - matchGroups[i1].numVertices = unsigned short(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 (unsigned int i2 = 0; i2 < matchGroups[i1].vertexIndices.size(); i2++) { @@ -12999,8 +12999,8 @@ void NiTriStripsData::InternalRead( istream& in, list<unsigned int> & link_stack 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 (unsigned int i1 = 0; i1 < points.size(); i1++) - stripLengths[i1] = unsigned short(points[i1].size()); - numStrips = unsigned short(stripLengths.size()); + stripLengths[i1] = (unsigned short)(points[i1].size()); + numStrips = (unsigned short)(stripLengths.size()); NifStream( numStrips, out, version ); for (unsigned int i1 = 0; i1 < stripLengths.size(); i1++) { NifStream( stripLengths[i1], out, version ); @@ -13031,8 +13031,8 @@ std::string NiTriStripsData::InternalAsString( bool verbose ) const { unsigned int array_output_count = 0; out << NiTriBasedGeomData::asString(); for (unsigned int i1 = 0; i1 < points.size(); i1++) - stripLengths[i1] = unsigned short(points[i1].size()); - numStrips = unsigned short(stripLengths.size()); + stripLengths[i1] = (unsigned short)(points[i1].size()); + numStrips = (unsigned short)(stripLengths.size()); out << " Num Strips: " << numStrips << endl; array_output_count = 0; for (unsigned int i1 = 0; i1 < stripLengths.size(); i1++) { @@ -13127,9 +13127,9 @@ void NiClodData::InternalRead( istream& in, list<unsigned int> & link_stack, uns 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 = unsigned short(unknownClodShorts3.size()); - unknownCount2 = unsigned short(unknownClodShorts2.size()); - unknownCount1 = unsigned short(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 ); @@ -13155,9 +13155,9 @@ std::string NiClodData::InternalAsString( bool verbose ) const { stringstream out; unsigned int array_output_count = 0; out << NiTriBasedGeomData::asString(); - unknownCount3 = unsigned short(unknownClodShorts3.size()); - unknownCount2 = unsigned short(unknownClodShorts2.size()); - unknownCount1 = unsigned short(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; @@ -13273,7 +13273,7 @@ void NiUVData::InternalRead( istream& in, list<unsigned int> & link_stack, unsig 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 (unsigned int i1 = 0; i1 < 4; i1++) { - uvGroups[i1].numKeys = unsigned int(uvGroups[i1].keys.size()); + 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 ); @@ -13294,7 +13294,7 @@ std::string NiUVData::InternalAsString( bool verbose ) const { out << "<Data Truncated. Use verbose mode to see complete listing.>" << endl; break; }; - uvGroups[i1].numKeys = unsigned int(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; @@ -13402,7 +13402,7 @@ void NiVertWeightsExtraData::InternalRead( istream& in, list<unsigned int> & lin 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 = unsigned short(weight.size()); + numVertices = (unsigned short)(weight.size()); NifStream( numBytes, out, version ); NifStream( numVertices, out, version ); for (unsigned int i1 = 0; i1 < weight.size(); i1++) { @@ -13414,7 +13414,7 @@ std::string NiVertWeightsExtraData::InternalAsString( bool verbose ) const { stringstream out; unsigned int array_output_count = 0; out << NiExtraData::asString(); - numVertices = unsigned short(weight.size()); + numVertices = (unsigned short)(weight.size()); out << " Num Bytes: " << numBytes << endl; out << " Num Vertices: " << numVertices << endl; array_output_count = 0; @@ -13495,7 +13495,7 @@ void NiVisData::InternalRead( istream& in, list<unsigned int> & link_stack, unsi 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 = unsigned int(visKeys.size()); + numVisKeys = (unsigned int)(visKeys.size()); NifStream( numVisKeys, out, version ); for (unsigned int i1 = 0; i1 < visKeys.size(); i1++) { NifStream( visKeys[i1], out, version, 1 ); @@ -13506,7 +13506,7 @@ std::string NiVisData::InternalAsString( bool verbose ) const { stringstream out; unsigned int array_output_count = 0; out << AKeyedData::asString(); - numVisKeys = unsigned int(visKeys.size()); + numVisKeys = (unsigned int)(visKeys.size()); out << " Num Vis Keys: " << numVisKeys << endl; array_output_count = 0; for (unsigned int i1 = 0; i1 < visKeys.size(); i1++) { diff --git a/src/niflib.cpp b/src/niflib.cpp index b38c2d0930147c6cab8b0dfd3bcfa015dda92607..c4b5a82d52ce176d67f80234d2801b9a54498a1e 100644 --- a/src/niflib.cpp +++ b/src/niflib.cpp @@ -31,8 +31,8 @@ All rights reserved. Please see niflib.h for licence. */ #include "../include/obj/NiExtraData.h" #include "../include/obj/bhkRigidBody.h" #include "../include/obj/bhkCollisionObject.h" -#include "../include/gen/header.h" -#include "../include/gen/footer.h" +#include "../include/gen/Header.h" +#include "../include/gen/Footer.h" namespace Niflib { @@ -505,7 +505,7 @@ void EnumerateObjects( NiObject * root, map<Type*,unsigned int> & type_map, map< //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()) ] = unsigned int(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*,unsigned int> & type_map, map< // If reverse is set then add the link after children otherwise add it before if (!reverse) { - link_map[root] = unsigned int(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*,unsigned int> & type_map, map< } if (reverse) { - link_map[root] = unsigned int(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. - unsigned int file_name_slash = unsigned int(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()); - unsigned int file_name_dot = unsigned int(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 diff --git a/src/obj/BSFurnitureMarker.cpp b/src/obj/BSFurnitureMarker.cpp index f3420e9268147766184c4d4d25b14dd00b4b2b8a..12597e09ace87c87577cf4f0eb239385536d684b 100644 --- a/src/obj/BSFurnitureMarker.cpp +++ b/src/obj/BSFurnitureMarker.cpp @@ -41,7 +41,7 @@ vector<FurniturePosition> BSFurnitureMarker::GetFurniturePositions() const { } void BSFurnitureMarker::SetFurniturePositions( const vector<FurniturePosition> & n ) { - numPositions = unsigned int(n.size()); + numPositions = (unsigned int)(n.size()); positions = n; } diff --git a/src/obj/NiBinaryExtraData.cpp b/src/obj/NiBinaryExtraData.cpp index 6f50f514513141717a5004dbfb877802ac77853c..ec477686a911803d437e793a4471a8b1aeef6a8f 100644 --- a/src/obj/NiBinaryExtraData.cpp +++ b/src/obj/NiBinaryExtraData.cpp @@ -42,6 +42,6 @@ vector<byte> NiBinaryExtraData::GetData() const { }; void NiBinaryExtraData::SetData( const vector<byte> & n ) { - binaryData.dataSize = unsigned int(n.size()); + binaryData.dataSize = (unsigned int)(n.size()); binaryData.data = n; }; diff --git a/src/obj/NiFloatsExtraData.cpp b/src/obj/NiFloatsExtraData.cpp index 064d08b7e0db0485481b27c3e4ce1b2c375fc092..d55808ebde7e5c6ec91d5def6e53f8e377b1ec0c 100644 --- a/src/obj/NiFloatsExtraData.cpp +++ b/src/obj/NiFloatsExtraData.cpp @@ -40,6 +40,6 @@ vector<float> NiFloatsExtraData::GetData() const { } void NiFloatsExtraData::SetData( const vector<float> & n ) { - numFloats = unsigned int(n.size()); + numFloats = (unsigned int)(n.size()); data = n; } diff --git a/src/obj/NiGeomMorpherController.cpp b/src/obj/NiGeomMorpherController.cpp index a68a98ed321a4add63eb3e59520115a895d32a62..f1aa6ee85669a7db8fd1bbb86d6a90f23a556188 100644 --- a/src/obj/NiGeomMorpherController.cpp +++ b/src/obj/NiGeomMorpherController.cpp @@ -42,7 +42,7 @@ vector< Ref<NiInterpolator> > NiGeomMorpherController::GetInterpolators() const } void NiGeomMorpherController::SetInterpolators( const vector< Ref<NiInterpolator> > & n ) { - numInterpolators = unsigned int(n.size()); + numInterpolators = (unsigned int)(n.size()); interpolators = n; } diff --git a/src/obj/NiIntegersExtraData.cpp b/src/obj/NiIntegersExtraData.cpp index bddcea1854971a0f8276e2d4cf1534962dea088c..c03f4ab2124d0af4b97e703b4c5d4dfff3497895 100644 --- a/src/obj/NiIntegersExtraData.cpp +++ b/src/obj/NiIntegersExtraData.cpp @@ -40,6 +40,6 @@ vector<unsigned int> NiIntegersExtraData::GetData() const { }; void NiIntegersExtraData::SetData( const vector<unsigned int> & n ) { - numIntegers = unsigned int( n.size() ); + numIntegers = (unsigned int)( n.size() ); data = n; }; diff --git a/src/obj/NiKeyframeData.cpp b/src/obj/NiKeyframeData.cpp index 226c846d03bd92eaba3445286e1a0686f8a5b3a6..b920a641f014c48d683fea534340fac56342c789 100644 --- a/src/obj/NiKeyframeData.cpp +++ b/src/obj/NiKeyframeData.cpp @@ -53,7 +53,7 @@ void NiKeyframeData::UpdateRotationKeyCount() { if ( rotationType == XYZ_ROTATION_KEY ) { numRotationKeys = 1; } else { - numRotationKeys = unsigned int(quaternionKeys.size()); + numRotationKeys = (unsigned int)(quaternionKeys.size()); } }; diff --git a/src/obj/NiMorphData.cpp b/src/obj/NiMorphData.cpp index ea085a1c74b7f9475683e569cc4026f02243b107..48e134e479d5fa23ad5ca8e3b7d134ed14cd75fe 100644 --- a/src/obj/NiMorphData.cpp +++ b/src/obj/NiMorphData.cpp @@ -53,7 +53,7 @@ int NiMorphData::GetMorphCount() const { } void NiMorphData::SetMorphCount( int n ) { - unsigned int old_size = unsigned int(morphs.size()); + unsigned int old_size = (unsigned int)(morphs.size()); morphs.resize( n ); //Make sure any new vertex groups are the right size diff --git a/src/obj/NiSkinData.cpp b/src/obj/NiSkinData.cpp index 50e90189df1cb65c2c839060a35bf871fab22c83..f57fe616bf2f67b12181f8f116609cca5a070056 100644 --- a/src/obj/NiSkinData.cpp +++ b/src/obj/NiSkinData.cpp @@ -42,7 +42,7 @@ const Type & NiSkinData::GetType() const { }; unsigned int NiSkinData::GetBoneCount() const { - return unsigned int( boneList.size() ); + return (unsigned int)( boneList.size() ); } Matrix44 NiSkinData::GetBoneTransform( unsigned int bone_index ) const { diff --git a/src/obj/NiSkinInstance.cpp b/src/obj/NiSkinInstance.cpp index d3ad7536010a7911ff9eb8bad3bc59fd2a12ed06..d35fdf87838d4313119e5130f9247731ed206e34 100644 --- a/src/obj/NiSkinInstance.cpp +++ b/src/obj/NiSkinInstance.cpp @@ -129,7 +129,7 @@ void NiSkinInstance::SkeletonLost() { } unsigned int NiSkinInstance::GetBoneCount() const { - return unsigned int(bones.size()); + return (unsigned int)(bones.size()); } Ref<NiNode> NiSkinInstance::GetSkeletonRoot() const { diff --git a/src/obj/NiStringExtraData.cpp b/src/obj/NiStringExtraData.cpp index 9b11037f1440631d8e5b1cd4f7918fc4cafdc13d..61be2352e702b42635cd25c36940870cb5ff7a46 100644 --- a/src/obj/NiStringExtraData.cpp +++ b/src/obj/NiStringExtraData.cpp @@ -41,5 +41,5 @@ string NiStringExtraData::GetData() const { void NiStringExtraData::SetData( const string & n ) { stringData = n; - bytesRemaining = unsigned int(stringData.size()) + 4; + bytesRemaining = (unsigned int)(stringData.size()) + 4; } diff --git a/src/obj/NiStringsExtraData.cpp b/src/obj/NiStringsExtraData.cpp index 3b0e5b4cd7393032fe2a6a8ce2fd671a9540c9e2..52fe1a1a3e45332275817ae7d9c2b156b39bf91b 100644 --- a/src/obj/NiStringsExtraData.cpp +++ b/src/obj/NiStringsExtraData.cpp @@ -40,6 +40,6 @@ vector<string> NiStringsExtraData::GetData() const { }; void NiStringsExtraData::SetData( const vector<string> & n ) { - numStrings = unsigned int(n.size()); + numStrings = (unsigned int)(n.size()); data = n; }; diff --git a/src/obj/NiTriShapeData.cpp b/src/obj/NiTriShapeData.cpp index 7cb8497e770bf726845bba45f1018140081abbbf..95b860ed1e8383f93abca682823228b4778c3eee 100644 --- a/src/obj/NiTriShapeData.cpp +++ b/src/obj/NiTriShapeData.cpp @@ -87,7 +87,7 @@ void NiTriShapeData::SetTriangles( const vector<Triangle> & in ) { hasTriangles = ( triangles.size() != 0 ); //Set nuber of triangles - numTriangles = unsigned int(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/NiVertWeightsExtraData.cpp b/src/obj/NiVertWeightsExtraData.cpp index 9c6f8ec19d304bebd4c16bca7c729b8f8d3cfc54..e6ddfed7e52f7d56d1030bcf26a160af687558eb 100644 --- a/src/obj/NiVertWeightsExtraData.cpp +++ b/src/obj/NiVertWeightsExtraData.cpp @@ -40,7 +40,7 @@ vector<float> NiVertWeightsExtraData::GetData() const { } void NiVertWeightsExtraData::SetData( const vector<float> & n ) { - numVertices = unsigned int(n.size()); + numVertices = (unsigned int)(n.size()); numBytes = numVertices + 2; weight = n; }