summaryrefslogtreecommitdiffhomepage
path: root/Stars45/Shot.cpp
diff options
context:
space:
mode:
authorAki <please@ignore.pl>2022-03-27 17:42:26 +0200
committerAki <please@ignore.pl>2022-03-27 17:42:26 +0200
commita12e588079700d55a0b788fea2df7727c2e41f52 (patch)
tree690072569624c73af5043b3619acaab4d298b1fa /Stars45/Shot.cpp
parent72bb517271dad40a440533ad0796a88247011199 (diff)
downloadstarshatter-a12e588079700d55a0b788fea2df7727c2e41f52.zip
starshatter-a12e588079700d55a0b788fea2df7727c2e41f52.tar.gz
starshatter-a12e588079700d55a0b788fea2df7727c2e41f52.tar.bz2
Removed MemDebug from FoundationEx
Diffstat (limited to 'Stars45/Shot.cpp')
-rw-r--r--Stars45/Shot.cpp19
1 files changed, 9 insertions, 10 deletions
diff --git a/Stars45/Shot.cpp b/Stars45/Shot.cpp
index da516b8..0af927e 100644
--- a/Stars45/Shot.cpp
+++ b/Stars45/Shot.cpp
@@ -11,7 +11,6 @@
Laser and Missile class
*/
-#include "MemDebug.h"
#include "Shot.h"
#include "Weapon.h"
#include "DriveSprite.h"
@@ -66,7 +65,7 @@ charge(1.0f), design(dsn), offset(1.0e5f), altitude_agl(-1.0e6f), hit_target(fal
switch (design->graphic_type) {
case Graphic::BOLT: {
- Bolt* s = new(__FILE__,__LINE__) Bolt(design->length, design->width, design->shot_img, 1);
+ Bolt* s = new Bolt(design->length, design->width, design->shot_img, 1);
s->SetDirection(cam.vpn());
rep = s;
}
@@ -76,9 +75,9 @@ charge(1.0f), design(dsn), offset(1.0e5f), altitude_agl(-1.0e6f), hit_target(fal
Sprite* s = 0;
if (design->animation)
- s = new(__FILE__,__LINE__) DriveSprite(design->animation, design->anim_length);
+ s = new DriveSprite(design->animation, design->anim_length);
else
- s = new(__FILE__,__LINE__) DriveSprite(design->shot_img);
+ s = new DriveSprite(design->shot_img);
s->Scale((double) design->scale);
rep = s;
@@ -86,7 +85,7 @@ charge(1.0f), design(dsn), offset(1.0e5f), altitude_agl(-1.0e6f), hit_target(fal
break;
case Graphic::SOLID: {
- Solid* s = new(__FILE__,__LINE__) Solid;
+ Solid* s = new Solid;
s->UseModel(design->shot_model);
rep = s;
@@ -101,7 +100,7 @@ charge(1.0f), design(dsn), offset(1.0e5f), altitude_agl(-1.0e6f), hit_target(fal
light = 0;
if (design->light > 0) {
- light = new(__FILE__,__LINE__) Light(design->light);
+ light = new Light(design->light);
light->SetColor(design->light_color);
}
@@ -116,14 +115,14 @@ charge(1.0f), design(dsn), offset(1.0e5f), altitude_agl(-1.0e6f), hit_target(fal
SetAngularRates((float) design->roll_rate, (float) design->pitch_rate, (float) design->yaw_rate);
if (design->flash_img != 0) {
- flash = new(__FILE__,__LINE__) Sprite(design->flash_img);
+ flash = new Sprite(design->flash_img);
flash->Scale((double) design->flash_scale);
flash->MoveTo(pos - cam.vpn() * design->length);
flash->SetLuminous(true);
}
if (design->flare_img != 0) {
- flare = new(__FILE__,__LINE__) DriveSprite(design->flare_img);
+ flare = new DriveSprite(design->flare_img);
flare->Scale((double) design->flare_scale);
flare->MoveTo(pos);
}
@@ -196,7 +195,7 @@ Shot::SeekTarget(SimObject* target, System* sub)
dir = 0;
if (target) {
- SeekerAI* seeker = new(__FILE__,__LINE__) SeekerAI(this);
+ SeekerAI* seeker = new SeekerAI(this);
seeker->SetTarget(target, sub);
seeker->SetPursuit(design->guided);
seeker->SetDelay(1);
@@ -308,7 +307,7 @@ Shot::ExecFrame(double seconds)
if (!trail && life > 0 && design->life - life > 0.2) {
if (design->trail.length()) {
- trail = new(__FILE__,__LINE__) Trail(design->trail_img, design->trail_length);
+ trail = new Trail(design->trail_img, design->trail_length);
if (design->trail_width > 0)
trail->SetWidth(design->trail_width);