From e3070e708816c3a6ab61816c9cd0e242763b6aa2 Mon Sep 17 00:00:00 2001 From: Steven Fuller Date: Sat, 3 May 2008 22:18:51 -0700 Subject: [PATCH] Removed UseOldChunkLoader. --- src/avp/win95/avpchunk.cpp | 48 +---------- src/avp/win95/strachnk.cpp | 45 ---------- src/win95/animobs.cpp | 63 -------------- src/win95/chnktype.cpp | 85 ------------------- src/win95/chnktype.hpp | 25 +----- src/win95/fragchnk.cpp | 25 ------ src/win95/hierchnk.cpp | 32 +------ src/win95/ltchunk.cpp | 54 ------------ src/win95/mishchnk.cpp | 9 +- src/win95/obchunk.cpp | 167 ------------------------------------- src/win95/wpchunk.cpp | 87 ------------------- src/win95/wpchunk.hpp | 3 - 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; iobject_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; iindex=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;jNumWPLinks;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;jNumModLinks;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; };