diff options
Diffstat (limited to 'Stars45/ShipDesign.cpp')
| -rw-r--r-- | Stars45/ShipDesign.cpp | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/Stars45/ShipDesign.cpp b/Stars45/ShipDesign.cpp index 9602609..9f67772 100644 --- a/Stars45/ShipDesign.cpp +++ b/Stars45/ShipDesign.cpp @@ -314,7 +314,7 @@ bolt_hit_sound_resource(0), beam_hit_sound_resource(0), lod_levels(0) delete term; term = parser.ParseTerm(); - + if (term) { TermDef* def = term->isDef(); if (def) { @@ -517,7 +517,7 @@ void AddModCatalogEntry(const char* design_name, const char* design_path) if (design_path && *design_path) { Text full_path = "Mods/Ships/"; full_path += design_path; - + if (e->path != full_path) continue; } @@ -575,7 +575,7 @@ void AddModCatalogEntry(const char* design_name, const char* design_path) delete term; term = parser.ParseTerm(); - + if (term) { TermDef* def = term->isDef(); if (def) { @@ -716,7 +716,7 @@ ShipDesign::LoadCatalog(const char* path, const char* fname, bool mod) Text name, type, fname, path; bool hide = false; - + if (term) { TermDef* def = term->isDef(); if (def && def->term() && def->term()->isStruct()) { @@ -816,7 +816,7 @@ ShipDesign::LoadSkins(const char* path, const char* archive) delete term; term = parser.ParseTerm(); - + if (term) { TermDef* def = term->isDef(); if (def) { @@ -950,7 +950,7 @@ ShipDesign::Get(const char* design_name, const char* design_path) if (design_path && *design_path) { Text full_path = "Mods/Ships/"; full_path += design_path; - + if (e->path != full_path) continue; } @@ -996,8 +996,8 @@ ShipDesign::FindModDesign(const char* design_name, const char* design_path) Print("ShipDesign: found mod design '%s'\n", design->name); ShipCatalogEntry* entry = new(__FILE__,__LINE__) ShipCatalogEntry(design->name, - ClassName(design->type), - path, + ClassName(design->type), + path, file); mod_catalog.append(entry); entry->design = design; @@ -1075,7 +1075,7 @@ ShipDesign::ClassForName(const char* name) if (!name || !name[0]) return 0; - for (int i = 0; i < 32; i++) { + for (int i = 0; i < 32; i++) { if (!_stricmp(name, ship_design_class_name[i])) { return 1 << i; } @@ -1568,7 +1568,7 @@ ShipDesign::ParsePower(TermStruct* val) if (defname == "type") { TermText* tname = pdef->term()->isText(); - + if (tname) { if (tname->value()[0] == 'B') stype = PowerSource::BATTERY; else if (tname->value()[0] == 'A') stype = PowerSource::AUX; @@ -1764,13 +1764,13 @@ ShipDesign::ParseDrive(TermStruct* val) drive->AddPort(port, flare_scale); } - + else if (defname == "loc") { if (!GetDefVec(loc, pdef, filename)) Print("WARNING: invalid or missing loc for drive in '%s'\n", filename); loc *= (float) scale; } - + else if (defname == "size") { if (!GetDefNumber(size, pdef, filename)) Print("WARNING: invalid or missing size for drive in '%s'\n", filename); @@ -2546,7 +2546,7 @@ ShipDesign::ParseLandingGear(TermStruct* val) } } } - + if (ngear < LandingGear::MAX_GEAR) { Model* m = new(__FILE__,__LINE__) Model; if (!m->Load(mod_name, scale)) { |