summaryrefslogtreecommitdiffhomepage
path: root/Stars45/MissionTemplate.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'Stars45/MissionTemplate.cpp')
-rw-r--r--Stars45/MissionTemplate.cpp13
1 files changed, 6 insertions, 7 deletions
diff --git a/Stars45/MissionTemplate.cpp b/Stars45/MissionTemplate.cpp
index 1d7dacd..54efbe6 100644
--- a/Stars45/MissionTemplate.cpp
+++ b/Stars45/MissionTemplate.cpp
@@ -11,7 +11,6 @@
Mission Template classes
*/
-#include "MemDebug.h"
#include "MissionTemplate.h"
#include "MissionEvent.h"
#include "StarSystem.h"
@@ -52,7 +51,7 @@ MissionTemplate::AddElement(MissionElement* elem)
{
if (elem) {
elements.append(elem);
- aliases.append(new(__FILE__,__LINE__) MissionAlias(elem->Name(), elem));
+ aliases.append(new MissionAlias(elem->Name(), elem));
}
}
@@ -112,7 +111,7 @@ MissionTemplate::MapElement(MissionElement* elem)
elem->SetSquadron(sqdr->Name());
if (!elem->IsDropship()) {
- aliases.append(new(__FILE__,__LINE__) MissionAlias(elem->Name(), elem));
+ aliases.append(new MissionAlias(elem->Name(), elem));
elem->SetName(elem->GetCombatUnit()->Name());
}
@@ -186,7 +185,7 @@ MissionTemplate::MapCallsign(const char* name, int iff)
if (iff >= 0) {
const char* callsign = Callsign::GetCallsign(iff);
- MissionCallsign* mc = new(__FILE__,__LINE__) MissionCallsign(callsign, name);
+ MissionCallsign* mc = new MissionCallsign(callsign, name);
callsigns.append(mc);
return mc->Callsign();
@@ -304,7 +303,7 @@ MissionTemplate::Load(const char* fname, const char* pname)
loader->SetDataPath(0);
loader->UseFileSystem(old_fs);
- Parser parser(new(__FILE__,__LINE__) BlockReader((const char*) block));
+ Parser parser(new BlockReader((const char*) block));
Term* term = parser.ParseTerm();
@@ -632,7 +631,7 @@ MissionTemplate::ParseAlias(TermStruct* val)
delete rloc;
- aliases.append(new(__FILE__,__LINE__) MissionAlias(name, elem));
+ aliases.append(new MissionAlias(name, elem));
}
else {
::Print("WARNING: Could not resolve mission alias '%s'\n", (const char*) name);
@@ -663,7 +662,7 @@ MissionTemplate::ParseAlias(TermStruct* val)
}
else if (defname == "instr") {
- Text* obj = new(__FILE__,__LINE__) Text;
+ Text* obj = new Text;
if (GetDefText(*obj, pdef, filename))
elem->Instructions().append(obj);
}