diff options
| author | Steven Fuller <relnev@icculus.org> | 2014-12-25 12:00:00 +0100 |
|---|---|---|
| committer | Patryk Obara <dreamer.tan@gmail.com> | 2019-08-20 03:45:24 +0200 |
| commit | 22475d6d94e96056d1550dca00b32d00e3821649 (patch) | |
| tree | 175dbbc8da0704d493fe3cb6024d8117c4f1b27b /src/win95/shpchunk.cpp | |
| parent | 819e239f23b0c515f32fe0ec8350bdfd8d64c9e9 (diff) | |
Import icculus.org release (2014-12-25)
Diffstat (limited to 'src/win95/shpchunk.cpp')
| -rw-r--r-- | src/win95/shpchunk.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/win95/shpchunk.cpp b/src/win95/shpchunk.cpp index 332ff39..779045b 100644 --- a/src/win95/shpchunk.cpp +++ b/src/win95/shpchunk.cpp @@ -1523,7 +1523,7 @@ Shape_Merge_Data_Chunk::Shape_Merge_Data_Chunk (Shape_Sub_Shape_Chunk * parent, Shape_Merge_Data_Chunk::~Shape_Merge_Data_Chunk() { - if (num_polys) delete merge_data; + if (num_polys) delete [] merge_data; } void Shape_Merge_Data_Chunk::fill_data_block(char * data_start) @@ -2575,7 +2575,7 @@ Shape_Fragment_Type_Chunk::Shape_Fragment_Type_Chunk(Chunk_With_Children* const Shape_Fragment_Type_Chunk::~Shape_Fragment_Type_Chunk() { - if(frag_type_name) delete frag_type_name; + if(frag_type_name) delete [] frag_type_name; } void Shape_Fragment_Type_Chunk::fill_data_block(char* data_start) @@ -3337,6 +3337,9 @@ void* Shape_Preprocessed_Data_Chunk::GetMemoryBlock() { void* retval=memory_block; +// 64HACK +#pragma message ("64HACK") +#if 0 unsigned int* current=(unsigned int*)&first_pointer; unsigned int* next; while((*current>>16)!=0xffff) @@ -3346,7 +3349,7 @@ void* Shape_Preprocessed_Data_Chunk::GetMemoryBlock() current=next; } *current=(unsigned int)&memory_block[(*current)&0xffff]; - +#endif memory_block=0; block_size=0; return retval; |