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/CombatGroup.cpp | |
| parent | 72bb517271dad40a440533ad0796a88247011199 (diff) | |
| download | starshatter-a12e588079700d55a0b788fea2df7727c2e41f52.zip starshatter-a12e588079700d55a0b788fea2df7727c2e41f52.tar.gz starshatter-a12e588079700d55a0b788fea2df7727c2e41f52.tar.bz2 | |
Removed MemDebug from FoundationEx
Diffstat (limited to 'Stars45/CombatGroup.cpp')
| -rw-r--r-- | Stars45/CombatGroup.cpp | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/Stars45/CombatGroup.cpp b/Stars45/CombatGroup.cpp index 9844445..42976bd 100644 --- a/Stars45/CombatGroup.cpp +++ b/Stars45/CombatGroup.cpp @@ -11,7 +11,6 @@ An element in the dynamic campaign */ -#include "MemDebug.h" #include "CombatGroup.h" #include "CombatUnit.h" #include "CombatZone.h" @@ -385,7 +384,7 @@ CombatGroup::FindGroup(int t, int n) CombatGroup* CombatGroup::Clone(bool deep) { - CombatGroup* clone = new(__FILE__,__LINE__) + CombatGroup* clone = new CombatGroup(type, id, name, iff, enemy_intel); clone->combatant = combatant; @@ -395,7 +394,7 @@ CombatGroup::Clone(bool deep) clone->expanded = expanded; for (int i = 0; i < units.size(); i++) { - CombatUnit* u = new(__FILE__,__LINE__) CombatUnit(*units[i]); + CombatUnit* u = new CombatUnit(*units[i]); u->SetCombatGroup(clone); clone->units.append(u); } @@ -970,7 +969,7 @@ CombatGroup::LoadOrderOfBattle(const char* filename, int team, Combatant* combat BYTE* block; loader->LoadBuffer(filename, block, true); - Parser parser(new(__FILE__,__LINE__) BlockReader((const char*) block)); + Parser parser(new BlockReader((const char*) block)); Term* term = parser.ParseTerm(); if (!term) { @@ -1117,7 +1116,7 @@ CombatGroup::LoadOrderOfBattle(const char* filename, int team, Combatant* combat return 0; } - CombatUnit* cu = new(__FILE__,__LINE__) CombatUnit(unit_name, unit_regnum, unit_class, unit_design, unit_count, iff); + CombatUnit* cu = new CombatUnit(unit_name, unit_regnum, unit_class, unit_design, unit_count, iff); cu->SetRegion(unit_region); cu->SetSkin(unit_skin); cu->MoveTo(unit_loc); @@ -1137,7 +1136,7 @@ CombatGroup::LoadOrderOfBattle(const char* filename, int team, Combatant* combat parent_group = force->FindGroup(TypeFromName(parent_type), parent_id); } - CombatGroup* g = new(__FILE__,__LINE__) + CombatGroup* g = new CombatGroup(TypeFromName(type), id, name, iff, Intel::IntelFromName(intel), parent_group); g->region = region; @@ -1214,7 +1213,7 @@ CombatGroup::MergeOrderOfBattle(BYTE* block, const char* filename, int team, Com { CombatGroup* force = 0; - Parser parser(new(__FILE__,__LINE__) BlockReader((const char*) block)); + Parser parser(new BlockReader((const char*) block)); Term* term = parser.ParseTerm(); if (!term) { @@ -1363,7 +1362,7 @@ CombatGroup::MergeOrderOfBattle(BYTE* block, const char* filename, int team, Com } if (force) { - CombatUnit* cu = new(__FILE__,__LINE__) CombatUnit(unit_name, unit_regnum, unit_class, unit_design, unit_count, iff); + CombatUnit* cu = new CombatUnit(unit_name, unit_regnum, unit_class, unit_design, unit_count, iff); cu->SetRegion(unit_region); cu->MoveTo(unit_loc); cu->Kill(unit_dead); |