From e3070e708816c3a6ab61816c9cd0e242763b6aa2 Mon Sep 17 00:00:00 2001
From: Steven Fuller <relnev@icculus.org>
Date: Sat, 3 May 2008 22:18:51 -0700
Subject: Removed UseOldChunkLoader.

---
 src/win95/obchunk.cpp | 167 --------------------------------------------------
 1 file changed, 167 deletions(-)

(limited to 'src/win95/obchunk.cpp')

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)
-- 
cgit v1.3