From a12e588079700d55a0b788fea2df7727c2e41f52 Mon Sep 17 00:00:00 2001 From: Aki Date: Sun, 27 Mar 2022 17:42:26 +0200 Subject: Removed MemDebug from FoundationEx --- Stars45/Mission.cpp | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) (limited to 'Stars45/Mission.cpp') diff --git a/Stars45/Mission.cpp b/Stars45/Mission.cpp index 9c9b181..64d5948 100644 --- a/Stars45/Mission.cpp +++ b/Stars45/Mission.cpp @@ -11,7 +11,6 @@ Mission classes */ -#include "MemDebug.h" #include "Mission.h" #include "MissionEvent.h" #include "StarSystem.h" @@ -268,7 +267,7 @@ Mission::Load(const char* fname, const char* pname) bool Mission::ParseMission(const char* block) { - Parser parser(new(__FILE__,__LINE__) BlockReader(block)); + Parser parser(new BlockReader(block)); Term* term = parser.ParseTerm(); char err[256]; @@ -580,7 +579,7 @@ Mission::ParseElement(TermStruct* val) int deck = 1; char err[256]; - MissionElement* element = new(__FILE__,__LINE__) MissionElement(); + MissionElement* element = new MissionElement(); element->rgn_name = region; element->elem_id = elem_id++; @@ -736,7 +735,7 @@ Mission::ParseElement(TermStruct* val) } else if (defname == "instr") { - Text* obj = new(__FILE__,__LINE__) Text; + Text* obj = new Text; if (GetDefText(*obj, pdef, filename)) element->instructions.append(obj); else @@ -801,7 +800,7 @@ Mission::ParseElement(TermStruct* val) MissionEvent* Mission::ParseEvent(TermStruct* val) { - MissionEvent* event = new(__FILE__,__LINE__) MissionEvent; + MissionEvent* event = new MissionEvent; Text event_name; Text trigger_name; static int event_id = 1; @@ -916,7 +915,7 @@ Mission::ParseEvent(TermStruct* val) MissionShip* Mission::ParseShip(TermStruct* val, MissionElement* element) { - MissionShip* msn_ship = new(__FILE__,__LINE__) MissionShip; + MissionShip* msn_ship = new MissionShip; Text name; Text skin_name; @@ -1132,7 +1131,7 @@ Mission::ParseInstruction(TermStruct* val, MissionElement* element) if (tgt_desc.length() && tgt_name.length()) tgt_desc = tgt_desc + " " + tgt_name; - Instruction* instr = new(__FILE__,__LINE__) Instruction(rgn, loc, order); + Instruction* instr = new Instruction(rgn, loc, order); instr->SetStatus(status); instr->SetEMCON(emcon); @@ -1179,7 +1178,7 @@ Mission::ParseLoadout(TermStruct* val, MissionElement* element) } } - MissionLoad* load = new(__FILE__,__LINE__) MissionLoad(ship); + MissionLoad* load = new MissionLoad(ship); if (name.length()) load->SetName(name); @@ -1194,7 +1193,7 @@ RLoc* Mission::ParseRLoc(TermStruct* val) { Vec3 base_loc; - RLoc* rloc = new(__FILE__,__LINE__) RLoc; + RLoc* rloc = new RLoc; RLoc* ref = 0; double dex = 0; -- cgit v1.1