Added AParticleModifier as a test of the defines and the template generation script.

niflib.vcproj

@@ -134,6 +134,9 @@
 			Name="Source Files"
 			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
+			<File
+				RelativePath=".\obj\AParticleModifier.cpp">
+			</File>
 			<File
 				RelativePath=".\NIF_IO.cpp">
 			</File>
@@ -170,6 +173,9 @@
 			Name="Header Files"
 			Filter="h;hpp;hxx;hm;inl;inc;xsd"
 			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
+			<File
+				RelativePath=".\obj\AParticleModifier.h">
+			</File>
 			<File
 				RelativePath=".\NIF_IO.h">
 			</File>
@@ -179,6 +185,9 @@
 			<File
 				RelativePath=".\niflib.h">
 			</File>
+			<File
+				RelativePath=".\xml_extract.h">
+			</File>
 			<Filter
 				Name="obj"
 				Filter="">

obj/NiObject.h

@@ -44,6 +44,7 @@ POSSIBILITY OF SUCH DAMAGE. */
 #include <vector>
 #include "NIF_IO.h"
 #include "Ref.h"
+#include "xml_extract.h"
 
 using namespace std;
 

obj/NiObjectNET.h

@@ -4,7 +4,6 @@ All rights reserved.  Please see niflib.h for licence. */
 #ifndef _NIOBJECTNET_H_
 #define _NIOBJECTNET_H_
 
-#include "xml_extract.h"
 #include "NiObject.h"
 
 /*

xml_extract.h

@@ -46,7 +46,7 @@
 #define _XML_EXTRACT_H_
 
 #include "NIF_IO.h"
-#include "obj\NiObject.h"
+#include "obj\Ref.h"
 #include <iostream>
 #include <fstream>
 #include <vector>
@@ -1275,7 +1275,7 @@ NiObject::FixLinks( objects, link_stack, version ); \
 Ref<AParticleModifier > nextModifier; \
 AParticleModifier * previousModifier; \
 
-#define A_PARTICLE_MODIFIER_PARENTS NiObject \
+#define A_PARTICLE_MODIFIER_PARENTS NiObject
 
 #define A_PARTICLE_MODIFIER_CONSTRUCT \
 
@@ -1289,8 +1289,8 @@ link_stack.push_back( block_num ); \
 
 #define A_PARTICLE_MODIFIER_WRITE \
 NiObject::Write( out, link_map, version ); \
-NifStream( link_map[nextModifier], out, version ); \
-NifStream( link_map[previousModifier], out, version ); \
+NifStream( link_map[StaticCast<NiObject>(nextModifier)], out, version ); \
+NifStream( link_map[StaticCast<NiObject>(previousModifier)], out, version ); \
 
 #define A_PARTICLE_MODIFIER_STRING \
 stringstream out; \
@@ -1301,9 +1301,9 @@ return out.str(); \
 
 #define A_PARTICLE_MODIFIER_FIXLINKS \
 NiObject::FixLinks( objects, link_stack, version ); \
-nextModifier = blocks[link_stack.front()]; \
+nextModifier = DynamicCast<AParticleModifier>(objects[link_stack.front()]); \
 link_stack.pop_front(); \
-previousModifier = blocks[link_stack.front()]; \
+previousModifier = DynamicCast<AParticleModifier>(objects[link_stack.front()]); \
 link_stack.pop_front(); \
 
 #define A_P_SYS_MODIFIER_MEMBERS \