summaryrefslogtreecommitdiffhomepage
path: root/Stars45/Campaign.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'Stars45/Campaign.cpp')
-rw-r--r--Stars45/Campaign.cpp67
1 files changed, 33 insertions, 34 deletions
diff --git a/Stars45/Campaign.cpp b/Stars45/Campaign.cpp
index d6e4fb1..af1eb86 100644
--- a/Stars45/Campaign.cpp
+++ b/Stars45/Campaign.cpp
@@ -11,7 +11,6 @@
Campaign defines a strategic military scenario.
*/
-#include "MemDebug.h"
#include "Campaign.h"
#include "CampaignPlanStrategic.h"
#include "CampaignPlanAssignment.h"
@@ -164,7 +163,7 @@ Campaign::Initialize()
if (loader->FindFile("campaign.def")) {
char txt[256];
sprintf_s(txt, "Dynamic Campaign %02d", i);
- c = new(__FILE__,__LINE__) Campaign(i, txt);
+ c = new Campaign(i, txt);
if (c) {
campaigns.insertSort(c);
@@ -172,18 +171,18 @@ Campaign::Initialize()
}
}
- c = new(__FILE__,__LINE__) Campaign(SINGLE_MISSIONS, "Single Missions");
+ c = new Campaign(SINGLE_MISSIONS, "Single Missions");
if (c) {
campaigns.insertSort(c);
current_campaign = c;
}
- c = new(__FILE__,__LINE__) Campaign(MULTIPLAYER_MISSIONS, "Multiplayer Missions");
+ c = new Campaign(MULTIPLAYER_MISSIONS, "Multiplayer Missions");
if (c) {
campaigns.insertSort(c);
}
- c = new(__FILE__,__LINE__) Campaign(CUSTOM_MISSIONS, "Custom Missions");
+ c = new Campaign(CUSTOM_MISSIONS, "Custom Missions");
if (c) {
campaigns.insertSort(c);
}
@@ -248,7 +247,7 @@ Campaign::CreateCustomCampaign(const char* name, const char* path)
if (id == 0)
id = CUSTOM_MISSIONS + 1;
- Campaign* c = new(__FILE__,__LINE__) Campaign(id, name, path);
+ Campaign* c = new Campaign(id, name, path);
Print("Campaign: created custom campaign %d '%s'\n", id, name);
campaigns.append(c);
@@ -433,7 +432,7 @@ Campaign::LoadCampaign(DataLoader* loader, bool full)
loader->UseFileSystem(true);
loader->LoadBuffer(filename, block, true);
loader->UseFileSystem(Starshatter::UseFileSystem());
- Parser parser(new(__FILE__,__LINE__) BlockReader((const char*) block));
+ Parser parser(new BlockReader((const char*) block));
Term* term = parser.ParseTerm();
@@ -533,7 +532,7 @@ Campaign::LoadCampaign(DataLoader* loader, bool full)
}
loader->SetDataPath(path);
- Combatant* c = new(__FILE__,__LINE__) Combatant(name, clone);
+ Combatant* c = new Combatant(name, clone);
if (c) {
combatants.append(c);
}
@@ -792,29 +791,29 @@ Campaign::ParseAction(TermStruct* val, const char* filename)
else if (pdef->name()->value() == "asset_kill") {
if (!action)
- action = new(__FILE__,__LINE__) CombatAction(id, type, subtype, team);
+ action = new CombatAction(id, type, subtype, team);
if (action) {
char txt[64];
GetDefText(txt, pdef, filename);
- action->AssetKills().append(new (__FILE__,__LINE__) Text(txt));
+ action->AssetKills().append(new Text(txt));
}
}
else if (pdef->name()->value() == "target_kill") {
if (!action)
- action = new(__FILE__,__LINE__) CombatAction(id, type, subtype, team);
+ action = new CombatAction(id, type, subtype, team);
if (action) {
char txt[64];
GetDefText(txt, pdef, filename);
- action->TargetKills().append(new (__FILE__,__LINE__) Text(txt));
+ action->TargetKills().append(new Text(txt));
}
}
else if (pdef->name()->value() == "req") {
if (!action)
- action = new(__FILE__,__LINE__) CombatAction(id, type, subtype, team);
+ action = new CombatAction(id, type, subtype, team);
if (!pdef->term() || !pdef->term()->isStruct()) {
::Print("WARNING: action req struct missing in '%s'\n", filename);
@@ -902,7 +901,7 @@ Campaign::ParseAction(TermStruct* val, const char* filename)
}
if (!action)
- action = new(__FILE__,__LINE__) CombatAction(id, type, subtype, team);
+ action = new CombatAction(id, type, subtype, team);
if (action) {
action->SetSource(source);
@@ -971,7 +970,7 @@ Campaign::LoadMissionList(DataLoader* loader)
loader->UseFileSystem(true);
loader->LoadBuffer(filename, block, true);
loader->UseFileSystem(Starshatter::UseFileSystem());
- Parser parser(new(__FILE__,__LINE__) BlockReader((const char*) block));
+ Parser parser(new BlockReader((const char*) block));
Term* term = parser.ParseTerm();
@@ -1052,7 +1051,7 @@ Campaign::LoadMissionList(DataLoader* loader)
}
}
- MissionInfo* info = new(__FILE__,__LINE__) MissionInfo;
+ MissionInfo* info = new MissionInfo;
if (info) {
info->id = id;
info->name = name;
@@ -1113,7 +1112,7 @@ Campaign::LoadCustomMissions(DataLoader* loader)
int type = 0;
int msn_id = 0;
- Parser parser(new(__FILE__,__LINE__) BlockReader((const char*) block));
+ Parser parser(new BlockReader((const char*) block));
Term* term = parser.ParseTerm();
if (!term) {
@@ -1181,7 +1180,7 @@ Campaign::LoadCustomMissions(DataLoader* loader)
msn_id = i+1;
}
- MissionInfo* info = new(__FILE__,__LINE__) MissionInfo;
+ MissionInfo* info = new MissionInfo;
if (info) {
info->id = msn_id;
info->name = name;
@@ -1226,7 +1225,7 @@ Campaign::LoadTemplateList(DataLoader* loader)
loader->UseFileSystem(true);
loader->LoadBuffer(filename, block, true);
loader->UseFileSystem(Starshatter::UseFileSystem());
- Parser parser(new(__FILE__,__LINE__) BlockReader((const char*) block));
+ Parser parser(new BlockReader((const char*) block));
Term* term = parser.ParseTerm();
@@ -1338,7 +1337,7 @@ Campaign::LoadTemplateList(DataLoader* loader)
}
}
- MissionInfo* info = new(__FILE__,__LINE__) MissionInfo;
+ MissionInfo* info = new MissionInfo;
if (info) {
info->id = id;
info->name = name;
@@ -1358,7 +1357,7 @@ Campaign::LoadTemplateList(DataLoader* loader)
TemplateList* templist = GetTemplateList(msn_type, grp_type);
if (!templist) {
- templist = new(__FILE__,__LINE__) TemplateList;
+ templist = new TemplateList;
templist->mission_type = msn_type;
templist->group_type = grp_type;
templates.append(templist);
@@ -1387,23 +1386,23 @@ Campaign::CreatePlanners()
CampaignPlan* p;
// PLAN EVENT MUST BE FIRST PLANNER:
- p = new(__FILE__,__LINE__) CampaignPlanEvent(this);
+ p = new CampaignPlanEvent(this);
if (p)
planners.append(p);
- p = new(__FILE__,__LINE__) CampaignPlanStrategic(this);
+ p = new CampaignPlanStrategic(this);
if (p)
planners.append(p);
- p = new(__FILE__,__LINE__) CampaignPlanAssignment(this);
+ p = new CampaignPlanAssignment(this);
if (p)
planners.append(p);
- p = new(__FILE__,__LINE__) CampaignPlanMovement(this);
+ p = new CampaignPlanMovement(this);
if (p)
planners.append(p);
- p = new(__FILE__,__LINE__) CampaignPlanMission(this);
+ p = new CampaignPlanMission(this);
if (p)
planners.append(p);
@@ -1532,7 +1531,7 @@ Campaign::GetMission(int id)
if (info) {
if (!info->mission) {
::Print("Campaign::GetMission(%d) loading mission...\n", id);
- info->mission = new(__FILE__,__LINE__) Mission(id, info->script, path);
+ info->mission = new Mission(id, info->script, path);
if (info->mission)
info->mission->Load();
}
@@ -1583,7 +1582,7 @@ Campaign::GetMissionByFile(const char* filename)
if (!info->mission) {
::Print("Campaign::GetMission(%d) loading mission...\n", id);
- info->mission = new(__FILE__,__LINE__) Mission(id, info->script, path);
+ info->mission = new Mission(id, info->script, path);
if (info->mission)
info->mission->Load();
}
@@ -1603,12 +1602,12 @@ Campaign::GetMissionByFile(const char* filename)
}
else {
- info = new(__FILE__,__LINE__) MissionInfo;
+ info = new MissionInfo;
if (info) {
info->id = maxid+1;
info->name = "New Custom Mission";
info->script = filename;
- info->mission = new(__FILE__,__LINE__) Mission(info->id, info->script, "Mods/Missions/");
+ info->mission = new Mission(info->id, info->script, "Mods/Missions/");
info->mission->SetName(info->name);
info->script.setSensitive(false);
@@ -1640,12 +1639,12 @@ Campaign::CreateNewMission()
char filename[64];
sprintf_s(filename, "custom%03d.def", maxid+1);
- info = new(__FILE__,__LINE__) MissionInfo;
+ info = new MissionInfo;
if (info) {
info->id = maxid+1;
info->name = "New Custom Mission";
info->script = filename;
- info->mission = new(__FILE__,__LINE__) Mission(info->id, filename, path);
+ info->mission = new Mission(info->id, filename, path);
info->mission->SetName(info->name);
info->script.setSensitive(false);
@@ -1706,7 +1705,7 @@ Campaign::GetMissionInfo(int id)
if (m) {
if (!m->mission) {
- m->mission = new(__FILE__,__LINE__) Mission(id, m->script);
+ m->mission = new Mission(id, m->script);
if (m->mission)
m->mission->Load();
}
@@ -1747,7 +1746,7 @@ Campaign::LoadNetMission(int id, const char* net_mission_script)
}
mission_id = id;
- mission = new(__FILE__,__LINE__) Mission(id);
+ mission = new Mission(id);
if (mission && mission->ParseMission(net_mission_script))
mission->Validate();
generated by cgit v1.1 at 2024-06-30 12:23:12 +0000