diff options
-rw-r--r-- | Parser/Reader.cpp | 4 | ||||
-rw-r--r-- | Parser/Term.cpp | 4 | ||||
-rw-r--r-- | Stars45/Campaign.cpp | 6 | ||||
-rw-r--r-- | Stars45/CampaignMissionFighter.cpp | 4 | ||||
-rw-r--r-- | Stars45/CampaignMissionStarship.cpp | 4 | ||||
-rw-r--r-- | Stars45/CombatGroup.cpp | 12 | ||||
-rw-r--r-- | Stars45/FltDlg.cpp | 4 | ||||
-rw-r--r-- | Stars45/NetBrokerClient.cpp | 4 | ||||
-rw-r--r-- | Stars45/NetGameClient.cpp | 4 | ||||
-rw-r--r-- | Stars45/NetLobbyClient.cpp | 4 | ||||
-rw-r--r-- | Stars45/NetUnitDlg.cpp | 4 | ||||
-rw-r--r-- | Stars45/ShipDesign.cpp | 22 | ||||
-rw-r--r-- | Stars45/Shot.cpp | 4 | ||||
-rw-r--r-- | Stars45/WeaponDesign.cpp | 4 |
14 files changed, 42 insertions, 42 deletions
diff --git a/Parser/Reader.cpp b/Parser/Reader.cpp index 2863d01..77b7f66 100644 --- a/Parser/Reader.cpp +++ b/Parser/Reader.cpp @@ -1,6 +1,6 @@ /* Project STARS
John DiCamillo Software Consulting
- Copyright © 1997-2000. All Rights Reserved.
+ Copyright (C) 1997-2000. All Rights Reserved.
SUBSYSTEM: obelisk
FILE: reader.cpp
@@ -63,7 +63,7 @@ FileReader::more() std::fstream fin(filename, std::fstream::in);
if (!fin) {
- Print("ERROR(Parse): Could not open file '%s'\n", filename);
+ Print("ERROR(Parse): Could not open file '%s'\n", filename.data());
return Text();
}
diff --git a/Parser/Term.cpp b/Parser/Term.cpp index 5c5f9d4..f1b9b69 100644 --- a/Parser/Term.cpp +++ b/Parser/Term.cpp @@ -1,6 +1,6 @@ /* Project STARS
John DiCamillo Software Consulting
- Copyright © 1997-2000. All Rights Reserved.
+ Copyright (C) 1997-2000. All Rights Reserved.
SUBSYSTEM: Stars
FILE: Term.cpp
@@ -34,7 +34,7 @@ error(char* s1, char* s2) void TermBool::print(int level) { if (level > 0) Print(val? "true" : "false"); else Print("..."); }
void TermNumber::print(int level){ if (level > 0) Print("%g", val); else Print("..."); }
-void TermText::print(int level) { if (level > 0) Print("\"%s\"", val); else Print("..."); }
+void TermText::print(int level) { if (level > 0) Print("\"%s\"", val.data()); else Print("..."); }
// +-------------------------------------------------------------------+
diff --git a/Stars45/Campaign.cpp b/Stars45/Campaign.cpp index fb7fdbe..7d943e0 100644 --- a/Stars45/Campaign.cpp +++ b/Stars45/Campaign.cpp @@ -1,6 +1,6 @@ /* Project Starshatter 4.5
Destroyer Studios LLC
- Copyright © 1997-2006. All Rights Reserved.
+ Copyright (C) 1997-2006. All Rights Reserved.
SUBSYSTEM: Stars.exe
FILE: Campaign.cpp
@@ -1678,9 +1678,9 @@ Campaign::DeleteMission(int id) char full_path[256];
if (path[strlen(path)-1] == '/')
- sprintf_s(full_path, "%s%s", path, m->script);
+ sprintf_s(full_path, "%s%s", path, m->script.data());
else
- sprintf_s(full_path, "%s/%s", path, m->script);
+ sprintf_s(full_path, "%s/%s", path, m->script.data());
DeleteFile(full_path);
Load();
diff --git a/Stars45/CampaignMissionFighter.cpp b/Stars45/CampaignMissionFighter.cpp index 41055e5..7475cb0 100644 --- a/Stars45/CampaignMissionFighter.cpp +++ b/Stars45/CampaignMissionFighter.cpp @@ -1,6 +1,6 @@ /* Project Starshatter 4.5
Destroyer Studios LLC
- Copyright © 1997-2004. All Rights Reserved.
+ Copyright (C) 1997-2004. All Rights Reserved.
SUBSYSTEM: Stars.exe
FILE: CampaignMissionFighter.cpp
@@ -109,7 +109,7 @@ CampaignMissionFighter::CreateMission(CampaignMissionRequest* req) else
::Print("CMF CreateMission() request: %s %s\n",
Mission::RoleName(req->Type()),
- req->GetObjective() ? req->GetObjective()->Name() : "(no target)");
+ req->GetObjective() ? req->GetObjective()->Name().data() : "(no target)");
request = req;
mission_info = 0;
diff --git a/Stars45/CampaignMissionStarship.cpp b/Stars45/CampaignMissionStarship.cpp index 45eda11..176aaed 100644 --- a/Stars45/CampaignMissionStarship.cpp +++ b/Stars45/CampaignMissionStarship.cpp @@ -1,6 +1,6 @@ /* Project Starshatter 4.5
Destroyer Studios LLC
- Copyright © 1997-2004. All Rights Reserved.
+ Copyright (C) 1997-2004. All Rights Reserved.
SUBSYSTEM: Stars.exe
FILE: CampaignMissionStarship.cpp
@@ -73,7 +73,7 @@ CampaignMissionStarship::CreateMission(CampaignMissionRequest* req) else
::Print("CMS CreateMission() request: %s %s\n",
Mission::RoleName(req->Type()),
- req->GetObjective() ? req->GetObjective()->Name() : "(no target)");
+ req->GetObjective() ? req->GetObjective()->Name().data() : "(no target)");
request = req;
diff --git a/Stars45/CombatGroup.cpp b/Stars45/CombatGroup.cpp index fe41f1a..5ddda20 100644 --- a/Stars45/CombatGroup.cpp +++ b/Stars45/CombatGroup.cpp @@ -1,6 +1,6 @@ /* Project Starshatter 4.5
Destroyer Studios LLC
- Copyright © 1997-2004. All Rights Reserved.
+ Copyright (C) 1997-2004. All Rights Reserved.
SUBSYSTEM: Stars.exe
FILE: CombatGroup.cpp
@@ -493,7 +493,7 @@ CombatGroup::GetDescription() const case LCA_SQUADRON: sprintf_s(desc, "%s %s%s", GetOrdinal(), Game::GetText("CombatGroup.LCA_SQUADRON").data(), name_desc); break;
case BATTALION: sprintf_s(desc, "%s %s%s", GetOrdinal(), Game::GetText("CombatGroup.BATTALION").data(), name_desc); break;
- case STATION: sprintf_s(desc, "%s %s", Game::GetText("CombatGroup.STATION").data(), name); break;
+ case STATION: sprintf_s(desc, "%s %s", Game::GetText("CombatGroup.STATION").data(), name.data()); break;
case STARBASE: sprintf_s(desc, "%s %d%s", Game::GetText("CombatGroup.STARBASE").data(), id, name_desc); break;
case MINEFIELD: sprintf_s(desc, "%s %s%s", GetOrdinal(), Game::GetText("CombatGroup.MINEFIELD").data(), name_desc); break;
case BATTERY: sprintf_s(desc, "%s %s%s", GetOrdinal(), Game::GetText("CombatGroup.BATTERY").data(), name_desc); break;
@@ -1199,7 +1199,7 @@ CombatGroup::LoadOrderOfBattle(const char* filename, int team, Combatant* combat while (term);
loader->ReleaseBuffer(block);
- Print("Order of Battle Loaded (%s).\n", force ? force->Name() : "unknown force");
+ Print("Order of Battle Loaded (%s).\n", force ? force->Name().data() : "unknown force");
if (force)
force->CalcValue();
@@ -1460,7 +1460,7 @@ CombatGroup::MergeOrderOfBattle(BYTE* block, const char* filename, int team, Com }
while (term);
- Print("Order of Battle Loaded (%s).\n", force ? force->Name() : "unknown force");
+ Print("Order of Battle Loaded (%s).\n", force ? force->Name().data() : "unknown force");
if (force)
force->CalcValue();
@@ -1528,13 +1528,13 @@ SaveCombatGroup(FILE* f, CombatGroup* g) fprintf(f, "group: {");
fprintf(f, " type: %s,", CombatGroup::NameFromType(g->Type()));
fprintf(f, " id: %d,", g->GetID());
- fprintf(f, " name: \"%s\",", g->Name());
+ fprintf(f, " name: \"%s\",", g->Name().data());
fprintf(f, " intel: %s,", Intel::NameFromIntel(g->IntelLevel()));
fprintf(f, " iff: %d,", g->GetIFF());
fprintf(f, " unit_index: %d,", g->UnitIndex());
if (g->GetRegion().length()) {
- fprintf(f, " region:\"%s\",", g->GetRegion());
+ fprintf(f, " region:\"%s\",", g->GetRegion().data());
}
if (g->GetAssignedSystem().length()) {
diff --git a/Stars45/FltDlg.cpp b/Stars45/FltDlg.cpp index 04ac926..c9ac443 100644 --- a/Stars45/FltDlg.cpp +++ b/Stars45/FltDlg.cpp @@ -1,6 +1,6 @@ /* Project Starshatter 4.5
Destroyer Studios LLC
- Copyright © 1997-2004. All Rights Reserved.
+ Copyright (C) 1997-2004. All Rights Reserved.
SUBSYSTEM: Stars.exe
FILE: FltDlg.cpp
@@ -136,7 +136,7 @@ FltDlg::SetShip(Ship* s) char filter[64];
sprintf_s(filter, "%s %s",
hangar->SquadronDesign(i)->abrv,
- hangar->SquadronName(i));
+ hangar->SquadronName(i).data());
filter_list->AddItem(filter);
}
diff --git a/Stars45/NetBrokerClient.cpp b/Stars45/NetBrokerClient.cpp index df913e8..a29a686 100644 --- a/Stars45/NetBrokerClient.cpp +++ b/Stars45/NetBrokerClient.cpp @@ -1,6 +1,6 @@ /* Project Starshatter 4.5
Destroyer Studios LLC
- Copyright © 1997-2004. All Rights Reserved.
+ Copyright (C) 1997-2004. All Rights Reserved.
SUBSYSTEM: Stars.exe
FILE: NetBrokerClient.cpp
@@ -83,7 +83,7 @@ const char* password) if (response) {
::Print(" Response Status: %d\n", response->Status());
- ::Print(" Response Content: %s\n", response->Content());
+ ::Print(" Response Content: %s\n", response->Content().data());
}
else {
::Print(" No response.\n");
diff --git a/Stars45/NetGameClient.cpp b/Stars45/NetGameClient.cpp index b237f81..6c3a156 100644 --- a/Stars45/NetGameClient.cpp +++ b/Stars45/NetGameClient.cpp @@ -1,6 +1,6 @@ /* Project Starshatter 4.5
Destroyer Studios LLC
- Copyright © 1997-2004. All Rights Reserved.
+ Copyright (C) 1997-2004. All Rights Reserved.
SUBSYSTEM: Stars.exe
FILE: NetGameClient.cpp
@@ -72,7 +72,7 @@ NetGameClient::NetGameClient() }
if (server_name.length() && port > 0) {
- Print(" '%s' is a client of '%s'\n", me.Name(), server_name);
+ Print(" '%s' is a client of '%s'\n", me.Name(), server_name.data());
link = new(__FILE__,__LINE__) NetLink;
server_id = link->AddPeer(NetAddr(server_name, port));
SendJoinRequest();
diff --git a/Stars45/NetLobbyClient.cpp b/Stars45/NetLobbyClient.cpp index b0e54b3..35182dc 100644 --- a/Stars45/NetLobbyClient.cpp +++ b/Stars45/NetLobbyClient.cpp @@ -1,6 +1,6 @@ /* Project Starshatter 4.5
Destroyer Studios LLC
- Copyright © 1997-2004. All Rights Reserved.
+ Copyright (C) 1997-2004. All Rights Reserved.
SUBSYSTEM: Stars.exe
FILE: NetLobbyClient.cpp
@@ -61,7 +61,7 @@ NetLobbyClient::NetLobbyClient() }
if (server_name.length() && port > 0) {
- Print(" '%s' is a client of '%s'\n", me.Name(), server_name);
+ Print(" '%s' is a client of '%s'\n", me.Name(), server_name.data());
link = new(__FILE__,__LINE__) NetLink;
server_id = link->AddPeer(NetAddr(server_name, port));
}
diff --git a/Stars45/NetUnitDlg.cpp b/Stars45/NetUnitDlg.cpp index 9fb0670..f335485 100644 --- a/Stars45/NetUnitDlg.cpp +++ b/Stars45/NetUnitDlg.cpp @@ -1,6 +1,6 @@ /* Project Starshatter 5.0
Destroyer Studios LLC
- Copyright © 1997-2007. All Rights Reserved.
+ Copyright (C) 1997-2007. All Rights Reserved.
SUBSYSTEM: Stars.exe
FILE: NetUnitDlg.cpp
@@ -581,7 +581,7 @@ NetUnitDlg::OnBan(AWEvent* event) ConfirmDlg* confirm = manager->GetConfirmDlg();
if (confirm) {
char msg[512];
- sprintf_s(msg, Game::GetText("NetUnitDlg.are-you-sure").data(), u->Name());
+ sprintf_s(msg, Game::GetText("NetUnitDlg.are-you-sure").data(), u->Name().data());
confirm->SetMessage(msg);
confirm->SetTitle(Game::GetText("NetUnitDlg.confirm-ban"));
confirm->SetParentControl(btn_ban);
diff --git a/Stars45/ShipDesign.cpp b/Stars45/ShipDesign.cpp index 3017fcb..9965d3d 100644 --- a/Stars45/ShipDesign.cpp +++ b/Stars45/ShipDesign.cpp @@ -1,6 +1,6 @@ /* Project Starshatter 5.0
Destroyer Studios LLC
- Copyright © 1997-2007. All Rights Reserved.
+ Copyright (C) 1997-2007. All Rights Reserved.
SUBSYSTEM: Stars.exe
FILE: ShipDesign.cpp
@@ -532,14 +532,14 @@ void AddModCatalogEntry(const char* design_name, const char* design_path) Term* term = parser.ParseTerm();
if (!term) {
- Print("ERROR: could not parse '%s'\n", file);
+ Print("ERROR: could not parse '%s'\n", file.data());
delete block;
return;
}
else {
TermText* file_type = term->isText();
if (!file_type || file_type->value() != "SHIP") {
- Print("ERROR: invalid ship design file '%s'\n", file);
+ Print("ERROR: invalid ship design file '%s'\n", file.data());
delete block;
return;
}
@@ -560,20 +560,20 @@ void AddModCatalogEntry(const char* design_name, const char* design_path) if (defname == "class") {
if (!GetDefText(type, def, file)) {
- Print("WARNING: invalid or missing ship class in '%s'\n", file);
+ Print("WARNING: invalid or missing ship class in '%s'\n", file.data());
valid = false;
}
}
else if (defname == "name") {
if (!GetDefText(name, def, file)) {
- Print("WARNING: invalid or missing ship name in '%s'\n", file);
+ Print("WARNING: invalid or missing ship name in '%s'\n", file.data());
valid = false;
}
}
}
else {
- Print("WARNING: term ignored in '%s'\n", file);
+ Print("WARNING: term ignored in '%s'\n", file.data());
term->print();
}
}
@@ -777,13 +777,13 @@ ShipDesign::LoadSkins(const char* path, const char* archive) ShipDesign* design = 0;
if (!term) {
- Print("ERROR: could not parse '%s'\n", filename);
+ Print("ERROR: could not parse '%s'\n", filename.data());
return;
}
else {
TermText* file_type = term->isText();
if (!file_type || file_type->value() != "SKIN") {
- Print("ERROR: invalid skin file '%s'\n", filename);
+ Print("ERROR: invalid skin file '%s'\n", filename.data());
return;
}
}
@@ -807,7 +807,7 @@ ShipDesign::LoadSkins(const char* path, const char* archive) else if (defname == "skin" && design != 0) {
if (!def->term() || !def->term()->isStruct()) {
- Print("WARNING: skin struct missing in '%s'\n", filename);
+ Print("WARNING: skin struct missing in '%s'\n", filename.data());
}
else {
TermStruct* val = def->term()->isStruct();
@@ -3215,7 +3215,7 @@ ShipDesign::ParseShield(TermStruct* val) if (model_name.length()) {
shield_model = new(__FILE__,__LINE__) Model;
if (!shield_model->Load(model_name, scale)) {
- Print("ERROR: Could not load shield model '%s'\n", model_name);
+ Print("ERROR: Could not load shield model '%s'\n", model_name.data());
delete shield_model;
shield_model = 0;
valid = false;
@@ -3314,7 +3314,7 @@ ShipDesign::ParseDeathSpiral(TermStruct* val) GetDefText(model_name, def, filename);
Model* model = new(__FILE__,__LINE__) Model;
if (!model->Load(model_name, scale)) {
- Print("Could not load debris model '%s'\n", model_name);
+ Print("Could not load debris model '%s'\n", model_name.data());
delete model;
return;
}
diff --git a/Stars45/Shot.cpp b/Stars45/Shot.cpp index 6f3ee93..8311843 100644 --- a/Stars45/Shot.cpp +++ b/Stars45/Shot.cpp @@ -1,6 +1,6 @@ /* Project Starshatter 4.5
Destroyer Studios LLC
- Copyright © 1997-2004. All Rights Reserved.
+ Copyright (C) 1997-2004. All Rights Reserved.
SUBSYSTEM: Stars.exe
FILE: Shot.cpp
@@ -133,7 +133,7 @@ charge(1.0f), design(dsn), offset(1.0e5f), altitude_agl(-1.0e6f), hit_target(fal Observe((SimObject*) owner);
}
- sprintf_s(name, "Shot(%s)", design->name);
+ sprintf_s(name, "Shot(%s)", design->name.data());
}
// +--------------------------------------------------------------------+
diff --git a/Stars45/WeaponDesign.cpp b/Stars45/WeaponDesign.cpp index 524e50e..5ef9cae 100644 --- a/Stars45/WeaponDesign.cpp +++ b/Stars45/WeaponDesign.cpp @@ -1,6 +1,6 @@ /* Project Starshatter 4.5
Destroyer Studios LLC
- Copyright © 1997-2004. All Rights Reserved.
+ Copyright (C) 1997-2004. All Rights Reserved.
SUBSYSTEM: Stars.exe
FILE: WeaponDesign.cpp
@@ -696,7 +696,7 @@ WeaponDesign::FindModDesign(const char* name) WeaponDesign* d = mod_catalog.at(i);
if (d->name == name) {
- Print("WeaponDesign: found mod weapon '%s'\n", d->name);
+ Print("WeaponDesign: found mod weapon '%s'\n", d->name.data());
return d;
}
}
|