diff options
Diffstat (limited to 'Stars45/Explosion.cpp')
| -rw-r--r-- | Stars45/Explosion.cpp | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/Stars45/Explosion.cpp b/Stars45/Explosion.cpp index d72ffcd..9a47b0b 100644 --- a/Stars45/Explosion.cpp +++ b/Stars45/Explosion.cpp @@ -11,7 +11,6 @@ Explosion Sprite animation class */ -#include "MemDebug.h" #include "Explosion.h" #include "QuantumFlash.h" #include "Particles.h" @@ -74,10 +73,10 @@ SimRegion* rgn, SimObject* src) if (type == QUANTUM_FLASH) { life = 1.1; - QuantumFlash* q = new(__FILE__,__LINE__) QuantumFlash(); + QuantumFlash* q = new QuantumFlash(); rep = q; - light = new(__FILE__,__LINE__) Light(1e9, 0.66f); + light = new Light(1e9, 0.66f); light->SetColor(Color(180, 200, 255)); } @@ -92,7 +91,7 @@ SimRegion* rgn, SimObject* src) if (lengths[type] > 0) { int repeat = (lengths[type] == 1); - Sprite* s = new(__FILE__,__LINE__) Sprite(bitmaps[type], lengths[type], repeat); + Sprite* s = new Sprite(bitmaps[type], lengths[type], repeat); s->Scale(exp_scale * scales[type]); s->SetAngle(PI * rand()/16384.0); s->SetLuminous(true); @@ -100,12 +99,12 @@ SimRegion* rgn, SimObject* src) } if (light_levels[type] > 0) { - light = new(__FILE__,__LINE__) Light(light_levels[type], light_decays[type]); + light = new Light(light_levels[type], light_decays[type]); light->SetColor(light_colors[type]); } if (num_parts[type] > 0) { - particles = new(__FILE__,__LINE__) Particles(particle_bitmaps[type], + particles = new Particles(particle_bitmaps[type], num_parts[type], pos, Vec3(0.0f, 0.0f, 0.0f), @@ -204,7 +203,7 @@ Explosion::Initialize() loader->SetDataPath("Explosions/"); int blocklen = loader->LoadBuffer(filename, block, true); - Parser parser(new(__FILE__,__LINE__) BlockReader((const char*) block, blocklen)); + Parser parser(new BlockReader((const char*) block, blocklen)); Term* term = parser.ParseTerm(); if (!term) { @@ -416,7 +415,7 @@ Explosion::Initialize() recycles[type] = continuous; if (length > 0) { - bitmaps[type] = new(__FILE__,__LINE__) Bitmap[length]; + bitmaps[type] = new Bitmap[length]; if (length > 1) { for (int n = 0; n < length; n++) { @@ -432,7 +431,7 @@ Explosion::Initialize() } if (particle_bitmap[0]) { - particle_bitmaps[type] = new(__FILE__,__LINE__) Bitmap[part_nframes]; + particle_bitmaps[type] = new Bitmap[part_nframes]; if (part_nframes > 1) { for (int i = 0; i < part_nframes; i++) { |