[netPanzer-CVS] netpanzer/src Lib/PObject/Classes/PArray.cpp Li...

[Ivo Danihelka]

CVSROOT:        /cvsroot/netpanzer
Module name:    netpanzer
Branch:         
Changes by:     Ivo Danihelka <address@hidden>  03/09/22 18:43:40

Modified files:
        src/Lib/PObject/Classes: PArray.cpp PArray.hpp 
        src/Lib/Particles: SnowParticleSystem2D.cpp 
        src/NetPanzer/Classes: TileSet.cpp WorldMap.cpp 

Log message:
        Fixed mismatched delete/delete[]

Patches:
Index: netpanzer/src/Lib/PObject/Classes/PArray.cpp
diff -u netpanzer/src/Lib/PObject/Classes/PArray.cpp:1.5 
netpanzer/src/Lib/PObject/Classes/PArray.cpp:1.6
--- netpanzer/src/Lib/PObject/Classes/PArray.cpp:1.5    Tue Sep 16 16:16:09 2003
+++ netpanzer/src/Lib/PObject/Classes/PArray.cpp        Mon Sep 22 18:43:39 2003
@@ -29,7 +29,7 @@
 
 PArray::~PArray( void )
 {
-    delete( array );
+    delete[] array;
 }
 
 void PArray::initialize( unsigned long size )
@@ -37,7 +37,7 @@
     PArray::size = size;
 
     if( array != 0 ) {
-        delete( array );
+        delete[] array;
         array = 0;
     }
     array = new void* [ size ];
Index: netpanzer/src/Lib/PObject/Classes/PArray.hpp
diff -u netpanzer/src/Lib/PObject/Classes/PArray.hpp:1.4 
netpanzer/src/Lib/PObject/Classes/PArray.hpp:1.5
--- netpanzer/src/Lib/PObject/Classes/PArray.hpp:1.4    Tue Sep 16 16:16:09 2003
+++ netpanzer/src/Lib/PObject/Classes/PArray.hpp        Mon Sep 22 18:43:39 2003
@@ -58,7 +58,7 @@
     inline void deallocate( void )
     {
         if ( array != 0 ) {
-            delete( array );
+            delete[] array;
             array = 0;
         }
 
Index: netpanzer/src/Lib/Particles/SnowParticleSystem2D.cpp
diff -u netpanzer/src/Lib/Particles/SnowParticleSystem2D.cpp:1.7 
netpanzer/src/Lib/Particles/SnowParticleSystem2D.cpp:1.8
--- netpanzer/src/Lib/Particles/SnowParticleSystem2D.cpp:1.7    Mon Sep 22 
09:53:49 2003
+++ netpanzer/src/Lib/Particles/SnowParticleSystem2D.cpp        Mon Sep 22 
18:43:39 2003
@@ -72,7 +72,7 @@
         }
 
     }  else {
-        delete snowParticles;
+        delete[] snowParticles;
         delete this;
         return;
     }
Index: netpanzer/src/NetPanzer/Classes/TileSet.cpp
diff -u netpanzer/src/NetPanzer/Classes/TileSet.cpp:1.6 
netpanzer/src/NetPanzer/Classes/TileSet.cpp:1.7
--- netpanzer/src/NetPanzer/Classes/TileSet.cpp:1.6     Tue Sep 16 16:16:11 2003
+++ netpanzer/src/NetPanzer/Classes/TileSet.cpp Mon Sep 22 18:43:39 2003
@@ -50,12 +50,12 @@
 
     if ( tile_set_loaded == true ) {
         if ( tile_data != 0 ) {
-            delete( tile_data );
+            delete[] tile_data;
             tile_data = 0;
         }
 
         if ( tile_info != 0 ) {
-            delete( tile_info );
+            delete[] tile_info;
             tile_info = 0;
         }
 
@@ -87,7 +87,7 @@
       
       if ( tile_set_loaded == true )
        {
-        delete( tile_data );
+        delete[] tile_data;
         tile_set_loaded = false;
        }
       
@@ -118,12 +118,12 @@
 
     if ( tile_set_loaded == true ) {
         if ( tile_data != 0 ) {
-            delete( tile_data );
+            delete[] tile_data;
             tile_data = 0;
         }
 
         if ( tile_info != 0 ) {
-            delete( tile_info );
+            delete[] tile_info;
             tile_info = 0;
         }
 
@@ -163,12 +163,12 @@
 
     if ( tile_set_loaded == true ) {
         if ( tile_data != 0 ) {
-            delete( tile_data );
+            delete[] tile_data;
             tile_data = 0;
         }
 
         if ( tile_info != 0 ) {
-            delete( tile_info );
+            delete[] tile_info;
             tile_info = 0;
         }
 
@@ -258,12 +258,12 @@
 
     if ( tile_set_loaded == true ) {
         if ( tile_data != 0 ) {
-            delete( tile_data );
+            delete[] tile_data;
             tile_data = 0;
         }
 
         if ( tile_info != 0 ) {
-            delete( tile_info );
+            delete[] tile_info;
             tile_info = 0;
         }
 
@@ -312,12 +312,12 @@
 
     if ( tile_set_loaded == true ) {
         if ( tile_data != 0 ) {
-            delete( tile_data );
+            delete[] tile_data;
             tile_data = 0;
         }
 
         if ( tile_info != 0 ) {
-            delete( tile_info );
+            delete[] tile_info;
             tile_info = 0;
         }
 
Index: netpanzer/src/NetPanzer/Classes/WorldMap.cpp
diff -u netpanzer/src/NetPanzer/Classes/WorldMap.cpp:1.5 
netpanzer/src/NetPanzer/Classes/WorldMap.cpp:1.6
--- netpanzer/src/NetPanzer/Classes/WorldMap.cpp:1.5    Tue Sep 16 16:16:11 2003
+++ netpanzer/src/NetPanzer/Classes/WorldMap.cpp        Mon Sep 22 18:43:40 2003
@@ -58,7 +58,7 @@
      
       if ( map_loaded == true )
        {
-        delete( map_buffer );
+        delete[] map_buffer;
         map_buffer = 0;
         map_loaded = false;
        }
@@ -88,7 +88,7 @@
         throw Exception("couldn't open mapfile '%s'.", file_path);
 
     if ( map_loaded == true ) {
-        delete( map_buffer );
+        delete[] map_buffer;
         map_buffer = 0;
         map_loaded = false;
     }