diff options
| author | Aki <please@ignore.pl> | 2022-03-27 17:42:26 +0200 |
|---|---|---|
| committer | Aki <please@ignore.pl> | 2022-03-27 17:42:26 +0200 |
| commit | a12e588079700d55a0b788fea2df7727c2e41f52 (patch) | |
| tree | 690072569624c73af5043b3619acaab4d298b1fa /Stars45/WeaponDesign.cpp | |
| parent | 72bb517271dad40a440533ad0796a88247011199 (diff) | |
| download | starshatter-a12e588079700d55a0b788fea2df7727c2e41f52.zip starshatter-a12e588079700d55a0b788fea2df7727c2e41f52.tar.gz starshatter-a12e588079700d55a0b788fea2df7727c2e41f52.tar.bz2 | |
Removed MemDebug from FoundationEx
Diffstat (limited to 'Stars45/WeaponDesign.cpp')
| -rw-r--r-- | Stars45/WeaponDesign.cpp | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/Stars45/WeaponDesign.cpp b/Stars45/WeaponDesign.cpp index b658c25..aa116b0 100644 --- a/Stars45/WeaponDesign.cpp +++ b/Stars45/WeaponDesign.cpp @@ -11,7 +11,6 @@ Weapon Design parameters class */ -#include "MemDebug.h" #include "WeaponDesign.h" #include "ShipDesign.h" #include "Weapon.h" @@ -187,7 +186,7 @@ WeaponDesign::LoadDesign(const char* path, const char* filename, bool mod) BYTE* block; 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) { @@ -226,7 +225,7 @@ WeaponDesign::LoadDesign(const char* path, const char* filename, bool mod) } else { TermStruct* val = def->term()->isStruct(); - WeaponDesign* design = new(__FILE__,__LINE__) WeaponDesign; + WeaponDesign* design = new WeaponDesign; design->type = type++; if (defname == "primary") { @@ -471,7 +470,7 @@ WeaponDesign::LoadDesign(const char* path, const char* filename, bool mod) } if (design->anim_length > 0) { - design->animation = new(__FILE__,__LINE__) Bitmap[design->anim_length]; + design->animation = new Bitmap[design->anim_length]; for (int i = 0; i < design->anim_length; i++) { Bitmap* p = design->animation + i; loader->LoadBitmap(design->anim_frames[i], *p, Bitmap::BMP_TRANSLUCENT); @@ -508,7 +507,7 @@ WeaponDesign::LoadDesign(const char* path, const char* filename, bool mod) if (p.length()) loader->SetDataPath(p); - design->turret_model = new(__FILE__,__LINE__) Model; + design->turret_model = new Model; design->turret_model->Load(t, design->scale); if (design->turret_base.length()) { @@ -531,7 +530,7 @@ WeaponDesign::LoadDesign(const char* path, const char* filename, bool mod) if (p.length()) loader->SetDataPath(p); - design->turret_base_model = new(__FILE__,__LINE__) Model; + design->turret_base_model = new Model; design->turret_base_model->Load(t, design->scale); } @@ -559,7 +558,7 @@ WeaponDesign::LoadDesign(const char* path, const char* filename, bool mod) if (p.length()) loader->SetDataPath(p); - design->shot_model = new(__FILE__,__LINE__) Model; + design->shot_model = new Model; design->shot_model->Load(t, design->scale); loader->SetDataPath(path); |