summaryrefslogtreecommitdiffhomepage
path: root/Stars45/ShipDesign.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'Stars45/ShipDesign.cpp')
-rw-r--r--Stars45/ShipDesign.cpp99
1 files changed, 49 insertions, 50 deletions
diff --git a/Stars45/ShipDesign.cpp b/Stars45/ShipDesign.cpp
index f110f0f..cda8013 100644
--- a/Stars45/ShipDesign.cpp
+++ b/Stars45/ShipDesign.cpp
@@ -11,7 +11,6 @@
Starship Design parameters class
*/
-#include "MemDebug.h"
#include "ShipDesign.h"
#include "Ship.h"
#include "Shot.h"
@@ -265,7 +264,7 @@ bolt_hit_sound_resource(0), beam_hit_sound_resource(0), lod_levels(0)
return;
}
- Parser parser(new(__FILE__,__LINE__) BlockReader((const char*) block, blocklen));
+ Parser parser(new BlockReader((const char*) block, blocklen));
Term* term = parser.ParseTerm();
if (!term) {
@@ -310,7 +309,7 @@ bolt_hit_sound_resource(0), beam_hit_sound_resource(0), lod_levels(0)
while (++iter) {
const char* model_name = iter.value()->data();
- Model* model = new(__FILE__,__LINE__) Model;
+ Model* model = new Model;
if (!model->Load(model_name, scale)) {
Print("ERROR: Could not load detail %d, model '%s'\n", i, model_name);
delete model;
@@ -332,7 +331,7 @@ bolt_hit_sound_resource(0), beam_hit_sound_resource(0), lod_levels(0)
offsets[i].append(offset[i].at(n)); // transfer ownership
}
else
- offsets[i].append(new(__FILE__,__LINE__) Point);
+ offsets[i].append(new Point);
n++;
}
@@ -347,7 +346,7 @@ bolt_hit_sound_resource(0), beam_hit_sound_resource(0), lod_levels(0)
if (cockpit_name[0]) {
const char* model_name = cockpit_name;
- cockpit_model = new(__FILE__,__LINE__) Model;
+ cockpit_model = new Model;
if (!cockpit_model->Load(model_name, cockpit_scale)) {
Print("ERROR: Could not load cockpit model '%s'\n", model_name);
delete cockpit_model;
@@ -528,7 +527,7 @@ void AddModCatalogEntry(const char* design_name, const char* design_path)
return;
}
- Parser parser(new(__FILE__,__LINE__) BlockReader((const char*) block, blocklen));
+ Parser parser(new BlockReader((const char*) block, blocklen));
Term* term = parser.ParseTerm();
if (!term) {
@@ -585,7 +584,7 @@ void AddModCatalogEntry(const char* design_name, const char* design_path)
if (valid && name.length() && type.length()) {
Print("Add Mod Catalog Entry '%s' Class '%s'\n", name.data(), type.data());
- ShipCatalogEntry* entry = new(__FILE__,__LINE__) ShipCatalogEntry(name, type, path, file);
+ ShipCatalogEntry* entry = new ShipCatalogEntry(name, type, path, file);
mod_catalog.append(entry);
}
}
@@ -666,7 +665,7 @@ ShipDesign::LoadCatalog(const char* path, const char* fname, 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) {
@@ -726,7 +725,7 @@ ShipDesign::LoadCatalog(const char* path, const char* fname, bool mod)
}
}
- ShipCatalogEntry* entry = new(__FILE__,__LINE__) ShipCatalogEntry(name, type, path, fname, hide);
+ ShipCatalogEntry* entry = new ShipCatalogEntry(name, type, path, fname, hide);
if (mod) mod_catalog.append(entry);
else catalog.append(entry);
@@ -772,7 +771,7 @@ ShipDesign::LoadSkins(const char* path, const char* archive)
continue;
}
- Parser parser(new(__FILE__,__LINE__) BlockReader((const char*) block, blocklen));
+ Parser parser(new BlockReader((const char*) block, blocklen));
Term* term = parser.ParseTerm();
ShipDesign* design = 0;
@@ -851,7 +850,7 @@ ShipDesign::PreloadCatalog(int index)
return;
if (!entry->design) {
- entry->design = new(__FILE__,__LINE__) ShipDesign(entry->name,
+ entry->design = new ShipDesign(entry->name,
entry->path,
entry->file,
entry->hide);
@@ -864,7 +863,7 @@ ShipDesign::PreloadCatalog(int index)
ShipCatalogEntry* entry = iter.value();
if (!entry->design) {
- entry->design = new(__FILE__,__LINE__) ShipDesign(entry->name,
+ entry->design = new ShipDesign(entry->name,
entry->path,
entry->file,
entry->hide);
@@ -939,7 +938,7 @@ ShipDesign::Get(const char* design_name, const char* design_path)
if (entry) {
if (!entry->design) {
- entry->design = new(__FILE__,__LINE__) ShipDesign(entry->name,
+ entry->design = new ShipDesign(entry->name,
entry->path,
entry->file,
entry->hide);
@@ -966,12 +965,12 @@ ShipDesign::FindModDesign(const char* design_name, const char* design_path)
DataLoader* loader = DataLoader::GetLoader();
loader->SetDataPath(path);
- ShipDesign* design = new(__FILE__,__LINE__) ShipDesign(design_name, path, file);
+ ShipDesign* design = new ShipDesign(design_name, path, file);
if (design->valid) {
Print("ShipDesign: found mod design '%s'\n", design->name);
- ShipCatalogEntry* entry = new(__FILE__,__LINE__) ShipCatalogEntry(design->name,
+ ShipCatalogEntry* entry = new ShipCatalogEntry(design->name,
ClassName(design->type),
path,
file);
@@ -1019,7 +1018,7 @@ ShipDesign::GetDesignList(int type, List<Text>& designs)
int etype = ClassForName(e->type);
if (etype & type) {
if (!e->design)
- e->design = new(__FILE__,__LINE__) ShipDesign(e->name,
+ e->design = new ShipDesign(e->name,
e->path,
e->file,
e->hide);
@@ -1099,63 +1098,63 @@ ShipDesign::ParseShip(TermDef* def)
if (!GetDefText(detail_name, def, filename))
Print("WARNING: invalid or missing model in '%s'\n", filename);
- detail[0].append(new(__FILE__,__LINE__) Text(detail_name));
+ detail[0].append(new Text(detail_name));
}
else if (defname == "detail_1") {
if (!GetDefText(detail_name, def, filename))
Print("WARNING: invalid or missing detail_1 in '%s'\n", filename);
- detail[1].append(new(__FILE__,__LINE__) Text(detail_name));
+ detail[1].append(new Text(detail_name));
}
else if (defname == "detail_2") {
if (!GetDefText(detail_name, def, filename))
Print("WARNING: invalid or missing detail_2 in '%s'\n", filename);
- detail[2].append(new(__FILE__,__LINE__) Text(detail_name));
+ detail[2].append(new Text(detail_name));
}
else if (defname == "detail_3") {
if (!GetDefText(detail_name, def, filename))
Print("WARNING: invalid or missing detail_3 in '%s'\n", filename);
- detail[3].append(new(__FILE__,__LINE__) Text(detail_name));
+ detail[3].append(new Text(detail_name));
}
else if (defname == "spin") {
if (!GetDefVec(spin, def, filename))
Print("WARNING: invalid or missing spin in '%s'\n", filename);
- spin_rates.append(new(__FILE__,__LINE__) Point(spin));
+ spin_rates.append(new Point(spin));
}
else if (defname == "offset_0") {
if (!GetDefVec(off_loc, def, filename))
Print("WARNING: invalid or missing offset_0 in '%s'\n", filename);
- offset[0].append(new(__FILE__,__LINE__) Point(off_loc));
+ offset[0].append(new Point(off_loc));
}
else if (defname == "offset_1") {
if (!GetDefVec(off_loc, def, filename))
Print("WARNING: invalid or missing offset_1 in '%s'\n", filename);
- offset[1].append(new(__FILE__,__LINE__) Point(off_loc));
+ offset[1].append(new Point(off_loc));
}
else if (defname == "offset_2") {
if (!GetDefVec(off_loc, def, filename))
Print("WARNING: invalid or missing offset_2 in '%s'\n", filename);
- offset[2].append(new(__FILE__,__LINE__) Point(off_loc));
+ offset[2].append(new Point(off_loc));
}
else if (defname == "offset_3") {
if (!GetDefVec(off_loc, def, filename))
Print("WARNING: invalid or missing offset_3 in '%s'\n", filename);
- offset[3].append(new(__FILE__,__LINE__) Point(off_loc));
+ offset[3].append(new Point(off_loc));
}
else if (defname == "beauty") {
@@ -1602,7 +1601,7 @@ ShipDesign::ParsePower(TermStruct* val)
}
}
- PowerSource* source = new(__FILE__,__LINE__) PowerSource((PowerSource::SUBTYPE) stype, output);
+ PowerSource* source = new PowerSource((PowerSource::SUBTYPE) stype, output);
if (pname.length()) source->SetName(pname);
if (pabrv.length()) source->SetName(pabrv);
source->SetFuelRange(fuel);
@@ -1736,7 +1735,7 @@ ShipDesign::ParseDrive(TermStruct* val)
}
if (!drive)
- drive = new(__FILE__,__LINE__) Drive((Drive::SUBTYPE) dtype, dthrust, daug, trail);
+ drive = new Drive((Drive::SUBTYPE) dtype, dthrust, daug, trail);
drive->AddPort(port, flare_scale);
}
@@ -1782,7 +1781,7 @@ ShipDesign::ParseDrive(TermStruct* val)
}
if (!drive)
- drive = new(__FILE__,__LINE__) Drive((Drive::SUBTYPE) dtype, dthrust, daug, trail);
+ drive = new Drive((Drive::SUBTYPE) dtype, dthrust, daug, trail);
drive->SetSourceIndex(reactors.size()-1);
drive->Mount(loc, size, hull);
@@ -1886,7 +1885,7 @@ ShipDesign::ParseQuantumDrive(TermStruct* val)
}
}
- QuantumDrive* drive = new(__FILE__,__LINE__) QuantumDrive((QuantumDrive::SUBTYPE) subtype, capacity, consumption);
+ QuantumDrive* drive = new QuantumDrive((QuantumDrive::SUBTYPE) subtype, capacity, consumption);
drive->SetSourceIndex(reactors.size()-1);
drive->Mount(loc, size, hull);
drive->SetCountdown(countdown);
@@ -1991,7 +1990,7 @@ ShipDesign::ParseFarcaster(TermStruct* val)
}
}
- Farcaster* caster = new(__FILE__,__LINE__) Farcaster(capacity, consumption);
+ Farcaster* caster = new Farcaster(capacity, consumption);
caster->SetSourceIndex(reactors.size()-1);
caster->Mount(loc, size, hull);
@@ -2129,7 +2128,7 @@ ShipDesign::ParseThruster(TermStruct* val)
}
if (!drive)
- drive = new(__FILE__,__LINE__) Thruster(dtype, thrust, tscale);
+ drive = new Thruster(dtype, thrust, tscale);
if (defname == "port" || defname == "port_bottom")
drive->AddPort(Thruster::BOTTOM, port, fire, port_scale);
@@ -2165,7 +2164,7 @@ ShipDesign::ParseThruster(TermStruct* val)
}
if (!drive)
- drive = new(__FILE__,__LINE__) Thruster(dtype, thrust, tscale);
+ drive = new Thruster(dtype, thrust, tscale);
drive->SetSourceIndex(reactors.size()-1);
drive->Mount(loc, size, hull);
@@ -2269,7 +2268,7 @@ ShipDesign::ParseNavlight(TermStruct* val)
}
}
- NavLight* nav = new(__FILE__,__LINE__) NavLight(period, dscale);
+ NavLight* nav = new NavLight(period, dscale);
if (dname.length()) nav->SetName(dname);
if (dabrv.length()) nav->SetAbbreviation(dabrv);
@@ -2424,7 +2423,7 @@ ShipDesign::ParseFlightDeck(TermStruct* val)
}
}
- FlightDeck* deck = new(__FILE__,__LINE__) FlightDeck();
+ FlightDeck* deck = new FlightDeck();
deck->Mount(loc, size, hull);
if (dname.length()) deck->SetName(dname);
if (dabrv.length()) deck->SetAbbreviation(dabrv);
@@ -2524,7 +2523,7 @@ ShipDesign::ParseLandingGear(TermStruct* val)
}
if (ngear < LandingGear::MAX_GEAR) {
- Model* m = new(__FILE__,__LINE__) Model;
+ Model* m = new Model;
if (!m->Load(mod_name, scale)) {
Print("WARNING: Could not load landing gear model '%s'\n", mod_name);
delete m;
@@ -2545,7 +2544,7 @@ ShipDesign::ParseLandingGear(TermStruct* val)
}
}
- gear = new(__FILE__,__LINE__) LandingGear();
+ gear = new LandingGear();
if (dname.length()) gear->SetName(dname);
if (dabrv.length()) gear->SetAbbreviation(dabrv);
@@ -2712,7 +2711,7 @@ ShipDesign::ParseWeapon(TermStruct* val)
muzzles[i] *= (float) meta->scale;
}
- Weapon* gun = new(__FILE__,__LINE__) Weapon(meta, nmuz, muzzles, az, el);
+ Weapon* gun = new Weapon(meta, nmuz, muzzles, az, el);
gun->SetSourceIndex(reactors.size()-1);
gun->Mount(loc, size, hull);
@@ -2837,7 +2836,7 @@ ShipDesign::ParseHardPoint(TermStruct* val)
}
}
- HardPoint* hp = new(__FILE__,__LINE__) HardPoint(muzzle, az, el);
+ HardPoint* hp = new HardPoint(muzzle, az, el);
if (hp) {
for (int i = 0; i < ntypes; i++) {
WeaponDesign* meta = WeaponDesign::Find(wtypes[i]);
@@ -2866,7 +2865,7 @@ ShipDesign::ParseHardPoint(TermStruct* val)
void
ShipDesign::ParseLoadout(TermStruct* val)
{
- ShipLoad* load = new(__FILE__,__LINE__) ShipLoad;
+ ShipLoad* load = new ShipLoad;
if (!load) return;
@@ -2946,7 +2945,7 @@ ShipDesign::ParseSensor(TermStruct* val)
}
if (!sensor) {
- sensor = new(__FILE__,__LINE__) Sensor();
+ sensor = new Sensor();
if (design_name.length()) {
SystemDesign* sd = SystemDesign::Find(design_name);
@@ -3007,7 +3006,7 @@ ShipDesign::ParseNavsys(TermStruct* val)
}
if (!navsys) {
- navsys = new(__FILE__,__LINE__) NavSystem;
+ navsys = new NavSystem;
if (design_name.length()) {
SystemDesign* sd = SystemDesign::Find(design_name);
@@ -3068,7 +3067,7 @@ ShipDesign::ParseComputer(TermStruct* val)
}
}
- Computer* comp = new(__FILE__,__LINE__) Computer(comp_type, comp_name);
+ Computer* comp = new Computer(comp_type, comp_name);
comp->Mount(loc, size, hull);
comp->SetAbbreviation(comp_abrv);
comp->SetSourceIndex(reactors.size()-1);
@@ -3180,7 +3179,7 @@ ShipDesign::ParseShield(TermStruct* val)
if (!shield) {
if (shield_type) {
- shield = new(__FILE__,__LINE__) Shield((Shield::SUBTYPE) shield_type);
+ shield = new Shield((Shield::SUBTYPE) shield_type);
shield->SetSourceIndex(reactors.size()-1);
shield->Mount(loc, size, hull);
if (dname.length()) shield->SetName(dname);
@@ -3213,7 +3212,7 @@ ShipDesign::ParseShield(TermStruct* val)
shield->SetEMCONPower(1, emcon_3);
if (model_name.length()) {
- shield_model = new(__FILE__,__LINE__) Model;
+ shield_model = new Model;
if (!shield_model->Load(model_name, scale)) {
Print("ERROR: Could not load shield model '%s'\n", model_name.data());
delete shield_model;
@@ -3312,7 +3311,7 @@ ShipDesign::ParseDeathSpiral(TermStruct* val)
if (def->term() && def->term()->isText()) {
Text model_name;
GetDefText(model_name, def, filename);
- Model* model = new(__FILE__,__LINE__) Model;
+ Model* model = new Model;
if (!model->Load(model_name, scale)) {
Print("Could not load debris model '%s'\n", model_name.data());
delete model;
@@ -3420,7 +3419,7 @@ ShipDesign::ParseDebris(TermStruct* val, int index)
if (defname == "model") {
GetDefText(model_name, def, filename);
- Model* model = new(__FILE__,__LINE__) Model;
+ Model* model = new Model;
if (!model->Load(model_name, scale)) {
Print("Could not load debris model '%s'\n", model_name);
delete model;
@@ -3487,7 +3486,7 @@ ShipDesign::ParseMap(TermStruct* val)
if (defname == "sprite") {
GetDefText(sprite_name, pdef, filename);
- Bitmap* sprite = new(__FILE__,__LINE__) Bitmap();
+ Bitmap* sprite = new Bitmap();
DataLoader* loader = DataLoader::GetLoader();
loader->LoadBitmap(sprite_name, *sprite, Bitmap::BMP_TRANSLUCENT);
@@ -3531,7 +3530,7 @@ ShipDesign::ParseSquadron(TermStruct* val)
}
}
- ShipSquadron* s = new(__FILE__,__LINE__) ShipSquadron;
+ ShipSquadron* s = new ShipSquadron;
strcpy_s(s->name, name);
s->design = Get(design);
@@ -3560,7 +3559,7 @@ ShipDesign::ParseSkin(TermStruct* val)
if (defname == "name") {
GetDefText(name, def, filename);
- skin = new(__FILE__,__LINE__) Skin(name);
+ skin = new Skin(name);
}
else if (defname == "material" || defname == "mtl") {
if (!def->term() || !def->term()->isStruct()) {
@@ -3589,7 +3588,7 @@ ShipDesign::ParseSkin(TermStruct* val)
void
ShipDesign::ParseSkinMtl(TermStruct* val, Skin* skin)
{
- Material* mtl = new(__FILE__,__LINE__) Material;
+ Material* mtl = new Material;
if (mtl == nullptr)
return;
generated by cgit v1.1 at 2024-06-02 17:27:39 +0000