Removed UseOldChunkLoader.

12 files changed, 5 insertions, 638 deletions

diff --git a/src/avp/win95/avpchunk.cpp b/src/avp/win95/avpchunk.cpp
index d6780df..0a06093 100644
--- a/src/avp/win95/avpchunk.cpp
+++ b/src/avp/win95/avpchunk.cpp
@@ -58,38 +58,7 @@ size_t AVP_Generator_Chunk::size_chunk ()
 	return(chunk_size);
 	
 }
-#if UseOldChunkLoader
-AVP_Generator_Chunk::AVP_Generator_Chunk (Chunk_With_Children * parent, const char * data, size_t /*size*/)
-: Chunk (parent, "AVPGENER")
-{
-	location = *((ChunkVector *) data);
-	data += sizeof(ChunkVector);
-	
-	orientation = *((int *) data);
-	data += 4;
-	
-	type = *((int *) data);
-	data += 4;
 
-	flags = *((int *) data);
-	data += 4;
-	
-	textureID = *(data);
-	data ++;
-	
-	sub_type = *(data);
-	data ++;
-	
-	extra1 = *(unsigned char*)(data);
-	data ++;
-	
-	extra2 = *(unsigned char*)(data);
-	data ++;
-	
-	name = new char [strlen(data) + 1];
-	strcpy (name, data);
-}
-#else
 AVP_Generator_Chunk::AVP_Generator_Chunk (Chunk_With_Children * parent, const char * data, size_t /*size*/)
 : Chunk (parent, "AVPGENER")
 {
@@ -120,8 +89,6 @@ AVP_Generator_Chunk::AVP_Generator_Chunk (Chunk_With_Children * parent, const ch
 	name = new char [strlen(data) + 1];
 	strcpy (name, data);
 }
-#endif
-
 
 
 AVP_Generator_Chunk::~AVP_Generator_Chunk ()
@@ -461,19 +428,7 @@ AVP_Player_Start_Chunk::AVP_Player_Start_Chunk(Chunk_With_Children* parent)
 	moduleID.id2=0;
 
 }
-#if UseOldChunkLoader
-AVP_Player_Start_Chunk::AVP_Player_Start_Chunk(Chunk_With_Children* parent,const char* data,size_t)
-:Chunk(parent,"AVPSTART")
-{
-	location=*(ChunkVector*)data;
-	data+=sizeof(ChunkVector);
-	orientation=*(ChunkMatrix*)data;
-	data+=sizeof(ChunkMatrix);
-	spare1=*(int*)data;
-	data+=4;	
-	spare2=*(int*)data;
-}
-#else
+
 AVP_Player_Start_Chunk::AVP_Player_Start_Chunk(Chunk_With_Children* parent,const char* data,size_t)
 :Chunk(parent,"AVPSTART")
 {
@@ -481,7 +436,6 @@ AVP_Player_Start_Chunk::AVP_Player_Start_Chunk(Chunk_With_Children* parent,const
 	CHUNK_EXTRACT(orientation,ChunkMatrix)
 	CHUNK_EXTRACT(moduleID,ObjectID)
 }
-#endif
 
 void AVP_Player_Start_Chunk::fill_data_block (char * data)
 {
diff --git a/src/avp/win95/strachnk.cpp b/src/avp/win95/strachnk.cpp
index 11223c6..1a45a6b 100644
--- a/src/avp/win95/strachnk.cpp
+++ b/src/avp/win95/strachnk.cpp
@@ -336,29 +336,6 @@ Virtual_Object_Properties_Chunk::Virtual_Object_Properties_Chunk(Chunk_With_Chil
 	CalculateID();
 }
 
-#if UseOldChunkLoader
-Virtual_Object_Properties_Chunk::Virtual_Object_Properties_Chunk(Chunk_With_Children* parent,const char* data,size_t)
-:Chunk(parent,"VOBJPROP")
-{
-	location=*(ChunkVector*)data;
-	data+=sizeof(ChunkVector);
-	size=*(double*)data;
-	data+=sizeof(double);
-	
-	int length=strlen(data);
-	name=new char[length+1];
-	strcpy(name,data);
-	data+=(length+4)&~3;
-	
-	ID=*(ObjectID*)data;
-	data+=sizeof(ObjectID);
-
-	pad1=*(int*)data;
-	data+=sizeof(int);				
-	pad2=*(int*)data;
-	data+=sizeof(int);				
-}
-#else
 Virtual_Object_Properties_Chunk::Virtual_Object_Properties_Chunk(Chunk_With_Children* parent,const char* data,size_t)
 :Chunk(parent,"VOBJPROP")
 {
@@ -380,7 +357,6 @@ Virtual_Object_Properties_Chunk::Virtual_Object_Properties_Chunk(Chunk_With_Chil
 	pad2=*(int*)data;
 	data+=sizeof(int);				
 }
-#endif
 
 Virtual_Object_Properties_Chunk::~Virtual_Object_Properties_Chunk()
 {
@@ -1157,24 +1133,6 @@ void MultiSwitchStrategy::fill_data_block(char* data)
 	*(int*)data=flags;	
 }
 ////////////////////////////////////////////////////////////////////////
-#if UseOldChunkLoader
-AreaSwitchStrategy::AreaSwitchStrategy(const char* data_start,size_t size)
-:MultiSwitchStrategy(data_start,size)
-{
-	data_start+=MultiSwitchStrategy::GetStrategySize();
-	
-	trigger_min=*(ChunkVector*)data_start;
-	data_start+=sizeof(ChunkVector);	
-	trigger_max=*(ChunkVector*)data_start;
-	data_start+=sizeof(ChunkVector);	
-	
-	area_pad1=*(int*)data_start;
-	data_start+=4;
-	area_pad2=*(int*)data_start;
-	data_start+=4;
-
-}
-#else
 AreaSwitchStrategy::AreaSwitchStrategy(const char* data_start,size_t size)
 :MultiSwitchStrategy(data_start,size)
 {
@@ -1191,9 +1149,6 @@ AreaSwitchStrategy::AreaSwitchStrategy(const char* data_start,size_t size)
 	data_start+=4;
 
 }
-#endif
-
-
 
 size_t AreaSwitchStrategy::GetStrategySize()
 {
diff --git a/src/win95/animobs.cpp b/src/win95/animobs.cpp
index e8b4bb1..56539f5 100644
--- a/src/win95/animobs.cpp
+++ b/src/win95/animobs.cpp
@@ -55,40 +55,6 @@ void Object_Animation_Sequence_Frame_Chunk::fill_data_block (char *data_start)
 	
 }
 
-#if UseOldChunkLoader
-Object_Animation_Sequence_Frame_Chunk::Object_Animation_Sequence_Frame_Chunk (Object_Animation_Sequence_Chunk * parent,const char *data_start, size_t)
-: Chunk (parent, "OBASEQFR")
-{
-	orientation.x = -(*(double *) data_start);
-	data_start += 8;
-	orientation.y = -(*(double *) data_start);
-	data_start += 8;
-	orientation.z = -(*(double *) data_start);
-	data_start += 8;
-	orientation.w = (*(double *) data_start);
-	data_start += 8;
-
-	transform.x = *((double *) data_start);
-	data_start += 8;
-	transform.y = *((double *) data_start);
-	data_start += 8;
-	transform.z = *((double *) data_start);
-	data_start += 8;
-
-	at_frame_no = *((int *) data_start);
-	data_start += 4;
-	
-	frame_ref_no = *((int *) data_start);
-	data_start += 4;
-	
-	flags = *((int *) data_start);
-	data_start += 4;
-	
-	num_extra_data=0;
-	extra_data=0;
-	
-}
-#else
 Object_Animation_Sequence_Frame_Chunk::Object_Animation_Sequence_Frame_Chunk (Chunk_With_Children * parent,const char *data_start, size_t)
 : Chunk (parent, "OBASEQFR")
 {
@@ -133,7 +99,6 @@ Object_Animation_Sequence_Frame_Chunk::Object_Animation_Sequence_Frame_Chunk (Ch
 	}
 	
 }
-#endif
 
 void Object_Animation_Sequence_Frame_Chunk::set_sound_index(int ind)
 {
@@ -193,31 +158,6 @@ Object_Animation_Sequence_Header_Chunk::~Object_Animation_Sequence_Header_Chunk(
 		delete extra_data;
 }
 
-
-#if UseOldChunkLoader
-Object_Animation_Sequence_Header_Chunk::Object_Animation_Sequence_Header_Chunk (Chunk_With_Children * parent,const char * data_start, size_t)
-: Chunk (parent, "OBASEQHD"), sequence_name (0)
-{
-	num_frames = *((int *) data_start);
-	data_start += 4;
-
-	sequence_number = *((int *) data_start);
-	data_start += 4;
-
-	sub_sequence_number = *((int *) data_start);
-	data_start += 4;
-
-	num_extra_data=0;
-	extra_data=0;
-	data_start+=40;
-	
-	if (strlen(data_start))
-	{
-		sequence_name = new char [strlen(data_start) + 1];
-		strcpy (sequence_name, data_start);
-	}
-}
-#else
 Object_Animation_Sequence_Header_Chunk::Object_Animation_Sequence_Header_Chunk (Chunk_With_Children * parent,const char * data_start, size_t)
 : Chunk (parent, "OBASEQHD"), sequence_name (0)
 {
@@ -252,9 +192,6 @@ Object_Animation_Sequence_Header_Chunk::Object_Animation_Sequence_Header_Chunk (
 		strcpy (sequence_name, data_start);
 	}
 }
-#endif
-
-
 
 Object_Animation_Sequence_Header_Chunk * Object_Animation_Sequence_Chunk::get_header()
 {
diff --git a/src/win95/chnktype.cpp b/src/win95/chnktype.cpp
index 754dc7d..6bef4de 100644
--- a/src/win95/chnktype.cpp
+++ b/src/win95/chnktype.cpp
@@ -446,10 +446,6 @@ ChunkShape::~ChunkShape()
 	if (texture_fns)
 		for (int i = 0; i<num_texfiles; i++)
 			if (texture_fns[i]) delete texture_fns[i];
-
-	#if UseOldChunkLoader
-	if(float_v_list) delete float_v_list;
-	#endif
 }
 
 ChunkShape::ChunkShape()
@@ -467,10 +463,6 @@ ChunkShape::ChunkShape()
 	texture_fns = 0;		
 
 	radius_about_centre=0;
-
-	#if UseOldChunkLoader
-	float_v_list=0;
-	#endif
 }
 
 
@@ -532,10 +524,6 @@ ChunkShape::ChunkShape(const ChunkShape &shp)
 
 	centre=shp.centre;
 	radius_about_centre=shp.radius_about_centre;
-
-	#if UseOldChunkLoader
-	float_v_list=0;
-	#endif
 }
 
 ChunkShape& ChunkShape::operator=(const ChunkShape &shp)
@@ -608,13 +596,7 @@ ChunkShape& ChunkShape::operator=(const ChunkShape &shp)
 	centre=shp.centre;
 	radius_about_centre=shp.radius_about_centre;
 
-	#if UseOldChunkLoader
-	if(float_v_list) delete float_v_list;
-	float_v_list=0;
-	#endif
-
 	return *this;
-
 }
 
 void ChunkShape::rescale (double scale)
@@ -648,33 +630,14 @@ void ChunkShape::rescale (double scale)
 
 VMod_Arr_Item::VMod_Arr_Item()
 {
-	#if UseOldChunkLoader
-	o_name = 0;
-	#endif
 }
 
 VMod_Arr_Item::~VMod_Arr_Item()
 {
-	#if UseOldChunkLoader
-	if (o_name)
-		delete o_name;
-	#endif
 }
 
 VMod_Arr_Item::VMod_Arr_Item(const VMod_Arr_Item & vma)
 {
-	#if UseOldChunkLoader
-	if (vma.o_name)
-	{
-		o_name = new char [strlen(vma.o_name)+1];
-		strcpy (o_name, vma.o_name);
-	}
-	else
-	{
-		o_name = 0;
-	}
-	#endif
-
 	branch_no = vma.branch_no;
 	flags = vma.flags;
 	spare = vma.spare;
@@ -685,21 +648,6 @@ VMod_Arr_Item& VMod_Arr_Item::operator=(const VMod_Arr_Item & vma)
 {
 	if (&vma == this) return(*this);
 
-	#if UseOldChunkLoader
-	if (o_name)
-		delete o_name;
-
-	if (vma.o_name)
-	{
-		o_name = new char [strlen(vma.o_name)+1];
-		strcpy (o_name, vma.o_name);
-	}
-	else
-	{
-		o_name = 0;
-	}
-	#endif
-
 	branch_no = vma.branch_no;
 	flags = vma.flags;
 	spare = vma.spare;
@@ -726,9 +674,6 @@ BOOL operator!=(const VMod_Arr_Item & vm1, const VMod_Arr_Item & vm2)
 Adjacent_Module::Adjacent_Module()
 {
 	flags = 0;
-	#if UseOldChunkLoader
-	o_name = 0;
-	#endif
 	entry_point.x=0;
 	entry_point.y=0;
 	entry_point.z=0;
@@ -736,25 +681,10 @@ Adjacent_Module::Adjacent_Module()
 
 Adjacent_Module::~Adjacent_Module()
 {
-	#if UseOldChunkLoader
-	if (o_name)
-		delete o_name;
-	#endif
 }
 
 Adjacent_Module::Adjacent_Module(const Adjacent_Module & am)
 {
-	#if UseOldChunkLoader
-	if (am.o_name)
-	{
-		o_name = new char [strlen(am.o_name)+1];
-		strcpy (o_name, am.o_name);
-	}
-	else
-	{
-		o_name = 0;
-	}
-	#endif
 	object_index=am.object_index;
 	flags = am.flags;
 	entry_point = am.entry_point;
@@ -764,21 +694,6 @@ Adjacent_Module& Adjacent_Module::operator=(const Adjacent_Module & am)
 {
 	if (&am == this) return(*this);
 
-	#if UseOldChunkLoader
-	if (o_name)
-		delete o_name;
-
-	if (am.o_name)
-	{
-		o_name = new char [strlen(am.o_name)+1];
-		strcpy (o_name, am.o_name);
-	}
-	else
-	{
-		o_name = 0;
-	}
-	#endif
-
 	object_index=am.object_index;
 	flags = am.flags;
 	entry_point = am.entry_point;
diff --git a/src/win95/chnktype.hpp b/src/win95/chnktype.hpp
index c35e8d4..b53a507 100644
--- a/src/win95/chnktype.hpp
+++ b/src/win95/chnktype.hpp
@@ -177,10 +177,6 @@ struct ChunkShape
 	int num_verts;
 	ChunkVectorInt * v_list;
 
-	#if UseOldChunkLoader
-	ChunkVector * float_v_list;
-	#endif
-
 	//int num_vert_normals; //I don't think num_vert_normals is ever used
 	ChunkVectorFloat * v_normal_list;
 
@@ -195,7 +191,6 @@ struct ChunkShape
 	char ** texture_fns;
 
 	void rescale (double);
-
 };
 
 struct ChunkQuat
@@ -217,13 +212,8 @@ struct ObjectID
 
 struct ChunkObject
 {
-
 	ChunkVectorInt location;
 
-	#if UseOldChunkLoader
-	ChunkVector float_location;
-	#endif
-
 	ChunkQuat orientation;
 
 	BOOL is_base_object;
@@ -233,7 +223,6 @@ struct ChunkObject
 	int index_num; //this won't get changed by update_my_chunkobject
 
 	ObjectID ID;
-
 };
 
 
@@ -250,13 +239,8 @@ struct VMod_Arr_Item
 	int spare;
 	int object_index;
 	
-	#if UseOldChunkLoader
-	char * o_name; //replaced by object_index
-	#endif
-
 	friend BOOL operator==(const VMod_Arr_Item &, const VMod_Arr_Item &);
-	friend BOOL operator!=(const VMod_Arr_Item &, const VMod_Arr_Item &);
-	
+	friend BOOL operator!=(const VMod_Arr_Item &, const VMod_Arr_Item &);	
 };
 
 struct Adjacent_Module
@@ -271,13 +255,8 @@ struct Adjacent_Module
 	ChunkVectorInt entry_point;
 	int object_index;
 
-	#if UseOldChunkLoader
-	char * o_name;
-	#endif 
-
 	friend BOOL operator==(const Adjacent_Module & am1, const Adjacent_Module & am2);
-	friend BOOL operator!=(const Adjacent_Module & am1, const Adjacent_Module & am2);
-	
+	friend BOOL operator!=(const Adjacent_Module & am1, const Adjacent_Module & am2);	
 };
 
 class Shape_Chunk;
diff --git a/src/win95/fragchnk.cpp b/src/win95/fragchnk.cpp
index dc998d7..1affcc7 100644
--- a/src/win95/fragchnk.cpp
+++ b/src/win95/fragchnk.cpp
@@ -99,30 +99,6 @@ Fragment_Type_Shape_Chunk::Fragment_Type_Shape_Chunk(Chunk_With_Children* parent
 	pad1=pad2=pad3=0;
 }
 
-#if UseOldChunkLoader
-Fragment_Type_Shape_Chunk::Fragment_Type_Shape_Chunk(Chunk_With_Children* const parent,const char* data,size_t const )
-:Chunk(parent,"FRGTYPSC")
-{
-	int length=strlen(data)+1;
-	name=new char[length];
-	strcpy(name,data);
-	data+=(length+3)&~3;
-
-	num_fragments=*(int*)data;
-	data+=4;
-
-	location=*(ChunkVector*)data;
-	data+=sizeof(ChunkVector);
-
-	
-	pad1=*(int*)data;
-	data+=4;
-	pad2=*(int*)data;
-	data+=4;
-	pad3=*(int*)data;
-	data+=4;
-};
-#else
 Fragment_Type_Shape_Chunk::Fragment_Type_Shape_Chunk(Chunk_With_Children* const parent,const char* data,size_t const )
 :Chunk(parent,"FRGTYPSC")
 {
@@ -145,7 +121,6 @@ Fragment_Type_Shape_Chunk::Fragment_Type_Shape_Chunk(Chunk_With_Children* const
 	pad3=*(int*)data;
 	data+=4;
 }
-#endif
 
 Fragment_Type_Shape_Chunk::~Fragment_Type_Shape_Chunk()
 {
diff --git a/src/win95/hierchnk.cpp b/src/win95/hierchnk.cpp
index 22d4844..56d4437 100644
--- a/src/win95/hierchnk.cpp
+++ b/src/win95/hierchnk.cpp
@@ -135,23 +135,6 @@ void Object_Hierarchy_Data_Chunk::fill_data_block (char *data_start)
 	
 }
 
-#if UseOldChunkLoader
-Object_Hierarchy_Data_Chunk::Object_Hierarchy_Data_Chunk (Object_Hierarchy_Chunk * parent, const char * data_start, size_t /*ssize*/)
-: Chunk (parent, "OBJHIERD"), object(0), ob_name (0)
-{
-	
-	num_extra_data=0;
-	extra_data=0;
-
-	data_start+=40;
-		
-	if (strlen(data_start))
-	{
-		ob_name = new char [strlen(data_start) + 1];
-		strcpy (ob_name, data_start);
-	}
-}
-#else
 Object_Hierarchy_Data_Chunk::Object_Hierarchy_Data_Chunk (Chunk_With_Children * parent, const char * data_start, size_t /*ssize*/)
 : Chunk (parent, "OBJHIERD"), object(0), ob_name (0)
 {
@@ -176,7 +159,6 @@ Object_Hierarchy_Data_Chunk::Object_Hierarchy_Data_Chunk (Chunk_With_Children *
 		strcpy (ob_name, data_start);
 	}
 }
-#endif
 
 void Object_Hierarchy_Data_Chunk::post_input_processing ()
 {
@@ -574,18 +556,6 @@ size_t Hierarchy_Degradation_Distance_Chunk::size_chunk()
 
 RIF_IMPLEMENT_DYNCREATE("HIERBBOX",Hierarchy_Bounding_Box_Chunk)
 
-#if UseOldChunkLoader
-Hierarchy_Bounding_Box_Chunk::Hierarchy_Bounding_Box_Chunk(Chunk_With_Children* parent,const char* data,size_t datasize)
-:Chunk(parent,"HIERBBOX")
-{
-	assert(datasize==2*sizeof(ChunkVector));
-	
-		
-	min=*(ChunkVector*)data;
-	data+=sizeof(ChunkVector);
-	max=*(ChunkVector*)data;
-}
-#else
 Hierarchy_Bounding_Box_Chunk::Hierarchy_Bounding_Box_Chunk(Chunk_With_Children* parent,const char* data,size_t datasize)
 :Chunk(parent,"HIERBBOX")
 {
@@ -595,7 +565,7 @@ Hierarchy_Bounding_Box_Chunk::Hierarchy_Bounding_Box_Chunk(Chunk_With_Children*
 	data+=sizeof(ChunkVectorInt);
 	max=*(ChunkVectorInt*)data;
 }
-#endif
+
 void Hierarchy_Bounding_Box_Chunk::fill_data_block(char* data_start)
 {
 	strncpy (data_start, identifier, 8);
diff --git a/src/win95/ltchunk.cpp b/src/win95/ltchunk.cpp
index 2446830..0a50010 100644
--- a/src/win95/ltchunk.cpp
+++ b/src/win95/ltchunk.cpp
@@ -118,60 +118,7 @@ void Light_Chunk::fill_data_block ( char * data_start)
 	*((int *) data_start) = light.pad2;
 	
 }
-#if UseOldChunkLoader
-Light_Chunk::Light_Chunk(Light_Set_Chunk * parent, const char * data, size_t const /*size*/)
-: Chunk (parent, "STDLIGHT")
-{
-	light.light_number = *((int *) data);
-	data += 4;
-
-	light.location = *((ChunkVector *) data);
-	data += sizeof(ChunkVector);
-	
-	light.orientation.mat11 = (int) *((double *) data);
-	data += 8;
-	light.orientation.mat12 = (int) *((double *) data);
-	data += 8;
-	light.orientation.mat13 = (int) *((double *) data);
-	data += 8;
-	light.orientation.mat21 = (int) *((double *) data);
-	data += 8;
-	light.orientation.mat22 = (int) *((double *) data);
-	data += 8;
-	light.orientation.mat23 = (int) *((double *) data);
-	data += 8;
-	light.orientation.mat31 = (int) *((double *) data);
-	data += 8;
-	light.orientation.mat32 = (int) *((double *) data);
-	data += 8;
-	light.orientation.mat33 = (int) *((double *) data);
-	data += 8;
-
-	light.brightness = *((int *) data);
-	data += 4;
-	light.spread = *((int *) data);
-	data += 4;
-	light.range = *((int *) data);
-	data += 4;
-
-	light.colour = *((int *) data);
-	data += 4;
-
-	light.engine_light_flags = *((int *) data);
-	data += 4;
-	light.local_light_flags = *((int *) data);
-	data += 4;
 
-	light.pad1 = *((int *) data);
-	data += 4;
-	light.pad2 = *((int *) data);
-	
-	#if engine || cencon
-	light_added_to_module = FALSE;
-	#endif
-		
-}
-#else
 Light_Chunk::Light_Chunk(Chunk_With_Children * parent, const char * data, size_t const /*size*/)
 : Chunk (parent, "STDLIGHT")
 {
@@ -208,7 +155,6 @@ Light_Chunk::Light_Chunk(Chunk_With_Children * parent, const char * data, size_t
 	#endif
 		
 }
-#endif
 
 #if InterfaceEngine
 AVP_Strategy_Chunk* Light_Chunk::GetStrategyChunk()
diff --git a/src/win95/mishchnk.cpp b/src/win95/mishchnk.cpp
index 4c92dd7..649eed2 100644
--- a/src/win95/mishchnk.cpp
+++ b/src/win95/mishchnk.cpp
@@ -396,13 +396,6 @@ File_Chunk::File_Chunk(const char * file_name)
 		return;
 	}	
 
-	#if UseOldChunkLoader
-	if (strncmp (id_buffer, "REBINFLF", 8)) {
-		error_code = CHUNK_FAILED_ON_LOAD_NOT_RECOGNISED;
-		fclose(rif_file);
-		return;
-	}	
-	#else
 	/* KJL 16:46:14 19/09/98 - check for a compressed rif */
 	if (!strncmp (id_buffer, COMPRESSED_RIF_IDENTIFIER, 8))
 	{
@@ -414,7 +407,7 @@ File_Chunk::File_Chunk(const char * file_name)
 		fclose(rif_file);
 		return;
 	}	
-	#endif
+
 	buffer = new char [file_size];
 
 	/* KJL 17:57:44 19/09/98 - if the rif is compressed, we must load the whole
diff --git a/src/win95/obchunk.cpp b/src/win95/obchunk.cpp
index 67fb263..6f159d8 100644
--- a/src/win95/obchunk.cpp
+++ b/src/win95/obchunk.cpp
@@ -431,41 +431,6 @@ ObjectID Object_Chunk::CalculateID()
 RIF_IMPLEMENT_DYNCREATE("OBJHEAD1",Object_Header_Chunk)
 
 // from buffer
-#if UseOldChunkLoader
-Object_Header_Chunk::Object_Header_Chunk(Object_Chunk * parent, const char * hdata, size_t /*hsize*/)
-: Chunk (parent, "OBJHEAD1"), object_data (parent->object_data_store),
-flags(0), version_no (0), associated_shape (0)
-{
-	flags = *((int *) hdata);
-
-	if (flags & OBJECT_FLAG_BASE_OBJECT)
-		parent->object_data_store->is_base_object = TRUE;
-	else
-	{
-		parent->object_data_store->is_base_object = FALSE;
-	}
-
-	strncpy (lock_user, (hdata + 4), 16);
-	lock_user[16] = '\0';
-
-	parent->object_data_store->float_location = *((ChunkVector *) (hdata + 20));
-	parent->object_data_store->location = parent->object_data_store->float_location;
-	
-	parent->object_data_store->orientation.x =- *((double *) (hdata + 44));
-	parent->object_data_store->orientation.y =- *((double *) (hdata + 52));
-	parent->object_data_store->orientation.z =- *((double *) (hdata + 60));
-	parent->object_data_store->orientation.w = *((double *) (hdata + 68));
-
-	version_no = *((int *) (hdata + 76));
-
-	shape_id_no = *((int *) (hdata + 80));
-
-	strcpy (parent->object_data_store->o_name, (hdata + 84));
-	parent->object_data_store->ID.id1=0;
-	parent->object_data_store->ID.id2=0;
-	parent->object_data_store->index_num=-1;
-}
-#else
 Object_Header_Chunk::Object_Header_Chunk(Chunk_With_Children * parent, const char * hdata, size_t /*hsize*/)
 : Chunk (parent, "OBJHEAD1"), object_data (((Object_Chunk*)parent)->object_data_store),
 flags(0), version_no (0), associated_shape (0)
@@ -505,7 +470,6 @@ flags(0), version_no (0), associated_shape (0)
 	parent_object->object_data_store->ID.id1=0;
 	parent_object->object_data_store->ID.id2=0;
 }
-#endif
 
 //from data
 
@@ -772,49 +736,6 @@ size_t VModule_Array_Chunk::size_chunk()
 		
 }
 
-#if UseOldChunkLoader
-VModule_Array_Chunk::VModule_Array_Chunk (Object_Module_Data_Chunk * parent, const char * vmdata, size_t /*vmsize*/)
-: Chunk (parent, "VMDARRAY")
-{
-	num_array_items = *((int *) vmdata);
-
-	vmdata += 4;
-	
-	vmod_array = new VMod_Arr_Item [num_array_items];
-
-	for (int i=0; i<num_array_items; i++)
-	{
-		//vmod_array[i].type = *((int *) vmdata);
-		vmdata += 4;
-		vmod_array[i].branch_no = *((int *) vmdata);
-		vmdata += 4;
-		
-		//vmod_array[i].dir.x = *((double *) vmdata);
-		vmdata += 8;
-		//vmod_array[i].dir.y = *((double *) vmdata);
-		vmdata += 8;
-		//vmod_array[i].dir.z = *((double *) vmdata);
-		vmdata += 8;
-		
-		//vmod_array[i].angle = *((double *) vmdata);
-		vmdata += 8;
-
-		vmod_array[i].flags = *((int *) vmdata);
-		vmdata += 4;
-
-		vmod_array[i].spare = *((int *) vmdata);
-		vmdata += 4;
-
-		vmod_array[i].object_index=-1;
-
-		vmod_array[i].o_name = new char [strlen(vmdata) + 1];
-		strcpy (vmod_array[i].o_name, vmdata);
-		vmdata += (strlen(vmod_array[i].o_name) + 1) + (4-(strlen(vmod_array[i].o_name) + 1)%4)%4;
-			
-	}
-
-}
-#else
 VModule_Array_Chunk::VModule_Array_Chunk (Chunk_With_Children * parent, const char * vmdata, size_t /*vmsize*/)
 : Chunk (parent, "VMDARRAY")
 {
@@ -842,7 +763,6 @@ VModule_Array_Chunk::VModule_Array_Chunk (Chunk_With_Children * parent, const ch
 	}
 
 }
-#endif
 
 VModule_Array_Chunk::~VModule_Array_Chunk ()
 {
@@ -959,35 +879,6 @@ size_t Adjacent_Module_Entry_Points_Chunk::size_chunk()
 	return(chunk_size);
 }
 
-#if UseOldChunkLoader
-Adjacent_Module_Entry_Points_Chunk::Adjacent_Module_Entry_Points_Chunk (Object_Module_Data_Chunk * parent, const char * data, size_t /*size*/)
-: Chunk (parent, "ADJMDLEP")
-{
-	int num_array_items = *((int *) data);
-
-	data += 4;
-	
-	for (int i=0; i<num_array_items; i++)
-	{
-		Adjacent_Module am;
-
-		am.flags = *((int *) data);
-		data += 4;
-
-		am.entry_point = *((ChunkVector *) data);
-		data += sizeof(ChunkVector);
-
-		am.o_name = new char [strlen(data) + 1];
-		strcpy (am.o_name, data);
-		data += (strlen(am.o_name) + 4)&~3;
-
-		am.object_index=-1;
-		
-		adjacent_modules_list.add_entry(am);	
-			
-	}
-}
-#else
 Adjacent_Module_Entry_Points_Chunk::Adjacent_Module_Entry_Points_Chunk (Chunk_With_Children * parent, const char * data, size_t /*size*/)
 : Chunk (parent, "ADJMDLEP")
 {
@@ -1014,7 +905,6 @@ Adjacent_Module_Entry_Points_Chunk::Adjacent_Module_Entry_Points_Chunk (Chunk_Wi
 	}
 
 }
-#endif
 
 ///////////////////////////////////////
 RIF_IMPLEMENT_DYNCREATE("MODFLAGS",Module_Flag_Chunk)
@@ -1174,62 +1064,6 @@ size_t Object_Track_Chunk2::size_chunk ()
 	return(chunk_size);
 }
 
-#if UseOldChunkLoader
-Object_Track_Chunk2::Object_Track_Chunk2 (Chunk_With_Children * parent,const char * data, size_t /*size*/)
-: Chunk (parent, "OBJTRAK2")
-{
-	num_sections=*(int*)data;
-	data+=4;
-
-	if(num_sections)
-		sections=new ChunkTrackSection[num_sections];
-	else
-		sections=0;
-
-	for(int i=0;i<num_sections;i++)
-	{
-		sections[i].quat_start.w=(*(int*)data)/65536.0;
-		data+=4;
-		sections[i].quat_start.x=(*(int*)data)/-65536.0;
-		data+=4;
-		sections[i].quat_start.y=(*(int*)data)/-65536.0;
-		data+=4;
-		sections[i].quat_start.z=(*(int*)data)/-65536.0;
-		data+=4;
-		
-		sections[i].quat_end.w=(*(int*)data)/65536.0;
-		data+=4;
-		sections[i].quat_end.x=(*(int*)data)/-65536.0;
-		data+=4;
-		sections[i].quat_end.y=(*(int*)data)/-65536.0;
-		data+=4;
-		sections[i].quat_end.z=(*(int*)data)/-65536.0;
-		data+=4;
-		
-
-		sections[i].pivot_start=*(ChunkVector*)data;
-		data+=sizeof(ChunkVector);
-		sections[i].pivot_end=*(ChunkVector*)data;
-		data+=sizeof(ChunkVector);
-		sections[i].object_offset=*(ChunkVector*)data;
-		data+=sizeof(ChunkVector);
-
-		sections[i].time_for_section=*(int*)data;
-		data+=sizeof(int);
-		sections[i].spare=*(int*)data;
-		data+=sizeof(int);
-		
-		
-	}
-
-	flags=*(int*)data;
-	flags|=TrackFlag_QuatProblemSorted;
-	data+=4;
-	spare2=*(int*)timer_start;
-	
-	
-}
-#else
 Object_Track_Chunk2::Object_Track_Chunk2 (Chunk_With_Children * parent,const char * data, size_t /*size*/)
 : Chunk (parent, "OBJTRAK2")
 {
@@ -1273,7 +1107,6 @@ Object_Track_Chunk2::Object_Track_Chunk2 (Chunk_With_Children * parent,const cha
 	}
 	
 }
-#endif
 
 ///////////////////////////////////////
 RIF_IMPLEMENT_DYNCREATE("TRAKSOUN",Object_Track_Sound_Chunk)
diff --git a/src/win95/wpchunk.cpp b/src/win95/wpchunk.cpp
index bc20a4f..927ca62 100644
--- a/src/win95/wpchunk.cpp
+++ b/src/win95/wpchunk.cpp
@@ -25,76 +25,6 @@ ModuleLink::~ModuleLink()
 
 RIF_IMPLEMENT_DYNCREATE("WAYPOINT",Module_Waypoint_Chunk)
 
-
-#if UseOldChunkLoader
-Module_Waypoint_Chunk::Module_Waypoint_Chunk(Chunk_With_Children* parent,const char* data,size_t datasize)
-:Chunk(parent,"WAYPOINT")
-{
-	NumWaypoints=*(int*)data;
-	data+=4;
-	if(NumWaypoints)
-	   	Waypoints=new ChunkWaypoint[NumWaypoints];
-	else
-		Waypoints=0;
-
-	for(int i=0;i<NumWaypoints;i++)
-	{
-		ChunkWaypoint* cw=&Waypoints[i];
-		cw->index=i;
-
-		cw->min=*(ChunkVector*)data;
-		data+=sizeof(ChunkVector);	
-		cw->max=*(ChunkVector*)data;
-		data+=sizeof(ChunkVector);	
-		cw->centre=*(ChunkVector*)data;
-		data+=sizeof(ChunkVector);	
-		
-		cw->flags=*(int*)data;
-		data+=4;	
-		cw->spare2=*(int*)data;
-		data+=4;	
-		
-		cw->NumWPLinks=*(int*)data;
-		data+=4;
-
-		if(cw->NumWPLinks)
-			cw->WayLinks=new WaypointLink[cw->NumWPLinks];
-		else
-			cw->WayLinks=0;
-		
-		for(int j=0;j<cw->NumWPLinks;j++)
-		{
-			cw->WayLinks[j]=*(WaypointLink*)data;
-			data+=sizeof(WaypointLink);
-		}
-			
-		cw->NumModLinks=*(int*)data;
-		data+=4;
-
-		if(cw->NumModLinks)
-			cw->ModLinks=new ModuleLink[cw->NumModLinks];
-		else
-			cw->ModLinks=0;
-
-		for(j=0;j<cw->NumModLinks;j++)
-		{
-			ModuleLink* ml=&cw->ModLinks[j];
-			ml->module_name=new char[strlen(data)+1];
-			strcpy(ml->module_name,data);
-			data+=(strlen(data)+4)&~3;
-			ml->flags=*(int*)data;
-			data+=4;
-		}
-
-		
-	}
-
-	spare1=*(int*)data;
-	data+=4;
-	spare2=*(int*)data;
-	data+=4;
-}
-#else
 Module_Waypoint_Chunk::Module_Waypoint_Chunk(Chunk_With_Children* parent,const char* data,size_t datasize)
 :Chunk(parent,"WAYPOINT")
 {
@@ -193,7 +123,6 @@ Module_Waypoint_Chunk::Module_Waypoint_Chunk(Chunk_With_Children* parent,const c
 	data+=4;
 
 }
-#endif
 
 Module_Waypoint_Chunk::Module_Waypoint_Chunk(Chunk_With_Children* parent)
 :Chunk(parent,"WAYPOINT")
@@ -493,23 +422,12 @@ Object_Chunk* AI_Module_Master_Chunk::get_my_object_chunk()
 
 RIF_IMPLEMENT_DYNCREATE("AIMODSLA",AI_Module_Slave_Chunk)
 
-#if UseOldChunkLoader
-AI_Module_Slave_Chunk::AI_Module_Slave_Chunk(Object_Module_Data_Chunk* parent,const char* data,size_t)
-:Chunk(parent,"AIMODSLA")
-{
-	MasterModule=0;
-	MasterModuleName=new char[strlen(data)+1];
-	strcpy(MasterModuleName,data);	
-	MasterModuleIndex=0;
-}
-#else
 AI_Module_Slave_Chunk::AI_Module_Slave_Chunk(Chunk_With_Children* parent,const char* data,size_t)
 :Chunk(parent,"AIMODSLA")
 {
 	MasterModule=0;
 	MasterModuleIndex=*(int*)data;
 }
-#endif
 
 AI_Module_Slave_Chunk::AI_Module_Slave_Chunk(Object_Module_Data_Chunk* parent,Object_Chunk* _MasterModule)
 :Chunk(parent,"AIMODSLA")
@@ -520,9 +438,6 @@ AI_Module_Slave_Chunk::AI_Module_Slave_Chunk(Object_Module_Data_Chunk* parent,Ob
 
 AI_Module_Slave_Chunk::~AI_Module_Slave_Chunk()
 {
-	#if UseOldChunkLoader
-	delete [] MasterModuleName;
-	#endif
 }
 
 size_t AI_Module_Slave_Chunk::size_chunk()
@@ -545,7 +460,6 @@ void AI_Module_Slave_Chunk::fill_data_block(char* data_start)
 
 void AI_Module_Slave_Chunk::post_input_processing()
 {
-	#if !UseOldChunkLoader
 	File_Chunk* fc=(File_Chunk*)GetRootChunk();
 	if(!strcmp(fc->identifier,"REBINFF2"))
 	{
@@ -572,7 +486,6 @@ void AI_Module_Slave_Chunk::post_input_processing()
 
 		}
 	}
-	#endif	
 }
 
 Object_Chunk* AI_Module_Slave_Chunk::get_my_object_chunk()
diff --git a/src/win95/wpchunk.hpp b/src/win95/wpchunk.hpp
index dbd34c4..8c5bd8f 100644
--- a/src/win95/wpchunk.hpp
+++ b/src/win95/wpchunk.hpp
@@ -95,9 +95,6 @@ class AI_Module_Slave_Chunk : public Chunk
 	Object_Chunk* get_my_object_chunk();
 
 	Object_Chunk* MasterModule;
-	#if UseOldChunkLoader
-	char* MasterModuleName;
-	#endif
 	int MasterModuleIndex;
 };