diff options
Diffstat (limited to 'Stars45/Weapon.cpp')
| -rw-r--r-- | Stars45/Weapon.cpp | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/Stars45/Weapon.cpp b/Stars45/Weapon.cpp index 33a3238..b5a0fd3 100644 --- a/Stars45/Weapon.cpp +++ b/Stars45/Weapon.cpp @@ -11,7 +11,6 @@ Weapon class */ -#include "MemDebug.h" #include "Weapon.h" #include "Shot.h" #include "Drone.h" @@ -126,7 +125,7 @@ Weapon::Weapon(const Weapon& w) active_barrel = -1; if (design->beam) { - beams = new(__FILE__,__LINE__) Shot* [nbarrels]; + beams = new Shot* [nbarrels]; ZeroMemory(beams, sizeof(Shot*) * nbarrels); } @@ -217,13 +216,13 @@ Weapon::SetOwner(Ship* s) ship = s; if (design->turret_model) { - Solid* t = new(__FILE__,__LINE__) Solid; + Solid* t = new Solid; t->UseModel(design->turret_model); turret = t; } if (design->turret_base_model) { - Solid* t = new(__FILE__,__LINE__) Solid; + Solid* t = new Solid; t->UseModel(design->turret_base_model); turret_base = t; } @@ -234,7 +233,7 @@ Weapon::SetOwner(Ship* s) design->shot_model != 0) { for (int i = 0; i < nbarrels; i++) { - Solid* s = new(__FILE__,__LINE__) Solid; + Solid* s = new Solid; s->UseModel(design->shot_model); visible_stores[i] = s; @@ -832,10 +831,10 @@ Shot* Weapon::CreateShot(const Point& loc, const Camera& cam, WeaponDesign* dsn, const Ship* own) { if (dsn->drone) - return new(__FILE__,__LINE__) Drone(loc, cam, dsn, own); + return new Drone(loc, cam, dsn, own); else - return new(__FILE__,__LINE__) Shot(loc, cam, dsn, own); + return new Shot(loc, cam, dsn, own); } // +--------------------------------------------------------------------+ |