diff --git a/Makefile b/Makefile
index afea2f1f5ddda7b16220ea9f7225ac3a68bdaa12..3946fc77ce4f007a5c7433207787a937b33ff660 100644
--- a/Makefile
+++ b/Makefile
@@ -27,7 +27,7 @@ DEBUGGING =
# Example: -march=k8 would generate enhancements for the k8 family (opterons and some athlons).or -march=pentium4 for a pentium4
# For more info read this: http://gcc.gnu.org/onlinedocs/gcc-4.1.1/gcc/i386-and-x86_002d64-Options.html#i386-and-x86_002d64-Options
#
-CFLAGS = -O2 -Wall $(DEBUGGING) -fpermissive -Iinclude -D BUILDING_NIFLIB_DLL -fPIC
+CFLAGS = -O2 -Wall $(DEBUGGING) -Iinclude -D BUILDING_NIFLIB_DLL -fPIC
CXXFLAGS = $(CFLAGS)
#IT should find the libs used, but if it doesn't specify here. Ex: -lm for libm.so.<whatever>
LIBS =
diff --git a/include/NIF_IO.h b/include/NIF_IO.h
index 00cacd3afb134263f79a3f1b3c8ec0c9630bb863..70b58b92a1fa16e593d108f5e380b86a59fe391e 100644
--- a/include/NIF_IO.h
+++ b/include/NIF_IO.h
@@ -37,6 +37,7 @@ bool ReadBool( istream &in, unsigned int version );
//-- Write Utility Functions --//
void WriteInt( int val, ostream& out );
void WriteUInt( unsigned int val, ostream& out );
+void WritePtr32( void * val, ostream& out );
void WriteUShort( unsigned short val, ostream& out );
void WriteShort( short val, ostream& out );
void WriteByte( byte val, ostream& out );
diff --git a/src/NIF_IO.cpp b/src/NIF_IO.cpp
index ac357c2bcfa957114f2208905bfbb51a6bab20a1..563adfe74b44516b881f19f463f43072446e752e 100644
--- a/src/NIF_IO.cpp
+++ b/src/NIF_IO.cpp
@@ -184,6 +184,25 @@ void WriteUInt( unsigned int val, ostream& out ){
out.write( (char*)&val, 4 );
}
+void WritePtr32( void * val, ostream& out ){
+#if __SIZEOF_POINTER__ == 4
+ // 32 bit
+ WriteUInt( (unsigned int)val, out );
+#else
+ // 64 bit
+ typedef union intpoint {
+ void *ptr;
+ unsigned int id1;
+ unsigned int id2;
+ };
+ intpoint ptr;
+ ptr.ptr = val;
+ // xor the two parts
+ // (maybe a more advanced hash function would be better, experience will tell)
+ WriteUInt(ptr.id1 ^ ptr.id2, out);
+#endif
+}
+
void WriteUShort( unsigned short val, ostream& out ){
out.write( (char*)&val, 2 );
diff --git a/src/gen/Footer.cpp b/src/gen/Footer.cpp
index f47d935f904585ce857a5589e06144bfae267cbb..3db8f63821849a6a99620df2fad845c2d27974a4 100644
--- a/src/gen/Footer.cpp
+++ b/src/gen/Footer.cpp
@@ -45,7 +45,7 @@ void Footer::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map
NifStream( numRoots, out, info );
for (unsigned int i2 = 0; i2 < roots.size(); i2++) {
if ( info.version < VER_3_3_0_13 ) {
- NifStream( (unsigned int)&(*roots[i2]), out, info );
+ WritePtr32( &(*roots[i2]), out );
} else {
if ( roots[i2] != NULL ) {
NifStream( link_map.find( StaticCast<NiObject>(roots[i2]) )->second, out, info );
diff --git a/src/niflib.cpp b/src/niflib.cpp
index 35ebf44520e8ab61c93c5e1a17e9dd06bdab621b..0b16e576705e0bf7382f97981bbc5a27bcc21b90 100644
--- a/src/niflib.cpp
+++ b/src/niflib.cpp
@@ -500,8 +500,7 @@ void WriteNifTree( ostream & out, list<NiObjectRef> const & roots, const NifInfo
//Write Object Type
WriteString( objects[i]->GetType().GetTypeName() , out );
//Write pointer number of object
- WriteUInt( (unsigned int)&(*objects[i]), out );
-
+ WritePtr32( &(*objects[i]), out );
} else if (version < 0x05000001) {
//Write Object Type
diff --git a/src/obj/ATextureRenderData.cpp b/src/obj/ATextureRenderData.cpp
index 18a0fe91d3d9cf8028218a5989da74201232fe81..bab6c9e6540b00dd25205d40743397a0ae1fd5dc 100644
--- a/src/obj/ATextureRenderData.cpp
+++ b/src/obj/ATextureRenderData.cpp
@@ -144,7 +144,7 @@ void ATextureRenderData::Write( ostream& out, const map<NiObjectRef,unsigned int
};
};
if ( info.version < VER_3_3_0_13 ) {
- NifStream( (unsigned int)&(*palette), out, info );
+ WritePtr32( &(*palette), out );
} else {
if ( palette != NULL ) {
NifStream( link_map.find( StaticCast<NiObject>(palette) )->second, out, info );
diff --git a/src/obj/BSFrustumFOVController.cpp b/src/obj/BSFrustumFOVController.cpp
index b9b4831be412be106c298015bc218a568211ebee..5ae6136e8022870a66e37a5a211d905dfd9b6bd0 100644
--- a/src/obj/BSFrustumFOVController.cpp
+++ b/src/obj/BSFrustumFOVController.cpp
@@ -63,7 +63,7 @@ void BSFrustumFOVController::Write( ostream& out, const map<NiObjectRef,unsigned
NiTimeController::Write( out, link_map, info );
if ( info.version < VER_3_3_0_13 ) {
- NifStream( (unsigned int)&(*interpolator), out, info );
+ WritePtr32( &(*interpolator), out );
} else {
if ( interpolator != NULL ) {
NifStream( link_map.find( StaticCast<NiObject>(interpolator) )->second, out, info );
diff --git a/src/obj/BSKeyframeController.cpp b/src/obj/BSKeyframeController.cpp
index 250d12316d9938cbf2ad1e0482f50dfd32a9305a..6b64582bcc32f323459a9efe54fea27a6ce44853 100644
--- a/src/obj/BSKeyframeController.cpp
+++ b/src/obj/BSKeyframeController.cpp
@@ -57,7 +57,7 @@ void BSKeyframeController::Write( ostream& out, const map<NiObjectRef,unsigned i
NiKeyframeController::Write( out, link_map, info );
if ( info.version < VER_3_3_0_13 ) {
- NifStream( (unsigned int)&(*data2), out, info );
+ WritePtr32( &(*data2), out );
} else {
if ( data2 != NULL ) {
NifStream( link_map.find( StaticCast<NiObject>(data2) )->second, out, info );
diff --git a/src/obj/BSMasterParticleSystem.cpp b/src/obj/BSMasterParticleSystem.cpp
index a3781d9f107686f31a82f74006eb8a60356d3e11..99433c762d39bb3be18db6f21cdc415bdcd41255 100644
--- a/src/obj/BSMasterParticleSystem.cpp
+++ b/src/obj/BSMasterParticleSystem.cpp
@@ -72,7 +72,7 @@ void BSMasterParticleSystem::Write( ostream& out, const map<NiObjectRef,unsigned
NifStream( numParticleSystems, out, info );
for (unsigned int i1 = 0; i1 < particleSystems.size(); i1++) {
if ( info.version < VER_3_3_0_13 ) {
- NifStream( (unsigned int)&(*particleSystems[i1]), out, info );
+ WritePtr32( &(*particleSystems[i1]), out );
} else {
if ( particleSystems[i1] != NULL ) {
NifStream( link_map.find( StaticCast<NiObject>(particleSystems[i1]) )->second, out, info );
diff --git a/src/obj/BSMultiBound.cpp b/src/obj/BSMultiBound.cpp
index 96bf2d7fdf2ae07c8d4c25a4831ab8ce31acd3fb..9a506cae77f306e2cedad58e2a96dc0cafa38dd6 100644
--- a/src/obj/BSMultiBound.cpp
+++ b/src/obj/BSMultiBound.cpp
@@ -63,7 +63,7 @@ void BSMultiBound::Write( ostream& out, const map<NiObjectRef,unsigned int> & li
NiObject::Write( out, link_map, info );
if ( info.version < VER_3_3_0_13 ) {
- NifStream( (unsigned int)&(*data), out, info );
+ WritePtr32( &(*data), out );
} else {
if ( data != NULL ) {
NifStream( link_map.find( StaticCast<NiObject>(data) )->second, out, info );
diff --git a/src/obj/BSMultiBoundNode.cpp b/src/obj/BSMultiBoundNode.cpp
index c00945029735942838c9c41e803e0a508d4a7cc5..3355b667f16eb2a81f2c4acedac71d9090690615 100644
--- a/src/obj/BSMultiBoundNode.cpp
+++ b/src/obj/BSMultiBoundNode.cpp
@@ -63,7 +63,7 @@ void BSMultiBoundNode::Write( ostream& out, const map<NiObjectRef,unsigned int>
NiNode::Write( out, link_map, info );
if ( info.version < VER_3_3_0_13 ) {
- NifStream( (unsigned int)&(*multiBound), out, info );
+ WritePtr32( &(*multiBound), out );
} else {
if ( multiBound != NULL ) {
NifStream( link_map.find( StaticCast<NiObject>(multiBound) )->second, out, info );
diff --git a/src/obj/BSPSysMultiTargetEmitterCtlr.cpp b/src/obj/BSPSysMultiTargetEmitterCtlr.cpp
index 40960ca51ed60ab045af03fc4da81e2eb8095609..c1f0b00e54a683e8714b0bdcef5303874cbebd5c 100644
--- a/src/obj/BSPSysMultiTargetEmitterCtlr.cpp
+++ b/src/obj/BSPSysMultiTargetEmitterCtlr.cpp
@@ -73,7 +73,7 @@ void BSPSysMultiTargetEmitterCtlr::Write( ostream& out, const map<NiObjectRef,un
NiPSysModifierCtlr::Write( out, link_map, info );
if ( info.version <= 0x0A010000 ) {
if ( info.version < VER_3_3_0_13 ) {
- NifStream( (unsigned int)&(*data), out, info );
+ WritePtr32( &(*data), out );
} else {
if ( data != NULL ) {
NifStream( link_map.find( StaticCast<NiObject>(data) )->second, out, info );
@@ -84,7 +84,7 @@ void BSPSysMultiTargetEmitterCtlr::Write( ostream& out, const map<NiObjectRef,un
};
if ( info.version >= 0x0A020000 ) {
if ( info.version < VER_3_3_0_13 ) {
- NifStream( (unsigned int)&(*visibilityInterpolator), out, info );
+ WritePtr32( &(*visibilityInterpolator), out );
} else {
if ( visibilityInterpolator != NULL ) {
NifStream( link_map.find( StaticCast<NiObject>(visibilityInterpolator) )->second, out, info );
diff --git a/src/obj/BSShaderPPLightingProperty.cpp b/src/obj/BSShaderPPLightingProperty.cpp
index 612fbf69943128e395f6602dc281aa9c0dccfaa1..c768f6fb722614d18a2eb745111ec74637e8e92a 100644
--- a/src/obj/BSShaderPPLightingProperty.cpp
+++ b/src/obj/BSShaderPPLightingProperty.cpp
@@ -71,7 +71,7 @@ void BSShaderPPLightingProperty::Write( ostream& out, const map<NiObjectRef,unsi
BSShaderLightingProperty::Write( out, link_map, info );
if ( info.version < VER_3_3_0_13 ) {
- NifStream( (unsigned int)&(*textureSet), out, info );
+ WritePtr32( &(*textureSet), out );
} else {
if ( textureSet != NULL ) {
NifStream( link_map.find( StaticCast<NiObject>(textureSet) )->second, out, info );
diff --git a/src/obj/FxRadioButton.cpp b/src/obj/FxRadioButton.cpp
index 3c0122f2686881835fcacbc9dfdd7883a729b514..8e5afbc9a4a4b1ef98e014244c1a6b6dc0896246 100644
--- a/src/obj/FxRadioButton.cpp
+++ b/src/obj/FxRadioButton.cpp
@@ -69,7 +69,7 @@ void FxRadioButton::Write( ostream& out, const map<NiObjectRef,unsigned int> & l
NifStream( numButtons, out, info );
for (unsigned int i1 = 0; i1 < buttons.size(); i1++) {
if ( info.version < VER_3_3_0_13 ) {
- NifStream( (unsigned int)&(*buttons[i1]), out, info );
+ WritePtr32( &(*buttons[i1]), out );
} else {
if ( buttons[i1] != NULL ) {
NifStream( link_map.find( StaticCast<NiObject>(buttons[i1]) )->second, out, info );
diff --git a/src/obj/Ni3dsAlphaAnimator.cpp b/src/obj/Ni3dsAlphaAnimator.cpp
index e1caf255341ad1a0ecf9a7951349a22bc6956f03..13bc1c046648971a85a7b7f414655ba1e1821f27 100644
--- a/src/obj/Ni3dsAlphaAnimator.cpp
+++ b/src/obj/Ni3dsAlphaAnimator.cpp
@@ -80,7 +80,7 @@ void Ni3dsAlphaAnimator::Write( ostream& out, const map<NiObjectRef,unsigned int
NifStream( unknown1[i1], out, info );
};
if ( info.version < VER_3_3_0_13 ) {
- NifStream( (unsigned int)&(*parent), out, info );
+ WritePtr32( &(*parent), out );
} else {
if ( parent != NULL ) {
NifStream( link_map.find( StaticCast<NiObject>(parent) )->second, out, info );
diff --git a/src/obj/Ni3dsAnimationNode.cpp b/src/obj/Ni3dsAnimationNode.cpp
index 2024d11b1c405e6944d327d7ae652433f860c110..2ca9c9843024b8cd11f97f3cd2859a501decdd27 100644
--- a/src/obj/Ni3dsAnimationNode.cpp
+++ b/src/obj/Ni3dsAnimationNode.cpp
@@ -87,7 +87,7 @@ void Ni3dsAnimationNode::Write( ostream& out, const map<NiObjectRef,unsigned int
};
NifStream( unknownShort, out, info );
if ( info.version < VER_3_3_0_13 ) {
- NifStream( (unsigned int)&(*child), out, info );
+ WritePtr32( &(*child), out );
} else {
if ( child != NULL ) {
NifStream( link_map.find( StaticCast<NiObject>(child) )->second, out, info );
diff --git a/src/obj/NiAVObject.cpp b/src/obj/NiAVObject.cpp
index bc9805c5fd9d3ba8c74094568425344f4346efbe..2c30e486229b99cd2a977eb25fec8ae683f1ccc9 100644
--- a/src/obj/NiAVObject.cpp
+++ b/src/obj/NiAVObject.cpp
@@ -122,7 +122,7 @@ void NiAVObject::Write( ostream& out, const map<NiObjectRef,unsigned int> & link
NifStream( numProperties, out, info );
for (unsigned int i1 = 0; i1 < properties.size(); i1++) {
if ( info.version < VER_3_3_0_13 ) {
- NifStream( (unsigned int)&(*properties[i1]), out, info );
+ WritePtr32( &(*properties[i1]), out );
} else {
if ( properties[i1] != NULL ) {
NifStream( link_map.find( StaticCast<NiObject>(properties[i1]) )->second, out, info );
@@ -148,7 +148,7 @@ void NiAVObject::Write( ostream& out, const map<NiObjectRef,unsigned int> & link
};
if ( info.version >= 0x0A000100 ) {
if ( info.version < VER_3_3_0_13 ) {
- NifStream( (unsigned int)&(*collisionObject), out, info );
+ WritePtr32( &(*collisionObject), out );
} else {
if ( collisionObject != NULL ) {
NifStream( link_map.find( StaticCast<NiObject>(collisionObject) )->second, out, info );
diff --git a/src/obj/NiAlphaController.cpp b/src/obj/NiAlphaController.cpp
index 5ffc46bd5f5a72d1aa60afaa418fe2e56796472b..e2b0ea26dae1ce3ac40ff6deb64c4c83ca65f3f9 100644
--- a/src/obj/NiAlphaController.cpp
+++ b/src/obj/NiAlphaController.cpp
@@ -61,7 +61,7 @@ void NiAlphaController::Write( ostream& out, const map<NiObjectRef,unsigned int>
NiFloatInterpController::Write( out, link_map, info );
if ( info.version <= 0x0A010000 ) {
if ( info.version < VER_3_3_0_13 ) {
- NifStream( (unsigned int)&(*data), out, info );
+ WritePtr32( &(*data), out );
} else {
if ( data != NULL ) {
NifStream( link_map.find( StaticCast<NiObject>(data) )->second, out, info );
diff --git a/src/obj/NiArkTextureExtraData.cpp b/src/obj/NiArkTextureExtraData.cpp
index 755268cc91700fe21043e23434b43cacadfeb140..3407ada417def7aa6db3b374d97b6c798c675dfe 100644
--- a/src/obj/NiArkTextureExtraData.cpp
+++ b/src/obj/NiArkTextureExtraData.cpp
@@ -94,7 +94,7 @@ void NiArkTextureExtraData::Write( ostream& out, const map<NiObjectRef,unsigned
NifStream( textures[i1].unknownInt3, out, info );
NifStream( textures[i1].unknownInt4, out, info );
if ( info.version < VER_3_3_0_13 ) {
- NifStream( (unsigned int)&(*textures[i1].texturingProperty), out, info );
+ WritePtr32( &(*textures[i1].texturingProperty), out );
} else {
if ( textures[i1].texturingProperty != NULL ) {
NifStream( link_map.find( StaticCast<NiObject>(textures[i1].texturingProperty) )->second, out, info );
diff --git a/src/obj/NiBSplineInterpolator.cpp b/src/obj/NiBSplineInterpolator.cpp
index ba5235b16af62f77e68103f2acbed0545fd9a476..e1664e6ab4185a86969c29d4f6f557f0fb811422 100644
--- a/src/obj/NiBSplineInterpolator.cpp
+++ b/src/obj/NiBSplineInterpolator.cpp
@@ -64,7 +64,7 @@ void NiBSplineInterpolator::Write( ostream& out, const map<NiObjectRef,unsigned
NifStream( startTime, out, info );
NifStream( stopTime, out, info );
if ( info.version < VER_3_3_0_13 ) {
- NifStream( (unsigned int)&(*splineData), out, info );
+ WritePtr32( &(*splineData), out );
} else {
if ( splineData != NULL ) {
NifStream( link_map.find( StaticCast<NiObject>(splineData) )->second, out, info );
@@ -73,7 +73,7 @@ void NiBSplineInterpolator::Write( ostream& out, const map<NiObjectRef,unsigned
}
}
if ( info.version < VER_3_3_0_13 ) {
- NifStream( (unsigned int)&(*basisData), out, info );
+ WritePtr32( &(*basisData), out );
} else {
if ( basisData != NULL ) {
NifStream( link_map.find( StaticCast<NiObject>(basisData) )->second, out, info );
diff --git a/src/obj/NiBezierMesh.cpp b/src/obj/NiBezierMesh.cpp
index 211f4c5f1f7fb30b87351eb4cb7813e2e3aa4acd..0d3f7e00a838e6545649e4e8bbd4dbb978d86f0a 100644
--- a/src/obj/NiBezierMesh.cpp
+++ b/src/obj/NiBezierMesh.cpp
@@ -94,7 +94,7 @@ void NiBezierMesh::Write( ostream& out, const map<NiObjectRef,unsigned int> & li
NifStream( numBezierTriangles, out, info );
for (unsigned int i1 = 0; i1 < bezierTriangle.size(); i1++) {
if ( info.version < VER_3_3_0_13 ) {
- NifStream( (unsigned int)&(*bezierTriangle[i1]), out, info );
+ WritePtr32( &(*bezierTriangle[i1]), out );
} else {
if ( bezierTriangle[i1] != NULL ) {
NifStream( link_map.find( StaticCast<NiObject>(bezierTriangle[i1]) )->second, out, info );
diff --git a/src/obj/NiBinaryVoxelExtraData.cpp b/src/obj/NiBinaryVoxelExtraData.cpp
index 35ac1cd1ad28da9a7091ba6caff6628afce2c62b..635bae78af9a1e765a26d2a9403f8ddb7638b440 100644
--- a/src/obj/NiBinaryVoxelExtraData.cpp
+++ b/src/obj/NiBinaryVoxelExtraData.cpp
@@ -59,7 +59,7 @@ void NiBinaryVoxelExtraData::Write( ostream& out, const map<NiObjectRef,unsigned
NiExtraData::Write( out, link_map, info );
NifStream( unknownInt, out, info );
if ( info.version < VER_3_3_0_13 ) {
- NifStream( (unsigned int)&(*data), out, info );
+ WritePtr32( &(*data), out );
} else {
if ( data != NULL ) {
NifStream( link_map.find( StaticCast<NiObject>(data) )->second, out, info );
diff --git a/src/obj/NiBoneLODController.cpp b/src/obj/NiBoneLODController.cpp
index d54a64774298aaa17435d91acd52493adf01f5ab..d58c063cbf9691af5ea9eaae40b3a198e1bd3cc3 100644
--- a/src/obj/NiBoneLODController.cpp
+++ b/src/obj/NiBoneLODController.cpp
@@ -104,7 +104,7 @@ void NiBoneLODController::Write( ostream& out, const map<NiObjectRef,unsigned in
NifStream( nodeGroups[i1].numNodes, out, info );
for (unsigned int i2 = 0; i2 < nodeGroups[i1].nodes.size(); i2++) {
if ( info.version < VER_3_3_0_13 ) {
- NifStream( (unsigned int)&(*nodeGroups[i1].nodes[i2]), out, info );
+ WritePtr32( &(*nodeGroups[i1].nodes[i2]), out );
} else {
if ( nodeGroups[i1].nodes[i2] != NULL ) {
NifStream( link_map.find( StaticCast<NiObject>(nodeGroups[i1].nodes[i2]) )->second, out, info );
@@ -121,7 +121,7 @@ void NiBoneLODController::Write( ostream& out, const map<NiObjectRef,unsigned in
NifStream( shapeGroups1[i2].numLinkPairs, out, info );
for (unsigned int i3 = 0; i3 < shapeGroups1[i2].linkPairs.size(); i3++) {
if ( info.version < VER_3_3_0_13 ) {
- NifStream( (unsigned int)&(*shapeGroups1[i2].linkPairs[i3].shape), out, info );
+ WritePtr32( &(*shapeGroups1[i2].linkPairs[i3].shape), out );
} else {
if ( shapeGroups1[i2].linkPairs[i3].shape != NULL ) {
NifStream( link_map.find( StaticCast<NiObject>(shapeGroups1[i2].linkPairs[i3].shape) )->second, out, info );
@@ -130,7 +130,7 @@ void NiBoneLODController::Write( ostream& out, const map<NiObjectRef,unsigned in
}
}
if ( info.version < VER_3_3_0_13 ) {
- NifStream( (unsigned int)&(*shapeGroups1[i2].linkPairs[i3].skinInstance), out, info );
+ WritePtr32( &(*shapeGroups1[i2].linkPairs[i3].skinInstance), out );
} else {
if ( shapeGroups1[i2].linkPairs[i3].skinInstance != NULL ) {
NifStream( link_map.find( StaticCast<NiObject>(shapeGroups1[i2].linkPairs[i3].skinInstance) )->second, out, info );
@@ -143,7 +143,7 @@ void NiBoneLODController::Write( ostream& out, const map<NiObjectRef,unsigned in
NifStream( numShapeGroups2, out, info );
for (unsigned int i2 = 0; i2 < shapeGroups2.size(); i2++) {
if ( info.version < VER_3_3_0_13 ) {
- NifStream( (unsigned int)&(*shapeGroups2[i2]), out, info );
+ WritePtr32( &(*shapeGroups2[i2]), out );
} else {
if ( shapeGroups2[i2] != NULL ) {
NifStream( link_map.find( StaticCast<NiObject>(shapeGroups2[i2]) )->second, out, info );
diff --git a/src/obj/NiBoolInterpolator.cpp b/src/obj/NiBoolInterpolator.cpp
index e7317268307cfd1c6a9fe0fadfea94a645a57380..99d484333b325273e384e3f534e83ad73c565e98 100644
--- a/src/obj/NiBoolInterpolator.cpp
+++ b/src/obj/NiBoolInterpolator.cpp
@@ -59,7 +59,7 @@ void NiBoolInterpolator::Write( ostream& out, const map<NiObjectRef,unsigned int
NiKeyBasedInterpolator::Write( out, link_map, info );
NifStream( boolValue, out, info );
if ( info.version < VER_3_3_0_13 ) {
- NifStream( (unsigned int)&(*data), out, info );
+ WritePtr32( &(*data), out );
} else {
if ( data != NULL ) {
NifStream( link_map.find( StaticCast<NiObject>(data) )->second, out, info );
diff --git a/src/obj/NiCamera.cpp b/src/obj/NiCamera.cpp
index 710be2610d6a4836d4f164bf80d2417be9e6308a..71c5b83b79228e40a7b5c7b272a0c6319d9ef1cd 100644
--- a/src/obj/NiCamera.cpp
+++ b/src/obj/NiCamera.cpp
@@ -98,7 +98,7 @@ void NiCamera::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_m
NifStream( viewportBottom, out, info );
NifStream( lodAdjust, out, info );
if ( info.version < VER_3_3_0_13 ) {
- NifStream( (unsigned int)&(*unknownLink), out, info );
+ WritePtr32( &(*unknownLink), out );
} else {
if ( unknownLink != NULL ) {
NifStream( link_map.find( StaticCast<NiObject>(unknownLink) )->second, out, info );
diff --git a/src/obj/NiCollisionObject.cpp b/src/obj/NiCollisionObject.cpp
index ee84d0a54345540dd88e3843ab204348937a9a15..1faa29b5e60a7cbdd6896f95518ab8fd0bd1883e 100644
--- a/src/obj/NiCollisionObject.cpp
+++ b/src/obj/NiCollisionObject.cpp
@@ -57,7 +57,7 @@ void NiCollisionObject::Write( ostream& out, const map<NiObjectRef,unsigned int>
NiObject::Write( out, link_map, info );
if ( info.version < VER_3_3_0_13 ) {
- NifStream( (unsigned int)&(*target), out, info );
+ WritePtr32( &(*target), out );
} else {
if ( target != NULL ) {
NifStream( link_map.find( StaticCast<NiObject>(target) )->second, out, info );
diff --git a/src/obj/NiControllerManager.cpp b/src/obj/NiControllerManager.cpp
index 735d11a8c8233a09c7380e9c0ddf07f6533a57eb..4d8c6a98aa3f0f2177fe174d2b44fb684ff44b74 100644
--- a/src/obj/NiControllerManager.cpp
+++ b/src/obj/NiControllerManager.cpp
@@ -70,7 +70,7 @@ void NiControllerManager::Write( ostream& out, const map<NiObjectRef,unsigned in
NifStream( numControllerSequences, out, info );
for (unsigned int i1 = 0; i1 < controllerSequences.size(); i1++) {
if ( info.version < VER_3_3_0_13 ) {
- NifStream( (unsigned int)&(*controllerSequences[i1]), out, info );
+ WritePtr32( &(*controllerSequences[i1]), out );
} else {
if ( controllerSequences[i1] != NULL ) {
NifStream( link_map.find( StaticCast<NiObject>(controllerSequences[i1]) )->second, out, info );
@@ -80,7 +80,7 @@ void NiControllerManager::Write( ostream& out, const map<NiObjectRef,unsigned in
}
};
if ( info.version < VER_3_3_0_13 ) {
- NifStream( (unsigned int)&(*objectPalette), out, info );
+ WritePtr32( &(*objectPalette), out );
} else {
if ( objectPalette != NULL ) {
NifStream( link_map.find( StaticCast<NiObject>(objectPalette) )->second, out, info );
diff --git a/src/obj/NiControllerSequence.cpp b/src/obj/NiControllerSequence.cpp
index 6863a3b54d526b7e7dc2f3aee74c9428270d8484..4ad5d8f3ee348db9441b7748b13da6dfd29d4783 100644
--- a/src/obj/NiControllerSequence.cpp
+++ b/src/obj/NiControllerSequence.cpp
@@ -103,7 +103,7 @@ void NiControllerSequence::Write( ostream& out, const map<NiObjectRef,unsigned i
if ( info.version >= 0x0A01006A ) {
NifStream( weight, out, info );
if ( info.version < VER_3_3_0_13 ) {
- NifStream( (unsigned int)&(*textKeys), out, info );
+ WritePtr32( &(*textKeys), out );
} else {
if ( textKeys != NULL ) {
NifStream( link_map.find( StaticCast<NiObject>(textKeys) )->second, out, info );
@@ -131,7 +131,7 @@ void NiControllerSequence::Write( ostream& out, const map<NiObjectRef,unsigned i
};
if ( info.version >= 0x0A01006A ) {
if ( info.version < VER_3_3_0_13 ) {
- NifStream( (unsigned int)&(*manager), out, info );
+ WritePtr32( &(*manager), out );
} else {
if ( manager != NULL ) {
NifStream( link_map.find( StaticCast<NiObject>(manager) )->second, out, info );
@@ -143,7 +143,7 @@ void NiControllerSequence::Write( ostream& out, const map<NiObjectRef,unsigned i
};
if ( ( info.version >= 0x0A020000 ) && ( info.version <= 0x14000005 ) ) {
if ( info.version < VER_3_3_0_13 ) {
- NifStream( (unsigned int)&(*stringPalette), out, info );
+ WritePtr32( &(*stringPalette), out );
} else {
if ( stringPalette != NULL ) {
NifStream( link_map.find( StaticCast<NiObject>(stringPalette) )->second, out, info );
diff --git a/src/obj/NiDefaultAVObjectPalette.cpp b/src/obj/NiDefaultAVObjectPalette.cpp
index 933f3a74416ff1cc2ec7daa9b800c89ca4cc557f..dd3cf5649135474a2ed9acb8ec45a7b89a598673 100644
--- a/src/obj/NiDefaultAVObjectPalette.cpp
+++ b/src/obj/NiDefaultAVObjectPalette.cpp
@@ -69,7 +69,7 @@ void NiDefaultAVObjectPalette::Write( ostream& out, const map<NiObjectRef,unsign
for (unsigned int i1 = 0; i1 < objs.size(); i1++) {
NifStream( objs[i1].name, out, info );
if ( info.version < VER_3_3_0_13 ) {
- NifStream( (unsigned int)&(*objs[i1].avObject), out, info );
+ WritePtr32( &(*objs[i1].avObject), out );
} else {
if ( objs[i1].avObject != NULL ) {
NifStream( link_map.find( StaticCast<NiObject>(objs[i1].avObject) )->second, out, info );
diff --git a/src/obj/NiDynamicEffect.cpp b/src/obj/NiDynamicEffect.cpp
index 3c8bc2aa454fccb221f4310d0ad60884bdcbdfa1..d8b05b2d9bfc5c8bb7989096510b9ac1621dcd0d 100644
--- a/src/obj/NiDynamicEffect.cpp
+++ b/src/obj/NiDynamicEffect.cpp
@@ -95,7 +95,7 @@ void NiDynamicEffect::Write( ostream& out, const map<NiObjectRef,unsigned int> &
if ( info.version >= 0x0A010000 ) {
for (unsigned int i2 = 0; i2 < affectedNodes.size(); i2++) {
if ( info.version < VER_3_3_0_13 ) {
- NifStream( (unsigned int)&(*affectedNodes[i2]), out, info );
+ WritePtr32( &(*affectedNodes[i2]), out );
} else {
if ( affectedNodes[i2] != NULL ) {
NifStream( link_map.find( StaticCast<NiObject>(affectedNodes[i2]) )->second, out, info );
diff --git a/src/obj/NiEnvMappedTriShape.cpp b/src/obj/NiEnvMappedTriShape.cpp
index 6556c76849c04f5d0abe7d45ecd112e62f123929..ba83aa10988c18eff3651e32f443593c650e95b8 100644
--- a/src/obj/NiEnvMappedTriShape.cpp
+++ b/src/obj/NiEnvMappedTriShape.cpp
@@ -79,7 +79,7 @@ void NiEnvMappedTriShape::Write( ostream& out, const map<NiObjectRef,unsigned in
NifStream( numChildren, out, info );
for (unsigned int i1 = 0; i1 < children.size(); i1++) {
if ( info.version < VER_3_3_0_13 ) {
- NifStream( (unsigned int)&(*children[i1]), out, info );
+ WritePtr32( &(*children[i1]), out );
} else {
if ( children[i1] != NULL ) {
NifStream( link_map.find( StaticCast<NiObject>(children[i1]) )->second, out, info );
@@ -89,7 +89,7 @@ void NiEnvMappedTriShape::Write( ostream& out, const map<NiObjectRef,unsigned in
}
};
if ( info.version < VER_3_3_0_13 ) {
- NifStream( (unsigned int)&(*child2), out, info );
+ WritePtr32( &(*child2), out );
} else {
if ( child2 != NULL ) {
NifStream( link_map.find( StaticCast<NiObject>(child2) )->second, out, info );
@@ -98,7 +98,7 @@ void NiEnvMappedTriShape::Write( ostream& out, const map<NiObjectRef,unsigned in
}
}
if ( info.version < VER_3_3_0_13 ) {
- NifStream( (unsigned int)&(*child3), out, info );
+ WritePtr32( &(*child3), out );
} else {
if ( child3 != NULL ) {
NifStream( link_map.find( StaticCast<NiObject>(child3) )->second, out, info );
diff --git a/src/obj/NiExtraData.cpp b/src/obj/NiExtraData.cpp
index cbc82af072ba0f452897feb8bd357eda1683a83b..ce782b4bbf8ee9936c61047d35e5b22e08e0f3fb 100644
--- a/src/obj/NiExtraData.cpp
+++ b/src/obj/NiExtraData.cpp
@@ -65,7 +65,7 @@ void NiExtraData::Write( ostream& out, const map<NiObjectRef,unsigned int> & lin
};
if ( info.version <= 0x04020200 ) {
if ( info.version < VER_3_3_0_13 ) {
- NifStream( (unsigned int)&(*nextExtraData), out, info );
+ WritePtr32( &(*nextExtraData), out );
} else {
if ( nextExtraData != NULL ) {
NifStream( link_map.find( StaticCast<NiObject>(nextExtraData) )->second, out, info );
diff --git a/src/obj/NiFlipController.cpp b/src/obj/NiFlipController.cpp
index ddb0dd7ba12d50f3fb01043eb0ac16462508879c..cc6ef9430e806e7bd81ee302a00ea66d7cf64226 100644
--- a/src/obj/NiFlipController.cpp
+++ b/src/obj/NiFlipController.cpp
@@ -89,7 +89,7 @@ void NiFlipController::Write( ostream& out, const map<NiObjectRef,unsigned int>
if ( info.version >= 0x04000000 ) {
for (unsigned int i2 = 0; i2 < sources.size(); i2++) {
if ( info.version < VER_3_3_0_13 ) {
- NifStream( (unsigned int)&(*sources[i2]), out, info );
+ WritePtr32( &(*sources[i2]), out );
} else {
if ( sources[i2] != NULL ) {
NifStream( link_map.find( StaticCast<NiObject>(sources[i2]) )->second, out, info );
@@ -102,7 +102,7 @@ void NiFlipController::Write( ostream& out, const map<NiObjectRef,unsigned int>
if ( info.version <= 0x03010000 ) {
for (unsigned int i2 = 0; i2 < images.size(); i2++) {
if ( info.version < VER_3_3_0_13 ) {
- NifStream( (unsigned int)&(*images[i2]), out, info );
+ WritePtr32( &(*images[i2]), out );
} else {
if ( images[i2] != NULL ) {
NifStream( link_map.find( StaticCast<NiObject>(images[i2]) )->second, out, info );
diff --git a/src/obj/NiFloatInterpolator.cpp b/src/obj/NiFloatInterpolator.cpp
index 3cb211c3a1d8895ca5a5083e1e8d32ff6d14b1a7..bfe9b97f45b6cd2553691590a61867f60058b1d6 100644
--- a/src/obj/NiFloatInterpolator.cpp
+++ b/src/obj/NiFloatInterpolator.cpp
@@ -59,7 +59,7 @@ void NiFloatInterpolator::Write( ostream& out, const map<NiObjectRef,unsigned in
NiKeyBasedInterpolator::Write( out, link_map, info );
NifStream( floatValue, out, info );
if ( info.version < VER_3_3_0_13 ) {
- NifStream( (unsigned int)&(*data), out, info );
+ WritePtr32( &(*data), out );
} else {
if ( data != NULL ) {
NifStream( link_map.find( StaticCast<NiObject>(data) )->second, out, info );
diff --git a/src/obj/NiGeomMorpherController.cpp b/src/obj/NiGeomMorpherController.cpp
index 07a2dbe098add41368bd4f6150722e1ca22326df..6be8420c1885be3d5e1ab9f4b72b69e80e5a1cb1 100644
--- a/src/obj/NiGeomMorpherController.cpp
+++ b/src/obj/NiGeomMorpherController.cpp
@@ -119,7 +119,7 @@ void NiGeomMorpherController::Write( ostream& out, const map<NiObjectRef,unsigne
NifStream( unknown2, out, info );
};
if ( info.version < VER_3_3_0_13 ) {
- NifStream( (unsigned int)&(*data), out, info );
+ WritePtr32( &(*data), out );
} else {
if ( data != NULL ) {
NifStream( link_map.find( StaticCast<NiObject>(data) )->second, out, info );
@@ -134,7 +134,7 @@ void NiGeomMorpherController::Write( ostream& out, const map<NiObjectRef,unsigne
if ( ( info.version >= 0x0A01006A ) && ( info.version <= 0x14020006 ) ) {
for (unsigned int i2 = 0; i2 < interpolators.size(); i2++) {
if ( info.version < VER_3_3_0_13 ) {
- NifStream( (unsigned int)&(*interpolators[i2]), out, info );
+ WritePtr32( &(*interpolators[i2]), out );
} else {
if ( interpolators[i2] != NULL ) {
NifStream( link_map.find( StaticCast<NiObject>(interpolators[i2]) )->second, out, info );
@@ -147,7 +147,7 @@ void NiGeomMorpherController::Write( ostream& out, const map<NiObjectRef,unsigne
if ( info.version >= 0x14020007 ) {
for (unsigned int i2 = 0; i2 < interpolatorWeights.size(); i2++) {
if ( info.version < VER_3_3_0_13 ) {
- NifStream( (unsigned int)&(*interpolatorWeights[i2].interpolator), out, info );
+ WritePtr32( &(*interpolatorWeights[i2].interpolator), out );
} else {
if ( interpolatorWeights[i2].interpolator != NULL ) {
NifStream( link_map.find( StaticCast<NiObject>(interpolatorWeights[i2].interpolator) )->second, out, info );
diff --git a/src/obj/NiGeometry.cpp b/src/obj/NiGeometry.cpp
index 596d47b654da195655760f101fab8359b384d2a0..38d673774eb993aa35902b42e12fa728adbf93e1 100644
--- a/src/obj/NiGeometry.cpp
+++ b/src/obj/NiGeometry.cpp
@@ -94,7 +94,7 @@ void NiGeometry::Write( ostream& out, const map<NiObjectRef,unsigned int> & link
NiAVObject::Write( out, link_map, info );
numMaterials = (unsigned int)(materialName.size());
if ( info.version < VER_3_3_0_13 ) {
- NifStream( (unsigned int)&(*data), out, info );
+ WritePtr32( &(*data), out );
} else {
if ( data != NULL ) {
NifStream( link_map.find( StaticCast<NiObject>(data) )->second, out, info );
@@ -104,7 +104,7 @@ void NiGeometry::Write( ostream& out, const map<NiObjectRef,unsigned int> & link
}
if ( info.version >= 0x0303000D ) {
if ( info.version < VER_3_3_0_13 ) {
- NifStream( (unsigned int)&(*skinInstance), out, info );
+ WritePtr32( &(*skinInstance), out );
} else {
if ( skinInstance != NULL ) {
NifStream( link_map.find( StaticCast<NiObject>(skinInstance) )->second, out, info );
diff --git a/src/obj/NiGeometryData.cpp b/src/obj/NiGeometryData.cpp
index 71868796ed6f9a4d652e2061b6d45a2264afb6cd..410a549f0921ecac0127e48cac6798e5ef7bd519 100644
--- a/src/obj/NiGeometryData.cpp
+++ b/src/obj/NiGeometryData.cpp
@@ -203,7 +203,7 @@ void NiGeometryData::Write( ostream& out, const map<NiObjectRef,unsigned int> &
};
if ( info.version >= 0x14000004 ) {
if ( info.version < VER_3_3_0_13 ) {
- NifStream( (unsigned int)&(*additionalData), out, info );
+ WritePtr32( &(*additionalData), out );
} else {
if ( additionalData != NULL ) {
NifStream( link_map.find( StaticCast<NiObject>(additionalData) )->second, out, info );
diff --git a/src/obj/NiImage.cpp b/src/obj/NiImage.cpp
index ce0b505585d01d06ffe5be360ef3bb100dd12f0b..f46bea2ca9a03c0b895b7f38cc356a79ec9a87a5 100644
--- a/src/obj/NiImage.cpp
+++ b/src/obj/NiImage.cpp
@@ -72,7 +72,7 @@ void NiImage::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_ma
};
if ( (external == 0) ) {
if ( info.version < VER_3_3_0_13 ) {
- NifStream( (unsigned int)&(*imageData), out, info );
+ WritePtr32( &(*imageData), out );
} else {
if ( imageData != NULL ) {
NifStream( link_map.find( StaticCast<NiObject>(imageData) )->second, out, info );
diff --git a/src/obj/NiKeyframeController.cpp b/src/obj/NiKeyframeController.cpp
index 0c8c4f78e1eca4e2aeb34b566e61514562c09d4b..6ad646290fc034e0bfe5830190d15019d85cf7c3 100644
--- a/src/obj/NiKeyframeController.cpp
+++ b/src/obj/NiKeyframeController.cpp
@@ -60,7 +60,7 @@ void NiKeyframeController::Write( ostream& out, const map<NiObjectRef,unsigned i
NiSingleInterpController::Write( out, link_map, info );
if ( info.version <= 0x0A010000 ) {
if ( info.version < VER_3_3_0_13 ) {
- NifStream( (unsigned int)&(*data), out, info );
+ WritePtr32( &(*data), out );
} else {
if ( data != NULL ) {
NifStream( link_map.find( StaticCast<NiObject>(data) )->second, out, info );
diff --git a/src/obj/NiLODNode.cpp b/src/obj/NiLODNode.cpp
index 0d55b2f10689924da0c17a5699d3ffc4de7253ca..f5390a6825574225e4eebee42ce42813816bd5ab 100644
--- a/src/obj/NiLODNode.cpp
+++ b/src/obj/NiLODNode.cpp
@@ -93,7 +93,7 @@ void NiLODNode::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_
};
if ( info.version >= 0x0A010000 ) {
if ( info.version < VER_3_3_0_13 ) {
- NifStream( (unsigned int)&(*lodLevelData), out, info );
+ WritePtr32( &(*lodLevelData), out );
} else {
if ( lodLevelData != NULL ) {
NifStream( link_map.find( StaticCast<NiObject>(lodLevelData) )->second, out, info );
diff --git a/src/obj/NiLookAtController.cpp b/src/obj/NiLookAtController.cpp
index 018e5f52974dbb8be74e8692a39fe052f3864f25..36a33b764ec67c71266321564c4cfda9facc4910 100644
--- a/src/obj/NiLookAtController.cpp
+++ b/src/obj/NiLookAtController.cpp
@@ -63,7 +63,7 @@ void NiLookAtController::Write( ostream& out, const map<NiObjectRef,unsigned int
NifStream( unknown1, out, info );
};
if ( info.version < VER_3_3_0_13 ) {
- NifStream( (unsigned int)&(*lookAtNode), out, info );
+ WritePtr32( &(*lookAtNode), out );
} else {
if ( lookAtNode != NULL ) {
NifStream( link_map.find( StaticCast<NiObject>(lookAtNode) )->second, out, info );
diff --git a/src/obj/NiLookAtInterpolator.cpp b/src/obj/NiLookAtInterpolator.cpp
index de593be1a649ad6fe52fed2b9465faced19efc2e..d2fdae59e712af8dc1bf8c75253d73609b2505f0 100644
--- a/src/obj/NiLookAtInterpolator.cpp
+++ b/src/obj/NiLookAtInterpolator.cpp
@@ -71,7 +71,7 @@ void NiLookAtInterpolator::Write( ostream& out, const map<NiObjectRef,unsigned i
NiInterpolator::Write( out, link_map, info );
NifStream( unknownShort, out, info );
if ( info.version < VER_3_3_0_13 ) {
- NifStream( (unsigned int)&(*lookAt), out, info );
+ WritePtr32( &(*lookAt), out );
} else {
if ( lookAt != NULL ) {
NifStream( link_map.find( StaticCast<NiObject>(lookAt) )->second, out, info );
@@ -84,7 +84,7 @@ void NiLookAtInterpolator::Write( ostream& out, const map<NiObjectRef,unsigned i
NifStream( rotation, out, info );
NifStream( scale, out, info );
if ( info.version < VER_3_3_0_13 ) {
- NifStream( (unsigned int)&(*unknownLink1), out, info );
+ WritePtr32( &(*unknownLink1), out );
} else {
if ( unknownLink1 != NULL ) {
NifStream( link_map.find( StaticCast<NiObject>(unknownLink1) )->second, out, info );
@@ -93,7 +93,7 @@ void NiLookAtInterpolator::Write( ostream& out, const map<NiObjectRef,unsigned i
}
}
if ( info.version < VER_3_3_0_13 ) {
- NifStream( (unsigned int)&(*unknownLink2), out, info );
+ WritePtr32( &(*unknownLink2), out );
} else {
if ( unknownLink2 != NULL ) {
NifStream( link_map.find( StaticCast<NiObject>(unknownLink2) )->second, out, info );
@@ -102,7 +102,7 @@ void NiLookAtInterpolator::Write( ostream& out, const map<NiObjectRef,unsigned i
}
}
if ( info.version < VER_3_3_0_13 ) {
- NifStream( (unsigned int)&(*unknownLink3), out, info );
+ WritePtr32( &(*unknownLink3), out );
} else {
if ( unknownLink3 != NULL ) {
NifStream( link_map.find( StaticCast<NiObject>(unknownLink3) )->second, out, info );
diff --git a/src/obj/NiMeshPSysData.cpp b/src/obj/NiMeshPSysData.cpp
index 0a37c35a36bde7da2e80de34065cbca47b43f05f..3a5afe99ffb0b5267d61fa3dd16276c84fb3e7bf 100644
--- a/src/obj/NiMeshPSysData.cpp
+++ b/src/obj/NiMeshPSysData.cpp
@@ -75,7 +75,7 @@ void NiMeshPSysData::Write( ostream& out, const map<NiObjectRef,unsigned int> &
};
};
if ( info.version < VER_3_3_0_13 ) {
- NifStream( (unsigned int)&(*unknownNode), out, info );
+ WritePtr32( &(*unknownNode), out );
} else {
if ( unknownNode != NULL ) {
NifStream( link_map.find( StaticCast<NiObject>(unknownNode) )->second, out, info );
diff --git a/src/obj/NiMorpherController.cpp b/src/obj/NiMorpherController.cpp
index 6bd6569b188e34f81d435a645457ba482c339eff..8301877c123cc11dacc6d7696a3b56037bb83a39 100644
--- a/src/obj/NiMorpherController.cpp
+++ b/src/obj/NiMorpherController.cpp
@@ -63,7 +63,7 @@ void NiMorpherController::Write( ostream& out, const map<NiObjectRef,unsigned in
NiInterpController::Write( out, link_map, info );
if ( info.version < VER_3_3_0_13 ) {
- NifStream( (unsigned int)&(*data), out, info );
+ WritePtr32( &(*data), out );
} else {
if ( data != NULL ) {
NifStream( link_map.find( StaticCast<NiObject>(data) )->second, out, info );
diff --git a/src/obj/NiMultiTargetTransformController.cpp b/src/obj/NiMultiTargetTransformController.cpp
index 1daceba70092db9481e7b6c5127e2710b55038cf..438ce64a30272fe30a7ccb2ef2c19d4ed76332ae 100644
--- a/src/obj/NiMultiTargetTransformController.cpp
+++ b/src/obj/NiMultiTargetTransformController.cpp
@@ -65,7 +65,7 @@ void NiMultiTargetTransformController::Write( ostream& out, const map<NiObjectRe
NifStream( numExtraTargets, out, info );
for (unsigned int i1 = 0; i1 < extraTargets.size(); i1++) {
if ( info.version < VER_3_3_0_13 ) {
- NifStream( (unsigned int)&(*extraTargets[i1]), out, info );
+ WritePtr32( &(*extraTargets[i1]), out );
} else {
if ( extraTargets[i1] != NULL ) {
NifStream( link_map.find( StaticCast<NiObject>(extraTargets[i1]) )->second, out, info );
diff --git a/src/obj/NiMultiTextureProperty.cpp b/src/obj/NiMultiTextureProperty.cpp
index df34746aae44a40e521b6206d06086b86924770a..174343c56dbad631c3e8387887ef9ae6ea31f6b4 100644
--- a/src/obj/NiMultiTextureProperty.cpp
+++ b/src/obj/NiMultiTextureProperty.cpp
@@ -84,7 +84,7 @@ void NiMultiTextureProperty::Write( ostream& out, const map<NiObjectRef,unsigned
NifStream( textureElements[i1].hasImage, out, info );
if ( textureElements[i1].hasImage ) {
if ( info.version < VER_3_3_0_13 ) {
- NifStream( (unsigned int)&(*textureElements[i1].image), out, info );
+ WritePtr32( &(*textureElements[i1].image), out );
} else {
if ( textureElements[i1].image != NULL ) {
NifStream( link_map.find( StaticCast<NiObject>(textureElements[i1].image) )->second, out, info );
diff --git a/src/obj/NiNode.cpp b/src/obj/NiNode.cpp
index f615597dd174a5814e4116ffc35fc8ea77f67736..8b134e09151a750a5b9204591e9f5cd5f095f1c3 100644
--- a/src/obj/NiNode.cpp
+++ b/src/obj/NiNode.cpp
@@ -88,7 +88,7 @@ void NiNode::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map
NifStream( numChildren, out, info );
for (unsigned int i1 = 0; i1 < children.size(); i1++) {
if ( info.version < VER_3_3_0_13 ) {
- NifStream( (unsigned int)&(*children[i1]), out, info );
+ WritePtr32( &(*children[i1]), out );
} else {
if ( children[i1] != NULL ) {
NifStream( link_map.find( StaticCast<NiObject>(children[i1]) )->second, out, info );
@@ -100,7 +100,7 @@ void NiNode::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map
NifStream( numEffects, out, info );
for (unsigned int i1 = 0; i1 < effects.size(); i1++) {
if ( info.version < VER_3_3_0_13 ) {
- NifStream( (unsigned int)&(*effects[i1]), out, info );
+ WritePtr32( &(*effects[i1]), out );
} else {
if ( effects[i1] != NULL ) {
NifStream( link_map.find( StaticCast<NiObject>(effects[i1]) )->second, out, info );
diff --git a/src/obj/NiObjectNET.cpp b/src/obj/NiObjectNET.cpp
index 63bff6648dc0bf60d0db72bc35f376bf7eeb6772..a5258590bc8c9d6f3ade522d8c4cc0d7d437c848 100644
--- a/src/obj/NiObjectNET.cpp
+++ b/src/obj/NiObjectNET.cpp
@@ -99,7 +99,7 @@ void NiObjectNET::Write( ostream& out, const map<NiObjectRef,unsigned int> & lin
};
if ( ( info.version >= 0x03000000 ) && ( info.version <= 0x04020200 ) ) {
if ( info.version < VER_3_3_0_13 ) {
- NifStream( (unsigned int)&(*extraData), out, info );
+ WritePtr32( &(*extraData), out );
} else {
if ( extraData != NULL ) {
NifStream( link_map.find( StaticCast<NiObject>(extraData) )->second, out, info );
@@ -112,7 +112,7 @@ void NiObjectNET::Write( ostream& out, const map<NiObjectRef,unsigned int> & lin
NifStream( numExtraDataList, out, info );
for (unsigned int i2 = 0; i2 < extraDataList.size(); i2++) {
if ( info.version < VER_3_3_0_13 ) {
- NifStream( (unsigned int)&(*extraDataList[i2]), out, info );
+ WritePtr32( &(*extraDataList[i2]), out );
} else {
if ( extraDataList[i2] != NULL ) {
NifStream( link_map.find( StaticCast<NiObject>(extraDataList[i2]) )->second, out, info );
@@ -124,7 +124,7 @@ void NiObjectNET::Write( ostream& out, const map<NiObjectRef,unsigned int> & lin
};
if ( info.version >= 0x03000000 ) {
if ( info.version < VER_3_3_0_13 ) {
- NifStream( (unsigned int)&(*controller), out, info );
+ WritePtr32( &(*controller), out );
} else {
if ( controller != NULL ) {
NifStream( link_map.find( StaticCast<NiObject>(controller) )->second, out, info );
diff --git a/src/obj/NiPSysAgeDeathModifier.cpp b/src/obj/NiPSysAgeDeathModifier.cpp
index 0580ecd3988cba2cb938c7c5b84376f34672ec13..e154697cbefbadb0288ce72b7b07f3095c294f46 100644
--- a/src/obj/NiPSysAgeDeathModifier.cpp
+++ b/src/obj/NiPSysAgeDeathModifier.cpp
@@ -59,7 +59,7 @@ void NiPSysAgeDeathModifier::Write( ostream& out, const map<NiObjectRef,unsigned
NiPSysModifier::Write( out, link_map, info );
NifStream( spawnOnDeath, out, info );
if ( info.version < VER_3_3_0_13 ) {
- NifStream( (unsigned int)&(*spawnModifier), out, info );
+ WritePtr32( &(*spawnModifier), out );
} else {
if ( spawnModifier != NULL ) {
NifStream( link_map.find( StaticCast<NiObject>(spawnModifier) )->second, out, info );
diff --git a/src/obj/NiPSysBombModifier.cpp b/src/obj/NiPSysBombModifier.cpp
index d50920e9f99f4742187e1ad55eed790d0938ca7f..b169f346f6abef69b5b618ac388d992f247304d8 100644
--- a/src/obj/NiPSysBombModifier.cpp
+++ b/src/obj/NiPSysBombModifier.cpp
@@ -62,7 +62,7 @@ void NiPSysBombModifier::Write( ostream& out, const map<NiObjectRef,unsigned int
NiPSysModifier::Write( out, link_map, info );
if ( info.version < VER_3_3_0_13 ) {
- NifStream( (unsigned int)&(*bombObject), out, info );
+ WritePtr32( &(*bombObject), out );
} else {
if ( bombObject != NULL ) {
NifStream( link_map.find( StaticCast<NiObject>(bombObject) )->second, out, info );
diff --git a/src/obj/NiPSysCollider.cpp b/src/obj/NiPSysCollider.cpp
index c8ee60962925a141c8084fa844a9aad95b36686d..cf88ff115a85b50d6b1ba393d845ed41eb6b01f3 100644
--- a/src/obj/NiPSysCollider.cpp
+++ b/src/obj/NiPSysCollider.cpp
@@ -71,7 +71,7 @@ void NiPSysCollider::Write( ostream& out, const map<NiObjectRef,unsigned int> &
NifStream( spawnOnCollide, out, info );
NifStream( dieOnCollide, out, info );
if ( info.version < VER_3_3_0_13 ) {
- NifStream( (unsigned int)&(*spawnModifier), out, info );
+ WritePtr32( &(*spawnModifier), out );
} else {
if ( spawnModifier != NULL ) {
NifStream( link_map.find( StaticCast<NiObject>(spawnModifier) )->second, out, info );
@@ -80,7 +80,7 @@ void NiPSysCollider::Write( ostream& out, const map<NiObjectRef,unsigned int> &
}
}
if ( info.version < VER_3_3_0_13 ) {
- NifStream( (unsigned int)&(*parent), out, info );
+ WritePtr32( &(*parent), out );
} else {
if ( parent != NULL ) {
NifStream( link_map.find( StaticCast<NiObject>(parent) )->second, out, info );
@@ -89,7 +89,7 @@ void NiPSysCollider::Write( ostream& out, const map<NiObjectRef,unsigned int> &
}
}
if ( info.version < VER_3_3_0_13 ) {
- NifStream( (unsigned int)&(*nextCollider), out, info );
+ WritePtr32( &(*nextCollider), out );
} else {
if ( nextCollider != NULL ) {
NifStream( link_map.find( StaticCast<NiObject>(nextCollider) )->second, out, info );
@@ -98,7 +98,7 @@ void NiPSysCollider::Write( ostream& out, const map<NiObjectRef,unsigned int> &
}
}
if ( info.version < VER_3_3_0_13 ) {
- NifStream( (unsigned int)&(*colliderObject), out, info );
+ WritePtr32( &(*colliderObject), out );
} else {
if ( colliderObject != NULL ) {
NifStream( link_map.find( StaticCast<NiObject>(colliderObject) )->second, out, info );
diff --git a/src/obj/NiPSysColliderManager.cpp b/src/obj/NiPSysColliderManager.cpp
index 053cc6119049dd89706595d1afee769a96779a0c..f98c95b7d3082a7dde642dfc75c6709801db707c 100644
--- a/src/obj/NiPSysColliderManager.cpp
+++ b/src/obj/NiPSysColliderManager.cpp
@@ -57,7 +57,7 @@ void NiPSysColliderManager::Write( ostream& out, const map<NiObjectRef,unsigned
NiPSysModifier::Write( out, link_map, info );
if ( info.version < VER_3_3_0_13 ) {
- NifStream( (unsigned int)&(*collider), out, info );
+ WritePtr32( &(*collider), out );
} else {
if ( collider != NULL ) {
NifStream( link_map.find( StaticCast<NiObject>(collider) )->second, out, info );
diff --git a/src/obj/NiPSysColorModifier.cpp b/src/obj/NiPSysColorModifier.cpp
index e674f39cdc0d610d24fa187e633a3bd3b425073d..a07c63c2f523ef9ef8059aa528b4dfd7265fd9e9 100644
--- a/src/obj/NiPSysColorModifier.cpp
+++ b/src/obj/NiPSysColorModifier.cpp
@@ -57,7 +57,7 @@ void NiPSysColorModifier::Write( ostream& out, const map<NiObjectRef,unsigned in
NiPSysModifier::Write( out, link_map, info );
if ( info.version < VER_3_3_0_13 ) {
- NifStream( (unsigned int)&(*data), out, info );
+ WritePtr32( &(*data), out );
} else {
if ( data != NULL ) {
NifStream( link_map.find( StaticCast<NiObject>(data) )->second, out, info );
diff --git a/src/obj/NiPSysDragModifier.cpp b/src/obj/NiPSysDragModifier.cpp
index 1fd8e0b7a9843cc980d8399686a1842a701e7038..67e7cf4d9df5d0a28deb516d2685b5b071225365 100644
--- a/src/obj/NiPSysDragModifier.cpp
+++ b/src/obj/NiPSysDragModifier.cpp
@@ -61,7 +61,7 @@ void NiPSysDragModifier::Write( ostream& out, const map<NiObjectRef,unsigned int
NiPSysModifier::Write( out, link_map, info );
if ( info.version < VER_3_3_0_13 ) {
- NifStream( (unsigned int)&(*parent), out, info );
+ WritePtr32( &(*parent), out );
} else {
if ( parent != NULL ) {
NifStream( link_map.find( StaticCast<NiObject>(parent) )->second, out, info );
diff --git a/src/obj/NiPSysEmitterCtlr.cpp b/src/obj/NiPSysEmitterCtlr.cpp
index c28a6d1a55725e6a87326f13533fc8198b93a198..8d74114233786c2418b4ef5d84c205631afc4b6d 100644
--- a/src/obj/NiPSysEmitterCtlr.cpp
+++ b/src/obj/NiPSysEmitterCtlr.cpp
@@ -65,7 +65,7 @@ void NiPSysEmitterCtlr::Write( ostream& out, const map<NiObjectRef,unsigned int>
NiPSysModifierCtlr::Write( out, link_map, info );
if ( info.version <= 0x0A010000 ) {
if ( info.version < VER_3_3_0_13 ) {
- NifStream( (unsigned int)&(*data), out, info );
+ WritePtr32( &(*data), out );
} else {
if ( data != NULL ) {
NifStream( link_map.find( StaticCast<NiObject>(data) )->second, out, info );
@@ -76,7 +76,7 @@ void NiPSysEmitterCtlr::Write( ostream& out, const map<NiObjectRef,unsigned int>
};
if ( info.version >= 0x0A020000 ) {
if ( info.version < VER_3_3_0_13 ) {
- NifStream( (unsigned int)&(*visibilityInterpolator), out, info );
+ WritePtr32( &(*visibilityInterpolator), out );
} else {
if ( visibilityInterpolator != NULL ) {
NifStream( link_map.find( StaticCast<NiObject>(visibilityInterpolator) )->second, out, info );
diff --git a/src/obj/NiPSysFieldModifier.cpp b/src/obj/NiPSysFieldModifier.cpp
index 78063f45cb661f3fb41fb0b012ca56efbbc581ba..31d03f7d05a9d9bda86a4dd63847cb0608b47ff1 100644
--- a/src/obj/NiPSysFieldModifier.cpp
+++ b/src/obj/NiPSysFieldModifier.cpp
@@ -67,7 +67,7 @@ void NiPSysFieldModifier::Write( ostream& out, const map<NiObjectRef,unsigned in
NiPSysModifier::Write( out, link_map, info );
if ( info.version < VER_3_3_0_13 ) {
- NifStream( (unsigned int)&(*fieldObject), out, info );
+ WritePtr32( &(*fieldObject), out );
} else {
if ( fieldObject != NULL ) {
NifStream( link_map.find( StaticCast<NiObject>(fieldObject) )->second, out, info );
diff --git a/src/obj/NiPSysGravityModifier.cpp b/src/obj/NiPSysGravityModifier.cpp
index ec936e0653bfbc42c0261a75f24591d6f22b69cf..7ae2420a73f0a81ba978438b3cc88d22d82f0a2e 100644
--- a/src/obj/NiPSysGravityModifier.cpp
+++ b/src/obj/NiPSysGravityModifier.cpp
@@ -66,7 +66,7 @@ void NiPSysGravityModifier::Write( ostream& out, const map<NiObjectRef,unsigned
NiPSysModifier::Write( out, link_map, info );
if ( info.version < VER_3_3_0_13 ) {
- NifStream( (unsigned int)&(*gravityObject), out, info );
+ WritePtr32( &(*gravityObject), out );
} else {
if ( gravityObject != NULL ) {
NifStream( link_map.find( StaticCast<NiObject>(gravityObject) )->second, out, info );
diff --git a/src/obj/NiPSysMeshEmitter.cpp b/src/obj/NiPSysMeshEmitter.cpp
index 2bde08394f1009824b7516aa404e04b9e148c93b..ec4e738e725f8b89ed3e8c04c27cf19aed67c8b8 100644
--- a/src/obj/NiPSysMeshEmitter.cpp
+++ b/src/obj/NiPSysMeshEmitter.cpp
@@ -67,7 +67,7 @@ void NiPSysMeshEmitter::Write( ostream& out, const map<NiObjectRef,unsigned int>
NifStream( numEmitterMeshes, out, info );
for (unsigned int i1 = 0; i1 < emitterMeshes.size(); i1++) {
if ( info.version < VER_3_3_0_13 ) {
- NifStream( (unsigned int)&(*emitterMeshes[i1]), out, info );
+ WritePtr32( &(*emitterMeshes[i1]), out );
} else {
if ( emitterMeshes[i1] != NULL ) {
NifStream( link_map.find( StaticCast<NiObject>(emitterMeshes[i1]) )->second, out, info );
diff --git a/src/obj/NiPSysMeshUpdateModifier.cpp b/src/obj/NiPSysMeshUpdateModifier.cpp
index edd51c7ae516b504fdd3e439dcebfc915051d6a0..01356c8a5b86f930896df16ff99a46eff1a54b1e 100644
--- a/src/obj/NiPSysMeshUpdateModifier.cpp
+++ b/src/obj/NiPSysMeshUpdateModifier.cpp
@@ -64,7 +64,7 @@ void NiPSysMeshUpdateModifier::Write( ostream& out, const map<NiObjectRef,unsign
NifStream( numMeshes, out, info );
for (unsigned int i1 = 0; i1 < meshes.size(); i1++) {
if ( info.version < VER_3_3_0_13 ) {
- NifStream( (unsigned int)&(*meshes[i1]), out, info );
+ WritePtr32( &(*meshes[i1]), out );
} else {
if ( meshes[i1] != NULL ) {
NifStream( link_map.find( StaticCast<NiObject>(meshes[i1]) )->second, out, info );
diff --git a/src/obj/NiPSysModifier.cpp b/src/obj/NiPSysModifier.cpp
index 7353b09626510b754ce05904169f80ac6ce3ff1f..cc91f987a8b45ed8ba4580298a1ecb8dbc7ed3ce 100644
--- a/src/obj/NiPSysModifier.cpp
+++ b/src/obj/NiPSysModifier.cpp
@@ -62,7 +62,7 @@ void NiPSysModifier::Write( ostream& out, const map<NiObjectRef,unsigned int> &
NifStream( name, out, info );
NifStream( order, out, info );
if ( info.version < VER_3_3_0_13 ) {
- NifStream( (unsigned int)&(*target), out, info );
+ WritePtr32( &(*target), out );
} else {
if ( target != NULL ) {
NifStream( link_map.find( StaticCast<NiObject>(target) )->second, out, info );
diff --git a/src/obj/NiPSysModifierActiveCtlr.cpp b/src/obj/NiPSysModifierActiveCtlr.cpp
index 80c2849a6511808af8fde93cc4b312a79423f899..69caadc4bbbd8bd3c88ae8651dbc9babd87b21d9 100644
--- a/src/obj/NiPSysModifierActiveCtlr.cpp
+++ b/src/obj/NiPSysModifierActiveCtlr.cpp
@@ -60,7 +60,7 @@ void NiPSysModifierActiveCtlr::Write( ostream& out, const map<NiObjectRef,unsign
NiPSysModifierBoolCtlr::Write( out, link_map, info );
if ( info.version <= 0x0A010000 ) {
if ( info.version < VER_3_3_0_13 ) {
- NifStream( (unsigned int)&(*data), out, info );
+ WritePtr32( &(*data), out );
} else {
if ( data != NULL ) {
NifStream( link_map.find( StaticCast<NiObject>(data) )->second, out, info );
diff --git a/src/obj/NiPSysModifierFloatCtlr.cpp b/src/obj/NiPSysModifierFloatCtlr.cpp
index 0627fb152a6d5289660e79bdd64a9037671af960..606227a0534b15e159aa46878ca187c5a25664d5 100644
--- a/src/obj/NiPSysModifierFloatCtlr.cpp
+++ b/src/obj/NiPSysModifierFloatCtlr.cpp
@@ -60,7 +60,7 @@ void NiPSysModifierFloatCtlr::Write( ostream& out, const map<NiObjectRef,unsigne
NiPSysModifierCtlr::Write( out, link_map, info );
if ( info.version <= 0x0A010000 ) {
if ( info.version < VER_3_3_0_13 ) {
- NifStream( (unsigned int)&(*data), out, info );
+ WritePtr32( &(*data), out );
} else {
if ( data != NULL ) {
NifStream( link_map.find( StaticCast<NiObject>(data) )->second, out, info );
diff --git a/src/obj/NiPSysVolumeEmitter.cpp b/src/obj/NiPSysVolumeEmitter.cpp
index 694572d4d8482cfea41a8960f7c2e1e3856b7638..c22e5ca555c25f7641ca2aa5c5db81a76a52a4c4 100644
--- a/src/obj/NiPSysVolumeEmitter.cpp
+++ b/src/obj/NiPSysVolumeEmitter.cpp
@@ -60,7 +60,7 @@ void NiPSysVolumeEmitter::Write( ostream& out, const map<NiObjectRef,unsigned in
NiPSysEmitter::Write( out, link_map, info );
if ( info.version >= 0x0A010000 ) {
if ( info.version < VER_3_3_0_13 ) {
- NifStream( (unsigned int)&(*emitterObject), out, info );
+ WritePtr32( &(*emitterObject), out );
} else {
if ( emitterObject != NULL ) {
NifStream( link_map.find( StaticCast<NiObject>(emitterObject) )->second, out, info );
diff --git a/src/obj/NiParticleColorModifier.cpp b/src/obj/NiParticleColorModifier.cpp
index 1a9ac7bb85d48cc23c3feb8ab9bae77cd7c61912..d02de0da9dd90587b6d53f7d8e9f512efde18c63 100644
--- a/src/obj/NiParticleColorModifier.cpp
+++ b/src/obj/NiParticleColorModifier.cpp
@@ -57,7 +57,7 @@ void NiParticleColorModifier::Write( ostream& out, const map<NiObjectRef,unsigne
NiParticleModifier::Write( out, link_map, info );
if ( info.version < VER_3_3_0_13 ) {
- NifStream( (unsigned int)&(*colorData), out, info );
+ WritePtr32( &(*colorData), out );
} else {
if ( colorData != NULL ) {
NifStream( link_map.find( StaticCast<NiObject>(colorData) )->second, out, info );
diff --git a/src/obj/NiParticleMeshModifier.cpp b/src/obj/NiParticleMeshModifier.cpp
index 2179fb9257ba223f030fb80d49a5f9ae183adcaa..a5ccfcea8abf38bae7f4f35be953a75eada76f4f 100644
--- a/src/obj/NiParticleMeshModifier.cpp
+++ b/src/obj/NiParticleMeshModifier.cpp
@@ -64,7 +64,7 @@ void NiParticleMeshModifier::Write( ostream& out, const map<NiObjectRef,unsigned
NifStream( numParticleMeshes, out, info );
for (unsigned int i1 = 0; i1 < particleMeshes.size(); i1++) {
if ( info.version < VER_3_3_0_13 ) {
- NifStream( (unsigned int)&(*particleMeshes[i1]), out, info );
+ WritePtr32( &(*particleMeshes[i1]), out );
} else {
if ( particleMeshes[i1] != NULL ) {
NifStream( link_map.find( StaticCast<NiObject>(particleMeshes[i1]) )->second, out, info );
diff --git a/src/obj/NiParticleMeshesData.cpp b/src/obj/NiParticleMeshesData.cpp
index d20ff2435a6ee7441654a05b61205516ef2ff0f3..b85bf1a058d5afbcdf8ca0cf0ddda7f21cfdbfc9 100644
--- a/src/obj/NiParticleMeshesData.cpp
+++ b/src/obj/NiParticleMeshesData.cpp
@@ -57,7 +57,7 @@ void NiParticleMeshesData::Write( ostream& out, const map<NiObjectRef,unsigned i
NiRotatingParticlesData::Write( out, link_map, info );
if ( info.version < VER_3_3_0_13 ) {
- NifStream( (unsigned int)&(*unknownLink2), out, info );
+ WritePtr32( &(*unknownLink2), out );
} else {
if ( unknownLink2 != NULL ) {
NifStream( link_map.find( StaticCast<NiObject>(unknownLink2) )->second, out, info );
diff --git a/src/obj/NiParticleModifier.cpp b/src/obj/NiParticleModifier.cpp
index 7d81b33f8dab364fa6334cabe4ccd405ee1ad38d..23843056bade63f5db44a0ec3ed1dd76ff13a936 100644
--- a/src/obj/NiParticleModifier.cpp
+++ b/src/obj/NiParticleModifier.cpp
@@ -67,7 +67,7 @@ void NiParticleModifier::Write( ostream& out, const map<NiObjectRef,unsigned int
NiObject::Write( out, link_map, info );
if ( info.version < VER_3_3_0_13 ) {
- NifStream( (unsigned int)&(*nextModifier), out, info );
+ WritePtr32( &(*nextModifier), out );
} else {
if ( nextModifier != NULL ) {
NifStream( link_map.find( StaticCast<NiObject>(nextModifier) )->second, out, info );
@@ -77,7 +77,7 @@ void NiParticleModifier::Write( ostream& out, const map<NiObjectRef,unsigned int
}
if ( info.version >= 0x04000002 ) {
if ( info.version < VER_3_3_0_13 ) {
- NifStream( (unsigned int)&(*controller), out, info );
+ WritePtr32( &(*controller), out );
} else {
if ( controller != NULL ) {
NifStream( link_map.find( StaticCast<NiObject>(controller) )->second, out, info );
diff --git a/src/obj/NiParticleSystem.cpp b/src/obj/NiParticleSystem.cpp
index 2bc2aa6a23508d6508df9030a8d4b06d30d04cb3..bf06aba3ff341d647303b2088fdbccdae3161641 100644
--- a/src/obj/NiParticleSystem.cpp
+++ b/src/obj/NiParticleSystem.cpp
@@ -69,7 +69,7 @@ void NiParticleSystem::Write( ostream& out, const map<NiObjectRef,unsigned int>
NifStream( numModifiers, out, info );
for (unsigned int i2 = 0; i2 < modifiers.size(); i2++) {
if ( info.version < VER_3_3_0_13 ) {
- NifStream( (unsigned int)&(*modifiers[i2]), out, info );
+ WritePtr32( &(*modifiers[i2]), out );
} else {
if ( modifiers[i2] != NULL ) {
NifStream( link_map.find( StaticCast<NiObject>(modifiers[i2]) )->second, out, info );
diff --git a/src/obj/NiParticleSystemController.cpp b/src/obj/NiParticleSystemController.cpp
index 1615448457ccd01b30ced7380313270e0f3c41ee..68fcc6fa8a8ca63974c1acf271643568f50d70bf 100644
--- a/src/obj/NiParticleSystemController.cpp
+++ b/src/obj/NiParticleSystemController.cpp
@@ -173,7 +173,7 @@ void NiParticleSystemController::Write( ostream& out, const map<NiObjectRef,unsi
};
NifStream( startRandom, out, info );
if ( info.version < VER_3_3_0_13 ) {
- NifStream( (unsigned int)&(*emitter), out, info );
+ WritePtr32( &(*emitter), out );
} else {
if ( emitter != NULL ) {
NifStream( link_map.find( StaticCast<NiObject>(emitter) )->second, out, info );
@@ -193,7 +193,7 @@ void NiParticleSystemController::Write( ostream& out, const map<NiObjectRef,unsi
NifStream( particleUnknownVector, out, info );
NifStream( particleLifetime, out, info );
if ( info.version < VER_3_3_0_13 ) {
- NifStream( (unsigned int)&(*particleLink), out, info );
+ WritePtr32( &(*particleLink), out );
} else {
if ( particleLink != NULL ) {
NifStream( link_map.find( StaticCast<NiObject>(particleLink) )->second, out, info );
@@ -218,7 +218,7 @@ void NiParticleSystemController::Write( ostream& out, const map<NiObjectRef,unsi
NifStream( particles[i2].vertexId, out, info );
};
if ( info.version < VER_3_3_0_13 ) {
- NifStream( (unsigned int)&(*unknownLink), out, info );
+ WritePtr32( &(*unknownLink), out );
} else {
if ( unknownLink != NULL ) {
NifStream( link_map.find( StaticCast<NiObject>(unknownLink) )->second, out, info );
@@ -228,7 +228,7 @@ void NiParticleSystemController::Write( ostream& out, const map<NiObjectRef,unsi
}
};
if ( info.version < VER_3_3_0_13 ) {
- NifStream( (unsigned int)&(*particleExtra), out, info );
+ WritePtr32( &(*particleExtra), out );
} else {
if ( particleExtra != NULL ) {
NifStream( link_map.find( StaticCast<NiObject>(particleExtra) )->second, out, info );
@@ -237,7 +237,7 @@ void NiParticleSystemController::Write( ostream& out, const map<NiObjectRef,unsi
}
}
if ( info.version < VER_3_3_0_13 ) {
- NifStream( (unsigned int)&(*unknownLink2), out, info );
+ WritePtr32( &(*unknownLink2), out );
} else {
if ( unknownLink2 != NULL ) {
NifStream( link_map.find( StaticCast<NiObject>(unknownLink2) )->second, out, info );
@@ -250,7 +250,7 @@ void NiParticleSystemController::Write( ostream& out, const map<NiObjectRef,unsi
};
if ( info.version <= 0x03010000 ) {
if ( info.version < VER_3_3_0_13 ) {
- NifStream( (unsigned int)&(*colorData), out, info );
+ WritePtr32( &(*colorData), out );
} else {
if ( colorData != NULL ) {
NifStream( link_map.find( StaticCast<NiObject>(colorData) )->second, out, info );
diff --git a/src/obj/NiParticlesData.cpp b/src/obj/NiParticlesData.cpp
index 107b7cd4754fc816b0c91d60f96922c0c9d18591..462346a97cf7f60aca49bcdb51395fcd9c7d5ff0 100644
--- a/src/obj/NiParticlesData.cpp
+++ b/src/obj/NiParticlesData.cpp
@@ -270,7 +270,7 @@ void NiParticlesData::Write( ostream& out, const map<NiObjectRef,unsigned int> &
};
if ( info.version >= 0x14000004 ) {
if ( info.version < VER_3_3_0_13 ) {
- NifStream( (unsigned int)&(*additionalData), out, info );
+ WritePtr32( &(*additionalData), out );
} else {
if ( additionalData != NULL ) {
NifStream( link_map.find( StaticCast<NiObject>(additionalData) )->second, out, info );
diff --git a/src/obj/NiPathController.cpp b/src/obj/NiPathController.cpp
index 066c9fd243acf2112b68aadf03de69dcce9293d2..92273d163cdd99210e5f8c685bc16482c20c6cdf 100644
--- a/src/obj/NiPathController.cpp
+++ b/src/obj/NiPathController.cpp
@@ -74,7 +74,7 @@ void NiPathController::Write( ostream& out, const map<NiObjectRef,unsigned int>
NifStream( unknownFloat3, out, info );
NifStream( unknownShort, out, info );
if ( info.version < VER_3_3_0_13 ) {
- NifStream( (unsigned int)&(*posData), out, info );
+ WritePtr32( &(*posData), out );
} else {
if ( posData != NULL ) {
NifStream( link_map.find( StaticCast<NiObject>(posData) )->second, out, info );
@@ -83,7 +83,7 @@ void NiPathController::Write( ostream& out, const map<NiObjectRef,unsigned int>
}
}
if ( info.version < VER_3_3_0_13 ) {
- NifStream( (unsigned int)&(*floatData), out, info );
+ WritePtr32( &(*floatData), out );
} else {
if ( floatData != NULL ) {
NifStream( link_map.find( StaticCast<NiObject>(floatData) )->second, out, info );
diff --git a/src/obj/NiPathInterpolator.cpp b/src/obj/NiPathInterpolator.cpp
index bb8f2737daa1bd7226503415ce731d389f437324..63015d291056007d912ebf4c7d0d8a1f2f45acc3 100644
--- a/src/obj/NiPathInterpolator.cpp
+++ b/src/obj/NiPathInterpolator.cpp
@@ -70,7 +70,7 @@ void NiPathInterpolator::Write( ostream& out, const map<NiObjectRef,unsigned int
NifStream( unknownFloat2, out, info );
NifStream( unknownShort2, out, info );
if ( info.version < VER_3_3_0_13 ) {
- NifStream( (unsigned int)&(*posData), out, info );
+ WritePtr32( &(*posData), out );
} else {
if ( posData != NULL ) {
NifStream( link_map.find( StaticCast<NiObject>(posData) )->second, out, info );
@@ -79,7 +79,7 @@ void NiPathInterpolator::Write( ostream& out, const map<NiObjectRef,unsigned int
}
}
if ( info.version < VER_3_3_0_13 ) {
- NifStream( (unsigned int)&(*floatData), out, info );
+ WritePtr32( &(*floatData), out );
} else {
if ( floatData != NULL ) {
NifStream( link_map.find( StaticCast<NiObject>(floatData) )->second, out, info );
diff --git a/src/obj/NiPhysXActorDesc.cpp b/src/obj/NiPhysXActorDesc.cpp
index d67a8a13afcb51e15d661feb00382eae57283362..daa8987d9105f8e15a70bf8a6286bf00a08de494 100644
--- a/src/obj/NiPhysXActorDesc.cpp
+++ b/src/obj/NiPhysXActorDesc.cpp
@@ -92,7 +92,7 @@ void NiPhysXActorDesc::Write( ostream& out, const map<NiObjectRef,unsigned int>
NifStream( unknownQuat2, out, info );
NifStream( unknownQuat3, out, info );
if ( info.version < VER_3_3_0_13 ) {
- NifStream( (unsigned int)&(*unknownRef0), out, info );
+ WritePtr32( &(*unknownRef0), out );
} else {
if ( unknownRef0 != NULL ) {
NifStream( link_map.find( StaticCast<NiObject>(unknownRef0) )->second, out, info );
@@ -106,7 +106,7 @@ void NiPhysXActorDesc::Write( ostream& out, const map<NiObjectRef,unsigned int>
NifStream( unknownByte2, out, info );
NifStream( unknownInt6, out, info );
if ( info.version < VER_3_3_0_13 ) {
- NifStream( (unsigned int)&(*shapeDescription), out, info );
+ WritePtr32( &(*shapeDescription), out );
} else {
if ( shapeDescription != NULL ) {
NifStream( link_map.find( StaticCast<NiObject>(shapeDescription) )->second, out, info );
@@ -115,7 +115,7 @@ void NiPhysXActorDesc::Write( ostream& out, const map<NiObjectRef,unsigned int>
}
}
if ( info.version < VER_3_3_0_13 ) {
- NifStream( (unsigned int)&(*unknownRef1), out, info );
+ WritePtr32( &(*unknownRef1), out );
} else {
if ( unknownRef1 != NULL ) {
NifStream( link_map.find( StaticCast<NiObject>(unknownRef1) )->second, out, info );
@@ -124,7 +124,7 @@ void NiPhysXActorDesc::Write( ostream& out, const map<NiObjectRef,unsigned int>
}
}
if ( info.version < VER_3_3_0_13 ) {
- NifStream( (unsigned int)&(*unknownRef2), out, info );
+ WritePtr32( &(*unknownRef2), out );
} else {
if ( unknownRef2 != NULL ) {
NifStream( link_map.find( StaticCast<NiObject>(unknownRef2) )->second, out, info );
@@ -134,7 +134,7 @@ void NiPhysXActorDesc::Write( ostream& out, const map<NiObjectRef,unsigned int>
}
for (unsigned int i1 = 0; i1 < unknownRefs3.size(); i1++) {
if ( info.version < VER_3_3_0_13 ) {
- NifStream( (unsigned int)&(*unknownRefs3[i1]), out, info );
+ WritePtr32( &(*unknownRefs3[i1]), out );
} else {
if ( unknownRefs3[i1] != NULL ) {
NifStream( link_map.find( StaticCast<NiObject>(unknownRefs3[i1]) )->second, out, info );
diff --git a/src/obj/NiPhysXProp.cpp b/src/obj/NiPhysXProp.cpp
index 838b4095488c3a88197b6c0f09cfe0c40faefa1b..649c55e864d77b35cc147fa499f331264f9112cc 100644
--- a/src/obj/NiPhysXProp.cpp
+++ b/src/obj/NiPhysXProp.cpp
@@ -84,7 +84,7 @@ void NiPhysXProp::Write( ostream& out, const map<NiObjectRef,unsigned int> & lin
NifStream( unknownInt1, out, info );
for (unsigned int i1 = 0; i1 < unknownRefs1.size(); i1++) {
if ( info.version < VER_3_3_0_13 ) {
- NifStream( (unsigned int)&(*unknownRefs1[i1]), out, info );
+ WritePtr32( &(*unknownRefs1[i1]), out );
} else {
if ( unknownRefs1[i1] != NULL ) {
NifStream( link_map.find( StaticCast<NiObject>(unknownRefs1[i1]) )->second, out, info );
@@ -96,7 +96,7 @@ void NiPhysXProp::Write( ostream& out, const map<NiObjectRef,unsigned int> & lin
NifStream( numDests, out, info );
for (unsigned int i1 = 0; i1 < transformDests.size(); i1++) {
if ( info.version < VER_3_3_0_13 ) {
- NifStream( (unsigned int)&(*transformDests[i1]), out, info );
+ WritePtr32( &(*transformDests[i1]), out );
} else {
if ( transformDests[i1] != NULL ) {
NifStream( link_map.find( StaticCast<NiObject>(transformDests[i1]) )->second, out, info );
@@ -107,7 +107,7 @@ void NiPhysXProp::Write( ostream& out, const map<NiObjectRef,unsigned int> & lin
};
NifStream( unknownByte, out, info );
if ( info.version < VER_3_3_0_13 ) {
- NifStream( (unsigned int)&(*propDescription), out, info );
+ WritePtr32( &(*propDescription), out );
} else {
if ( propDescription != NULL ) {
NifStream( link_map.find( StaticCast<NiObject>(propDescription) )->second, out, info );
diff --git a/src/obj/NiPhysXPropDesc.cpp b/src/obj/NiPhysXPropDesc.cpp
index a0266c0b73b8591b54556c959c36a93ccb915c41..d205aaf27b02fbb8e6c34c987155305348c4b1c7 100644
--- a/src/obj/NiPhysXPropDesc.cpp
+++ b/src/obj/NiPhysXPropDesc.cpp
@@ -91,7 +91,7 @@ void NiPhysXPropDesc::Write( ostream& out, const map<NiObjectRef,unsigned int> &
NifStream( numDests, out, info );
for (unsigned int i1 = 0; i1 < actorDescs.size(); i1++) {
if ( info.version < VER_3_3_0_13 ) {
- NifStream( (unsigned int)&(*actorDescs[i1]), out, info );
+ WritePtr32( &(*actorDescs[i1]), out );
} else {
if ( actorDescs[i1] != NULL ) {
NifStream( link_map.find( StaticCast<NiObject>(actorDescs[i1]) )->second, out, info );
@@ -103,7 +103,7 @@ void NiPhysXPropDesc::Write( ostream& out, const map<NiObjectRef,unsigned int> &
NifStream( numJoints, out, info );
for (unsigned int i1 = 0; i1 < jointDescs.size(); i1++) {
if ( info.version < VER_3_3_0_13 ) {
- NifStream( (unsigned int)&(*jointDescs[i1]), out, info );
+ WritePtr32( &(*jointDescs[i1]), out );
} else {
if ( jointDescs[i1] != NULL ) {
NifStream( link_map.find( StaticCast<NiObject>(jointDescs[i1]) )->second, out, info );
@@ -118,7 +118,7 @@ void NiPhysXPropDesc::Write( ostream& out, const map<NiObjectRef,unsigned int> &
NifStream( materialDescs[i1].number, out, info );
NifStream( materialDescs[i1].unknownByte1, out, info );
if ( info.version < VER_3_3_0_13 ) {
- NifStream( (unsigned int)&(*materialDescs[i1].materialDesc), out, info );
+ WritePtr32( &(*materialDescs[i1].materialDesc), out );
} else {
if ( materialDescs[i1].materialDesc != NULL ) {
NifStream( link_map.find( StaticCast<NiObject>(materialDescs[i1].materialDesc) )->second, out, info );
diff --git a/src/obj/NiPhysXShapeDesc.cpp b/src/obj/NiPhysXShapeDesc.cpp
index 9bcb6b5c8b2d027700527dc970c5b86e13453ad2..c6f0f7ee8d07ecd1f03660ed54f926227b698d41 100644
--- a/src/obj/NiPhysXShapeDesc.cpp
+++ b/src/obj/NiPhysXShapeDesc.cpp
@@ -103,7 +103,7 @@ void NiPhysXShapeDesc::Write( ostream& out, const map<NiObjectRef,unsigned int>
};
};
if ( info.version < VER_3_3_0_13 ) {
- NifStream( (unsigned int)&(*meshDescription), out, info );
+ WritePtr32( &(*meshDescription), out );
} else {
if ( meshDescription != NULL ) {
NifStream( link_map.find( StaticCast<NiObject>(meshDescription) )->second, out, info );
diff --git a/src/obj/NiPhysXTransformDest.cpp b/src/obj/NiPhysXTransformDest.cpp
index e3f5b15c38fc6f196313ba444e49dd31fb1f6ea2..cac97e3a126fa5818639d5ac3951eab6a72ea8b7 100644
--- a/src/obj/NiPhysXTransformDest.cpp
+++ b/src/obj/NiPhysXTransformDest.cpp
@@ -67,7 +67,7 @@ void NiPhysXTransformDest::Write( ostream& out, const map<NiObjectRef,unsigned i
NifStream( unknownByte1, out, info );
NifStream( unknownByte2, out, info );
if ( info.version < VER_3_3_0_13 ) {
- NifStream( (unsigned int)&(*node), out, info );
+ WritePtr32( &(*node), out );
} else {
if ( node != NULL ) {
NifStream( link_map.find( StaticCast<NiObject>(node) )->second, out, info );
diff --git a/src/obj/NiPoint3InterpController.cpp b/src/obj/NiPoint3InterpController.cpp
index 7855f6e370586a212aea5d8778e14006bc9a9e49..79ba0105d7738498229ed1db31ac92ae31356ccb 100644
--- a/src/obj/NiPoint3InterpController.cpp
+++ b/src/obj/NiPoint3InterpController.cpp
@@ -66,7 +66,7 @@ void NiPoint3InterpController::Write( ostream& out, const map<NiObjectRef,unsign
};
if ( info.version <= 0x0A010000 ) {
if ( info.version < VER_3_3_0_13 ) {
- NifStream( (unsigned int)&(*data), out, info );
+ WritePtr32( &(*data), out );
} else {
if ( data != NULL ) {
NifStream( link_map.find( StaticCast<NiObject>(data) )->second, out, info );
diff --git a/src/obj/NiPoint3Interpolator.cpp b/src/obj/NiPoint3Interpolator.cpp
index cb0792547af402e9f394e57b1a1266d414dd910a..7b68466b88f3f465a525919cefabf96225323574 100644
--- a/src/obj/NiPoint3Interpolator.cpp
+++ b/src/obj/NiPoint3Interpolator.cpp
@@ -59,7 +59,7 @@ void NiPoint3Interpolator::Write( ostream& out, const map<NiObjectRef,unsigned i
NiKeyBasedInterpolator::Write( out, link_map, info );
NifStream( point3Value, out, info );
if ( info.version < VER_3_3_0_13 ) {
- NifStream( (unsigned int)&(*data), out, info );
+ WritePtr32( &(*data), out );
} else {
if ( data != NULL ) {
NifStream( link_map.find( StaticCast<NiObject>(data) )->second, out, info );
diff --git a/src/obj/NiPortal.cpp b/src/obj/NiPortal.cpp
index 8ec611fe6d0919915d5a3e337ef59e397890a8cc..21276f07423f19a99de2a41c0e05d3abc48d9787 100644
--- a/src/obj/NiPortal.cpp
+++ b/src/obj/NiPortal.cpp
@@ -77,7 +77,7 @@ void NiPortal::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_m
NifStream( vertices[i1], out, info );
};
if ( info.version < VER_3_3_0_13 ) {
- NifStream( (unsigned int)&(*target), out, info );
+ WritePtr32( &(*target), out );
} else {
if ( target != NULL ) {
NifStream( link_map.find( StaticCast<NiObject>(target) )->second, out, info );
diff --git a/src/obj/NiRollController.cpp b/src/obj/NiRollController.cpp
index aaae4c44a2e79953ef7fd698f7f6f855658180c6..4dc79c7d5a77e63b40c0f5a72d14e3e1e15bfd5e 100644
--- a/src/obj/NiRollController.cpp
+++ b/src/obj/NiRollController.cpp
@@ -57,7 +57,7 @@ void NiRollController::Write( ostream& out, const map<NiObjectRef,unsigned int>
NiSingleInterpController::Write( out, link_map, info );
if ( info.version < VER_3_3_0_13 ) {
- NifStream( (unsigned int)&(*data), out, info );
+ WritePtr32( &(*data), out );
} else {
if ( data != NULL ) {
NifStream( link_map.find( StaticCast<NiObject>(data) )->second, out, info );
diff --git a/src/obj/NiRoom.cpp b/src/obj/NiRoom.cpp
index 309fbd81f05e79e121f33ce71cd14e5340bf430a..9c7f13c55c3ec3f9de7f04952b67dec92d432392 100644
--- a/src/obj/NiRoom.cpp
+++ b/src/obj/NiRoom.cpp
@@ -95,7 +95,7 @@ void NiRoom::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map
NifStream( numInPortals, out, info );
for (unsigned int i1 = 0; i1 < inPortals.size(); i1++) {
if ( info.version < VER_3_3_0_13 ) {
- NifStream( (unsigned int)&(*inPortals[i1]), out, info );
+ WritePtr32( &(*inPortals[i1]), out );
} else {
if ( inPortals[i1] != NULL ) {
NifStream( link_map.find( StaticCast<NiObject>(inPortals[i1]) )->second, out, info );
@@ -107,7 +107,7 @@ void NiRoom::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map
NifStream( numPortals2, out, info );
for (unsigned int i1 = 0; i1 < portals2.size(); i1++) {
if ( info.version < VER_3_3_0_13 ) {
- NifStream( (unsigned int)&(*portals2[i1]), out, info );
+ WritePtr32( &(*portals2[i1]), out );
} else {
if ( portals2[i1] != NULL ) {
NifStream( link_map.find( StaticCast<NiObject>(portals2[i1]) )->second, out, info );
@@ -119,7 +119,7 @@ void NiRoom::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map
NifStream( numItems, out, info );
for (unsigned int i1 = 0; i1 < items.size(); i1++) {
if ( info.version < VER_3_3_0_13 ) {
- NifStream( (unsigned int)&(*items[i1]), out, info );
+ WritePtr32( &(*items[i1]), out );
} else {
if ( items[i1] != NULL ) {
NifStream( link_map.find( StaticCast<NiObject>(items[i1]) )->second, out, info );
diff --git a/src/obj/NiRoomGroup.cpp b/src/obj/NiRoomGroup.cpp
index b06bdfd22278268e3a94dd8842a3c4dfc967a5ba..090490451369ae4abea6305d6a8512bf72d438aa 100644
--- a/src/obj/NiRoomGroup.cpp
+++ b/src/obj/NiRoomGroup.cpp
@@ -71,7 +71,7 @@ void NiRoomGroup::Write( ostream& out, const map<NiObjectRef,unsigned int> & lin
NiNode::Write( out, link_map, info );
numRooms = (int)(rooms.size());
if ( info.version < VER_3_3_0_13 ) {
- NifStream( (unsigned int)&(*shellLink), out, info );
+ WritePtr32( &(*shellLink), out );
} else {
if ( shellLink != NULL ) {
NifStream( link_map.find( StaticCast<NiObject>(shellLink) )->second, out, info );
@@ -82,7 +82,7 @@ void NiRoomGroup::Write( ostream& out, const map<NiObjectRef,unsigned int> & lin
NifStream( numRooms, out, info );
for (unsigned int i1 = 0; i1 < rooms.size(); i1++) {
if ( info.version < VER_3_3_0_13 ) {
- NifStream( (unsigned int)&(*rooms[i1]), out, info );
+ WritePtr32( &(*rooms[i1]), out );
} else {
if ( rooms[i1] != NULL ) {
NifStream( link_map.find( StaticCast<NiObject>(rooms[i1]) )->second, out, info );
diff --git a/src/obj/NiSequence.cpp b/src/obj/NiSequence.cpp
index 3507645e514a0bb416eeca50da55721f73992103..9ced8c3c66d7ba2e530d406dbf3af38f294d53a9 100644
--- a/src/obj/NiSequence.cpp
+++ b/src/obj/NiSequence.cpp
@@ -145,7 +145,7 @@ void NiSequence::Write( ostream& out, const map<NiObjectRef,unsigned int> & link
if ( info.version <= 0x0A010000 ) {
NifStream( textKeysName, out, info );
if ( info.version < VER_3_3_0_13 ) {
- NifStream( (unsigned int)&(*textKeys), out, info );
+ WritePtr32( &(*textKeys), out );
} else {
if ( textKeys != NULL ) {
NifStream( link_map.find( StaticCast<NiObject>(textKeys) )->second, out, info );
@@ -162,7 +162,7 @@ void NiSequence::Write( ostream& out, const map<NiObjectRef,unsigned int> & link
if ( info.version <= 0x0A010000 ) {
NifStream( controlledBlocks[i1].targetName, out, info );
if ( info.version < VER_3_3_0_13 ) {
- NifStream( (unsigned int)&(*controlledBlocks[i1].controller), out, info );
+ WritePtr32( &(*controlledBlocks[i1].controller), out );
} else {
if ( controlledBlocks[i1].controller != NULL ) {
NifStream( link_map.find( StaticCast<NiObject>(controlledBlocks[i1].controller) )->second, out, info );
@@ -173,7 +173,7 @@ void NiSequence::Write( ostream& out, const map<NiObjectRef,unsigned int> & link
};
if ( info.version >= 0x0A01006A ) {
if ( info.version < VER_3_3_0_13 ) {
- NifStream( (unsigned int)&(*controlledBlocks[i1].interpolator), out, info );
+ WritePtr32( &(*controlledBlocks[i1].interpolator), out );
} else {
if ( controlledBlocks[i1].interpolator != NULL ) {
NifStream( link_map.find( StaticCast<NiObject>(controlledBlocks[i1].interpolator) )->second, out, info );
@@ -182,7 +182,7 @@ void NiSequence::Write( ostream& out, const map<NiObjectRef,unsigned int> & link
}
}
if ( info.version < VER_3_3_0_13 ) {
- NifStream( (unsigned int)&(*controlledBlocks[i1].controller), out, info );
+ WritePtr32( &(*controlledBlocks[i1].controller), out );
} else {
if ( controlledBlocks[i1].controller != NULL ) {
NifStream( link_map.find( StaticCast<NiObject>(controlledBlocks[i1].controller) )->second, out, info );
@@ -193,7 +193,7 @@ void NiSequence::Write( ostream& out, const map<NiObjectRef,unsigned int> & link
};
if ( ( info.version >= 0x0A01006A ) && ( info.version <= 0x0A01006A ) ) {
if ( info.version < VER_3_3_0_13 ) {
- NifStream( (unsigned int)&(*controlledBlocks[i1].unknownLink2), out, info );
+ WritePtr32( &(*controlledBlocks[i1].unknownLink2), out );
} else {
if ( controlledBlocks[i1].unknownLink2 != NULL ) {
NifStream( link_map.find( StaticCast<NiObject>(controlledBlocks[i1].unknownLink2) )->second, out, info );
@@ -208,7 +208,7 @@ void NiSequence::Write( ostream& out, const map<NiObjectRef,unsigned int> & link
};
if ( ( info.version >= 0x0A020000 ) && ( info.version <= 0x14000005 ) ) {
if ( info.version < VER_3_3_0_13 ) {
- NifStream( (unsigned int)&(*controlledBlocks[i1].stringPalette), out, info );
+ WritePtr32( &(*controlledBlocks[i1].stringPalette), out );
} else {
if ( controlledBlocks[i1].stringPalette != NULL ) {
NifStream( link_map.find( StaticCast<NiObject>(controlledBlocks[i1].stringPalette) )->second, out, info );
diff --git a/src/obj/NiSingleInterpController.cpp b/src/obj/NiSingleInterpController.cpp
index c3da419f5ddec4e0106907b99486ecd14d3fcb93..797289ab8b18038a54e34f5bfa574ff7c2a97de2 100644
--- a/src/obj/NiSingleInterpController.cpp
+++ b/src/obj/NiSingleInterpController.cpp
@@ -61,7 +61,7 @@ void NiSingleInterpController::Write( ostream& out, const map<NiObjectRef,unsign
NiInterpController::Write( out, link_map, info );
if ( info.version >= 0x0A020000 ) {
if ( info.version < VER_3_3_0_13 ) {
- NifStream( (unsigned int)&(*interpolator), out, info );
+ WritePtr32( &(*interpolator), out );
} else {
if ( interpolator != NULL ) {
NifStream( link_map.find( StaticCast<NiObject>(interpolator) )->second, out, info );
diff --git a/src/obj/NiSkinData.cpp b/src/obj/NiSkinData.cpp
index faa3bad56c47742bae419a36fbe9ac21edf9c7ed..a59d2fe12693e1fa1537ae1abd295195c25a0082 100644
--- a/src/obj/NiSkinData.cpp
+++ b/src/obj/NiSkinData.cpp
@@ -103,7 +103,7 @@ void NiSkinData::Write( ostream& out, const map<NiObjectRef,unsigned int> & link
NifStream( numBones, out, info );
if ( ( info.version >= 0x04000002 ) && ( info.version <= 0x0A010000 ) ) {
if ( info.version < VER_3_3_0_13 ) {
- NifStream( (unsigned int)&(*skinPartition), out, info );
+ WritePtr32( &(*skinPartition), out );
} else {
if ( skinPartition != NULL ) {
NifStream( link_map.find( StaticCast<NiObject>(skinPartition) )->second, out, info );
diff --git a/src/obj/NiSkinInstance.cpp b/src/obj/NiSkinInstance.cpp
index b3c2fb6a0c80f749ed2f3b0b68b27c6e1dae7a8e..da2dcf2bba958f9198abb8d67ea6b3af1593c45f 100644
--- a/src/obj/NiSkinInstance.cpp
+++ b/src/obj/NiSkinInstance.cpp
@@ -85,7 +85,7 @@ void NiSkinInstance::Write( ostream& out, const map<NiObjectRef,unsigned int> &
NiObject::Write( out, link_map, info );
numBones = (unsigned int)(bones.size());
if ( info.version < VER_3_3_0_13 ) {
- NifStream( (unsigned int)&(*data), out, info );
+ WritePtr32( &(*data), out );
} else {
if ( data != NULL ) {
NifStream( link_map.find( StaticCast<NiObject>(data) )->second, out, info );
@@ -95,7 +95,7 @@ void NiSkinInstance::Write( ostream& out, const map<NiObjectRef,unsigned int> &
}
if ( info.version >= 0x0A020000 ) {
if ( info.version < VER_3_3_0_13 ) {
- NifStream( (unsigned int)&(*skinPartition), out, info );
+ WritePtr32( &(*skinPartition), out );
} else {
if ( skinPartition != NULL ) {
NifStream( link_map.find( StaticCast<NiObject>(skinPartition) )->second, out, info );
@@ -105,7 +105,7 @@ void NiSkinInstance::Write( ostream& out, const map<NiObjectRef,unsigned int> &
}
};
if ( info.version < VER_3_3_0_13 ) {
- NifStream( (unsigned int)&(*skeletonRoot), out, info );
+ WritePtr32( &(*skeletonRoot), out );
} else {
if ( skeletonRoot != NULL ) {
NifStream( link_map.find( StaticCast<NiObject>(skeletonRoot) )->second, out, info );
@@ -116,7 +116,7 @@ void NiSkinInstance::Write( ostream& out, const map<NiObjectRef,unsigned int> &
NifStream( numBones, out, info );
for (unsigned int i1 = 0; i1 < bones.size(); i1++) {
if ( info.version < VER_3_3_0_13 ) {
- NifStream( (unsigned int)&(*bones[i1]), out, info );
+ WritePtr32( &(*bones[i1]), out );
} else {
if ( bones[i1] != NULL ) {
NifStream( link_map.find( StaticCast<NiObject>(bones[i1]) )->second, out, info );
diff --git a/src/obj/NiSourceTexture.cpp b/src/obj/NiSourceTexture.cpp
index 6221bd747bf641de957f877fb71a5b6794e2a405..e0da66709e4d1bc64454af047e44b72ad4fcf29b 100644
--- a/src/obj/NiSourceTexture.cpp
+++ b/src/obj/NiSourceTexture.cpp
@@ -96,7 +96,7 @@ void NiSourceTexture::Write( ostream& out, const map<NiObjectRef,unsigned int> &
if ( info.version >= 0x0A010000 ) {
if ( (useExternal == 1) ) {
if ( info.version < VER_3_3_0_13 ) {
- NifStream( (unsigned int)&(*unknownLink), out, info );
+ WritePtr32( &(*unknownLink), out );
} else {
if ( unknownLink != NULL ) {
NifStream( link_map.find( StaticCast<NiObject>(unknownLink) )->second, out, info );
@@ -118,7 +118,7 @@ void NiSourceTexture::Write( ostream& out, const map<NiObjectRef,unsigned int> &
};
if ( (useExternal == 0) ) {
if ( info.version < VER_3_3_0_13 ) {
- NifStream( (unsigned int)&(*pixelData), out, info );
+ WritePtr32( &(*pixelData), out );
} else {
if ( pixelData != NULL ) {
NifStream( link_map.find( StaticCast<NiObject>(pixelData) )->second, out, info );
diff --git a/src/obj/NiTextureEffect.cpp b/src/obj/NiTextureEffect.cpp
index 18ecb2607bbb75484a8b31b1b6e8a2fd750ad3e9..7b6309b48c7c59e0b55ad1dba35c6ab2d04e41df 100644
--- a/src/obj/NiTextureEffect.cpp
+++ b/src/obj/NiTextureEffect.cpp
@@ -87,7 +87,7 @@ void NiTextureEffect::Write( ostream& out, const map<NiObjectRef,unsigned int> &
NifStream( coordinateGenerationType, out, info );
if ( info.version <= 0x03010000 ) {
if ( info.version < VER_3_3_0_13 ) {
- NifStream( (unsigned int)&(*image), out, info );
+ WritePtr32( &(*image), out );
} else {
if ( image != NULL ) {
NifStream( link_map.find( StaticCast<NiObject>(image) )->second, out, info );
@@ -98,7 +98,7 @@ void NiTextureEffect::Write( ostream& out, const map<NiObjectRef,unsigned int> &
};
if ( info.version >= 0x04000000 ) {
if ( info.version < VER_3_3_0_13 ) {
- NifStream( (unsigned int)&(*sourceTexture), out, info );
+ WritePtr32( &(*sourceTexture), out );
} else {
if ( sourceTexture != NULL ) {
NifStream( link_map.find( StaticCast<NiObject>(sourceTexture) )->second, out, info );
diff --git a/src/obj/NiTextureProperty.cpp b/src/obj/NiTextureProperty.cpp
index 358386b2b7e9feadfc763204f98388e40541c6fd..743252bf8eea5a398e80b43c8718b88bff4192d1 100644
--- a/src/obj/NiTextureProperty.cpp
+++ b/src/obj/NiTextureProperty.cpp
@@ -63,7 +63,7 @@ void NiTextureProperty::Write( ostream& out, const map<NiObjectRef,unsigned int>
NiProperty::Write( out, link_map, info );
NifStream( flags, out, info );
if ( info.version < VER_3_3_0_13 ) {
- NifStream( (unsigned int)&(*image), out, info );
+ WritePtr32( &(*image), out );
} else {
if ( image != NULL ) {
NifStream( link_map.find( StaticCast<NiObject>(image) )->second, out, info );
diff --git a/src/obj/NiTextureTransformController.cpp b/src/obj/NiTextureTransformController.cpp
index 03cc31bcacb9de1ea33f5454c72c20d3dbac9798..071c1e13dcd59573e5b208641cf0a204d30f4279 100644
--- a/src/obj/NiTextureTransformController.cpp
+++ b/src/obj/NiTextureTransformController.cpp
@@ -67,7 +67,7 @@ void NiTextureTransformController::Write( ostream& out, const map<NiObjectRef,un
NifStream( operation, out, info );
if ( info.version <= 0x0A010000 ) {
if ( info.version < VER_3_3_0_13 ) {
- NifStream( (unsigned int)&(*data), out, info );
+ WritePtr32( &(*data), out );
} else {
if ( data != NULL ) {
NifStream( link_map.find( StaticCast<NiObject>(data) )->second, out, info );
diff --git a/src/obj/NiTexturingProperty.cpp b/src/obj/NiTexturingProperty.cpp
index da10a4c4c8d779d29f2d496645c36c97ae08bf1f..3b4c860631ce96b626102e165eaed80cdbdbe162 100644
--- a/src/obj/NiTexturingProperty.cpp
+++ b/src/obj/NiTexturingProperty.cpp
@@ -562,7 +562,7 @@ void NiTexturingProperty::Write( ostream& out, const map<NiObjectRef,unsigned in
NifStream( hasBaseTexture, out, info );
if ( (hasBaseTexture != 0) ) {
if ( info.version < VER_3_3_0_13 ) {
- NifStream( (unsigned int)&(*baseTexture.source), out, info );
+ WritePtr32( &(*baseTexture.source), out );
} else {
if ( baseTexture.source != NULL ) {
NifStream( link_map.find( StaticCast<NiObject>(baseTexture.source) )->second, out, info );
@@ -601,7 +601,7 @@ void NiTexturingProperty::Write( ostream& out, const map<NiObjectRef,unsigned in
NifStream( hasDarkTexture, out, info );
if ( (hasDarkTexture != 0) ) {
if ( info.version < VER_3_3_0_13 ) {
- NifStream( (unsigned int)&(*darkTexture.source), out, info );
+ WritePtr32( &(*darkTexture.source), out );
} else {
if ( darkTexture.source != NULL ) {
NifStream( link_map.find( StaticCast<NiObject>(darkTexture.source) )->second, out, info );
@@ -640,7 +640,7 @@ void NiTexturingProperty::Write( ostream& out, const map<NiObjectRef,unsigned in
NifStream( hasDetailTexture, out, info );
if ( (hasDetailTexture != 0) ) {
if ( info.version < VER_3_3_0_13 ) {
- NifStream( (unsigned int)&(*detailTexture.source), out, info );
+ WritePtr32( &(*detailTexture.source), out );
} else {
if ( detailTexture.source != NULL ) {
NifStream( link_map.find( StaticCast<NiObject>(detailTexture.source) )->second, out, info );
@@ -679,7 +679,7 @@ void NiTexturingProperty::Write( ostream& out, const map<NiObjectRef,unsigned in
NifStream( hasGlossTexture, out, info );
if ( (hasGlossTexture != 0) ) {
if ( info.version < VER_3_3_0_13 ) {
- NifStream( (unsigned int)&(*glossTexture.source), out, info );
+ WritePtr32( &(*glossTexture.source), out );
} else {
if ( glossTexture.source != NULL ) {
NifStream( link_map.find( StaticCast<NiObject>(glossTexture.source) )->second, out, info );
@@ -718,7 +718,7 @@ void NiTexturingProperty::Write( ostream& out, const map<NiObjectRef,unsigned in
NifStream( hasGlowTexture, out, info );
if ( (hasGlowTexture != 0) ) {
if ( info.version < VER_3_3_0_13 ) {
- NifStream( (unsigned int)&(*glowTexture.source), out, info );
+ WritePtr32( &(*glowTexture.source), out );
} else {
if ( glowTexture.source != NULL ) {
NifStream( link_map.find( StaticCast<NiObject>(glowTexture.source) )->second, out, info );
@@ -757,7 +757,7 @@ void NiTexturingProperty::Write( ostream& out, const map<NiObjectRef,unsigned in
NifStream( hasBumpMapTexture, out, info );
if ( (hasBumpMapTexture != 0) ) {
if ( info.version < VER_3_3_0_13 ) {
- NifStream( (unsigned int)&(*bumpMapTexture.source), out, info );
+ WritePtr32( &(*bumpMapTexture.source), out );
} else {
if ( bumpMapTexture.source != NULL ) {
NifStream( link_map.find( StaticCast<NiObject>(bumpMapTexture.source) )->second, out, info );
@@ -800,7 +800,7 @@ void NiTexturingProperty::Write( ostream& out, const map<NiObjectRef,unsigned in
NifStream( hasNormalTexture, out, info );
if ( (hasNormalTexture != 0) ) {
if ( info.version < VER_3_3_0_13 ) {
- NifStream( (unsigned int)&(*normalTexture.source), out, info );
+ WritePtr32( &(*normalTexture.source), out );
} else {
if ( normalTexture.source != NULL ) {
NifStream( link_map.find( StaticCast<NiObject>(normalTexture.source) )->second, out, info );
@@ -839,7 +839,7 @@ void NiTexturingProperty::Write( ostream& out, const map<NiObjectRef,unsigned in
NifStream( hasUnknown2Texture, out, info );
if ( (hasUnknown2Texture != 0) ) {
if ( info.version < VER_3_3_0_13 ) {
- NifStream( (unsigned int)&(*unknown2Texture.source), out, info );
+ WritePtr32( &(*unknown2Texture.source), out );
} else {
if ( unknown2Texture.source != NULL ) {
NifStream( link_map.find( StaticCast<NiObject>(unknown2Texture.source) )->second, out, info );
@@ -882,7 +882,7 @@ void NiTexturingProperty::Write( ostream& out, const map<NiObjectRef,unsigned in
NifStream( hasDecal0Texture, out, info );
if ( (hasDecal0Texture != 0) ) {
if ( info.version < VER_3_3_0_13 ) {
- NifStream( (unsigned int)&(*decal0Texture.source), out, info );
+ WritePtr32( &(*decal0Texture.source), out );
} else {
if ( decal0Texture.source != NULL ) {
NifStream( link_map.find( StaticCast<NiObject>(decal0Texture.source) )->second, out, info );
@@ -930,7 +930,7 @@ void NiTexturingProperty::Write( ostream& out, const map<NiObjectRef,unsigned in
};
if ( (hasDecal1Texture != 0) ) {
if ( info.version < VER_3_3_0_13 ) {
- NifStream( (unsigned int)&(*decal1Texture.source), out, info );
+ WritePtr32( &(*decal1Texture.source), out );
} else {
if ( decal1Texture.source != NULL ) {
NifStream( link_map.find( StaticCast<NiObject>(decal1Texture.source) )->second, out, info );
@@ -978,7 +978,7 @@ void NiTexturingProperty::Write( ostream& out, const map<NiObjectRef,unsigned in
};
if ( (hasDecal2Texture != 0) ) {
if ( info.version < VER_3_3_0_13 ) {
- NifStream( (unsigned int)&(*decal2Texture.source), out, info );
+ WritePtr32( &(*decal2Texture.source), out );
} else {
if ( decal2Texture.source != NULL ) {
NifStream( link_map.find( StaticCast<NiObject>(decal2Texture.source) )->second, out, info );
@@ -1026,7 +1026,7 @@ void NiTexturingProperty::Write( ostream& out, const map<NiObjectRef,unsigned in
};
if ( (hasDecal3Texture != 0) ) {
if ( info.version < VER_3_3_0_13 ) {
- NifStream( (unsigned int)&(*decal3Texture.source), out, info );
+ WritePtr32( &(*decal3Texture.source), out );
} else {
if ( decal3Texture.source != NULL ) {
NifStream( link_map.find( StaticCast<NiObject>(decal3Texture.source) )->second, out, info );
@@ -1068,7 +1068,7 @@ void NiTexturingProperty::Write( ostream& out, const map<NiObjectRef,unsigned in
NifStream( shaderTextures[i2].isUsed, out, info );
if ( (shaderTextures[i2].isUsed != 0) ) {
if ( info.version < VER_3_3_0_13 ) {
- NifStream( (unsigned int)&(*shaderTextures[i2].textureData.source), out, info );
+ WritePtr32( &(*shaderTextures[i2].textureData.source), out );
} else {
if ( shaderTextures[i2].textureData.source != NULL ) {
NifStream( link_map.find( StaticCast<NiObject>(shaderTextures[i2].textureData.source) )->second, out, info );
diff --git a/src/obj/NiTimeController.cpp b/src/obj/NiTimeController.cpp
index d75b7678400b3054799c946bac429c4d41f24092..45c83527e74b2b9e345ff3ff2fa1fecb1037763f 100644
--- a/src/obj/NiTimeController.cpp
+++ b/src/obj/NiTimeController.cpp
@@ -69,7 +69,7 @@ void NiTimeController::Write( ostream& out, const map<NiObjectRef,unsigned int>
NiObject::Write( out, link_map, info );
if ( info.version < VER_3_3_0_13 ) {
- NifStream( (unsigned int)&(*nextController), out, info );
+ WritePtr32( &(*nextController), out );
} else {
if ( nextController != NULL ) {
NifStream( link_map.find( StaticCast<NiObject>(nextController) )->second, out, info );
@@ -84,7 +84,7 @@ void NiTimeController::Write( ostream& out, const map<NiObjectRef,unsigned int>
NifStream( stopTime, out, info );
if ( info.version >= 0x0303000D ) {
if ( info.version < VER_3_3_0_13 ) {
- NifStream( (unsigned int)&(*target), out, info );
+ WritePtr32( &(*target), out );
} else {
if ( target != NULL ) {
NifStream( link_map.find( StaticCast<NiObject>(target) )->second, out, info );
diff --git a/src/obj/NiTransformInterpolator.cpp b/src/obj/NiTransformInterpolator.cpp
index f7f7f53d170ba671d8983bb1cf6f2a00444dae57..af6fa7c95d46813489f3f3fbb0045329b1a7e12a 100644
--- a/src/obj/NiTransformInterpolator.cpp
+++ b/src/obj/NiTransformInterpolator.cpp
@@ -73,7 +73,7 @@ void NiTransformInterpolator::Write( ostream& out, const map<NiObjectRef,unsigne
};
};
if ( info.version < VER_3_3_0_13 ) {
- NifStream( (unsigned int)&(*data), out, info );
+ WritePtr32( &(*data), out );
} else {
if ( data != NULL ) {
NifStream( link_map.find( StaticCast<NiObject>(data) )->second, out, info );
diff --git a/src/obj/NiTriShapeSkinController.cpp b/src/obj/NiTriShapeSkinController.cpp
index 7ec16a9f2616d3078e2f5e2cf7f9c509a393e8ef..e50f54f532eabb00c4ea6c312b79ef8320c6d537 100644
--- a/src/obj/NiTriShapeSkinController.cpp
+++ b/src/obj/NiTriShapeSkinController.cpp
@@ -83,7 +83,7 @@ void NiTriShapeSkinController::Write( ostream& out, const map<NiObjectRef,unsign
};
for (unsigned int i1 = 0; i1 < bones.size(); i1++) {
if ( info.version < VER_3_3_0_13 ) {
- NifStream( (unsigned int)&(*bones[i1]), out, info );
+ WritePtr32( &(*bones[i1]), out );
} else {
if ( bones[i1] != NULL ) {
NifStream( link_map.find( StaticCast<NiObject>(bones[i1]) )->second, out, info );
diff --git a/src/obj/NiUVController.cpp b/src/obj/NiUVController.cpp
index abcef0eeb186115c59f207d5e921aeef9383efc2..3b6b98c53dcf1fb02b8d936b5e53f1d113484401 100644
--- a/src/obj/NiUVController.cpp
+++ b/src/obj/NiUVController.cpp
@@ -59,7 +59,7 @@ void NiUVController::Write( ostream& out, const map<NiObjectRef,unsigned int> &
NiTimeController::Write( out, link_map, info );
NifStream( unknownShort, out, info );
if ( info.version < VER_3_3_0_13 ) {
- NifStream( (unsigned int)&(*data), out, info );
+ WritePtr32( &(*data), out );
} else {
if ( data != NULL ) {
NifStream( link_map.find( StaticCast<NiObject>(data) )->second, out, info );
diff --git a/src/obj/NiVisController.cpp b/src/obj/NiVisController.cpp
index 37f99d12725a11a70f9ad9e6cdbb556ad6d531af..77faebe785203ff442f32faf08ff99f6596dcce4 100644
--- a/src/obj/NiVisController.cpp
+++ b/src/obj/NiVisController.cpp
@@ -60,7 +60,7 @@ void NiVisController::Write( ostream& out, const map<NiObjectRef,unsigned int> &
NiBoolInterpController::Write( out, link_map, info );
if ( info.version <= 0x0A010000 ) {
if ( info.version < VER_3_3_0_13 ) {
- NifStream( (unsigned int)&(*data), out, info );
+ WritePtr32( &(*data), out );
} else {
if ( data != NULL ) {
NifStream( link_map.find( StaticCast<NiObject>(data) )->second, out, info );
diff --git a/src/obj/bhkConstraint.cpp b/src/obj/bhkConstraint.cpp
index 07676eb0b8dd94a5535e5828b38c90a0d19e3386..761e153d58f653e4a0945ec5a3dfd83712a9e012 100644
--- a/src/obj/bhkConstraint.cpp
+++ b/src/obj/bhkConstraint.cpp
@@ -65,7 +65,7 @@ void bhkConstraint::Write( ostream& out, const map<NiObjectRef,unsigned int> & l
NifStream( numEntities, out, info );
for (unsigned int i1 = 0; i1 < entities.size(); i1++) {
if ( info.version < VER_3_3_0_13 ) {
- NifStream( (unsigned int)&(*entities[i1]), out, info );
+ WritePtr32( &(*entities[i1]), out );
} else {
if ( entities[i1] != NULL ) {
NifStream( link_map.find( StaticCast<NiObject>(entities[i1]) )->second, out, info );
diff --git a/src/obj/bhkConvexListShape.cpp b/src/obj/bhkConvexListShape.cpp
index 791405fb5ee7669014b7fd7ae8df52af5cb7e968..4ef070608e6d48a79ccc7b04e4eb998e2db735a3 100644
--- a/src/obj/bhkConvexListShape.cpp
+++ b/src/obj/bhkConvexListShape.cpp
@@ -76,7 +76,7 @@ void bhkConvexListShape::Write( ostream& out, const map<NiObjectRef,unsigned int
NifStream( numSubShapes, out, info );
for (unsigned int i1 = 0; i1 < subShapes.size(); i1++) {
if ( info.version < VER_3_3_0_13 ) {
- NifStream( (unsigned int)&(*subShapes[i1]), out, info );
+ WritePtr32( &(*subShapes[i1]), out );
} else {
if ( subShapes[i1] != NULL ) {
NifStream( link_map.find( StaticCast<NiObject>(subShapes[i1]) )->second, out, info );
diff --git a/src/obj/bhkListShape.cpp b/src/obj/bhkListShape.cpp
index cbd773d8801e270a0460b5378bc0e5a9a0157fd5..65d1d60c051621639d7b7810249eec1f8e982c27 100644
--- a/src/obj/bhkListShape.cpp
+++ b/src/obj/bhkListShape.cpp
@@ -75,7 +75,7 @@ void bhkListShape::Write( ostream& out, const map<NiObjectRef,unsigned int> & li
NifStream( numSubShapes, out, info );
for (unsigned int i1 = 0; i1 < subShapes.size(); i1++) {
if ( info.version < VER_3_3_0_13 ) {
- NifStream( (unsigned int)&(*subShapes[i1]), out, info );
+ WritePtr32( &(*subShapes[i1]), out );
} else {
if ( subShapes[i1] != NULL ) {
NifStream( link_map.find( StaticCast<NiObject>(subShapes[i1]) )->second, out, info );
diff --git a/src/obj/bhkMalleableConstraint.cpp b/src/obj/bhkMalleableConstraint.cpp
index 608ce26e57730385fbc19559f7f529397c0e7e39..2f4c2b65c26bafaf025aea35b83fe2f80c568d2e 100644
--- a/src/obj/bhkMalleableConstraint.cpp
+++ b/src/obj/bhkMalleableConstraint.cpp
@@ -134,7 +134,7 @@ void bhkMalleableConstraint::Write( ostream& out, const map<NiObjectRef,unsigned
NifStream( type, out, info );
NifStream( unknownInt2, out, info );
if ( info.version < VER_3_3_0_13 ) {
- NifStream( (unsigned int)&(*unknownLink1), out, info );
+ WritePtr32( &(*unknownLink1), out );
} else {
if ( unknownLink1 != NULL ) {
NifStream( link_map.find( StaticCast<NiObject>(unknownLink1) )->second, out, info );
@@ -143,7 +143,7 @@ void bhkMalleableConstraint::Write( ostream& out, const map<NiObjectRef,unsigned
}
}
if ( info.version < VER_3_3_0_13 ) {
- NifStream( (unsigned int)&(*unknownLink2), out, info );
+ WritePtr32( &(*unknownLink2), out );
} else {
if ( unknownLink2 != NULL ) {
NifStream( link_map.find( StaticCast<NiObject>(unknownLink2) )->second, out, info );
diff --git a/src/obj/bhkMoppBvTreeShape.cpp b/src/obj/bhkMoppBvTreeShape.cpp
index 7d0f957af9d617d661b951f4a14b379efe1224e5..46fa7cda7d04ba7370b041f87623ee7813722144 100644
--- a/src/obj/bhkMoppBvTreeShape.cpp
+++ b/src/obj/bhkMoppBvTreeShape.cpp
@@ -69,7 +69,7 @@ void bhkMoppBvTreeShape::Write( ostream& out, const map<NiObjectRef,unsigned int
bhkBvTreeShape::Write( out, link_map, info );
moppDataSize = (unsigned int)(moppData.size());
if ( info.version < VER_3_3_0_13 ) {
- NifStream( (unsigned int)&(*shape), out, info );
+ WritePtr32( &(*shape), out );
} else {
if ( shape != NULL ) {
NifStream( link_map.find( StaticCast<NiObject>(shape) )->second, out, info );
diff --git a/src/obj/bhkNiCollisionObject.cpp b/src/obj/bhkNiCollisionObject.cpp
index 7f822a53e1c35bab2fb36e1450600ebc7152a39c..35e9a9a23f7e47a14c019d81ae72b322817e4b10 100644
--- a/src/obj/bhkNiCollisionObject.cpp
+++ b/src/obj/bhkNiCollisionObject.cpp
@@ -59,7 +59,7 @@ void bhkNiCollisionObject::Write( ostream& out, const map<NiObjectRef,unsigned i
NiCollisionObject::Write( out, link_map, info );
NifStream( flags, out, info );
if ( info.version < VER_3_3_0_13 ) {
- NifStream( (unsigned int)&(*body), out, info );
+ WritePtr32( &(*body), out );
} else {
if ( body != NULL ) {
NifStream( link_map.find( StaticCast<NiObject>(body) )->second, out, info );
diff --git a/src/obj/bhkNiTriStripsShape.cpp b/src/obj/bhkNiTriStripsShape.cpp
index 62b8cf70f3f3b44b1dbb3a52b74043a855296468..16aff6c0c33437783f0ff312fc4d4c11639ea001 100644
--- a/src/obj/bhkNiTriStripsShape.cpp
+++ b/src/obj/bhkNiTriStripsShape.cpp
@@ -92,7 +92,7 @@ void bhkNiTriStripsShape::Write( ostream& out, const map<NiObjectRef,unsigned in
NifStream( numStripsData, out, info );
for (unsigned int i1 = 0; i1 < stripsData.size(); i1++) {
if ( info.version < VER_3_3_0_13 ) {
- NifStream( (unsigned int)&(*stripsData[i1]), out, info );
+ WritePtr32( &(*stripsData[i1]), out );
} else {
if ( stripsData[i1] != NULL ) {
NifStream( link_map.find( StaticCast<NiObject>(stripsData[i1]) )->second, out, info );
diff --git a/src/obj/bhkPackedNiTriStripsShape.cpp b/src/obj/bhkPackedNiTriStripsShape.cpp
index 4245610586c9f00e71467c3b1936f2d41f19b7e7..f7ae039a7567531e214813f41632f094b588c936 100644
--- a/src/obj/bhkPackedNiTriStripsShape.cpp
+++ b/src/obj/bhkPackedNiTriStripsShape.cpp
@@ -99,7 +99,7 @@ void bhkPackedNiTriStripsShape::Write( ostream& out, const map<NiObjectRef,unsig
NifStream( scale, out, info );
NifStream( unknownFloat4, out, info );
if ( info.version < VER_3_3_0_13 ) {
- NifStream( (unsigned int)&(*data), out, info );
+ WritePtr32( &(*data), out );
} else {
if ( data != NULL ) {
NifStream( link_map.find( StaticCast<NiObject>(data) )->second, out, info );
diff --git a/src/obj/bhkRigidBody.cpp b/src/obj/bhkRigidBody.cpp
index be8a9f3d77d9757325a11085bb12ae2077fe1f94..7d732edd90835a8b15ca38e7c4926e1de0b8e9c6 100644
--- a/src/obj/bhkRigidBody.cpp
+++ b/src/obj/bhkRigidBody.cpp
@@ -147,7 +147,7 @@ void bhkRigidBody::Write( ostream& out, const map<NiObjectRef,unsigned int> & li
NifStream( numConstraints, out, info );
for (unsigned int i1 = 0; i1 < constraints.size(); i1++) {
if ( info.version < VER_3_3_0_13 ) {
- NifStream( (unsigned int)&(*constraints[i1]), out, info );
+ WritePtr32( &(*constraints[i1]), out );
} else {
if ( constraints[i1] != NULL ) {
NifStream( link_map.find( StaticCast<NiObject>(constraints[i1]) )->second, out, info );
diff --git a/src/obj/bhkTransformShape.cpp b/src/obj/bhkTransformShape.cpp
index 7382246f90cd86a05fd3694bdbf24d63cb5fdc11..b9554e3c4c1b3adf27b94d4b0712804ee26c7196 100644
--- a/src/obj/bhkTransformShape.cpp
+++ b/src/obj/bhkTransformShape.cpp
@@ -63,7 +63,7 @@ void bhkTransformShape::Write( ostream& out, const map<NiObjectRef,unsigned int>
bhkShape::Write( out, link_map, info );
if ( info.version < VER_3_3_0_13 ) {
- NifStream( (unsigned int)&(*shape), out, info );
+ WritePtr32( &(*shape), out );
} else {
if ( shape != NULL ) {
NifStream( link_map.find( StaticCast<NiObject>(shape) )->second, out, info );
diff --git a/src/obj/bhkWorldObject.cpp b/src/obj/bhkWorldObject.cpp
index c9c5ca4b3e70a003b6a8ded1acb43ffa76559fd3..ff982376c90acdc5a3fa4ad99dba2882cf7fae8d 100644
--- a/src/obj/bhkWorldObject.cpp
+++ b/src/obj/bhkWorldObject.cpp
@@ -60,7 +60,7 @@ void bhkWorldObject::Write( ostream& out, const map<NiObjectRef,unsigned int> &
bhkSerializable::Write( out, link_map, info );
if ( info.version < VER_3_3_0_13 ) {
- NifStream( (unsigned int)&(*shape), out, info );
+ WritePtr32( &(*shape), out );
} else {
if ( shape != NULL ) {
NifStream( link_map.find( StaticCast<NiObject>(shape) )->second, out, info );