diff options
author | FWoltermann@gmail.com <FWoltermann@gmail.com@076cb2c4-205e-83fd-5cf3-1be9aa105544> | 2011-12-09 21:12:14 +0000 |
---|---|---|
committer | FWoltermann@gmail.com <FWoltermann@gmail.com@076cb2c4-205e-83fd-5cf3-1be9aa105544> | 2011-12-09 21:12:14 +0000 |
commit | 9a2f3d3377b82b597f00d1d8fb8ee58d141cfb95 (patch) | |
tree | aa4691cd582e1b074d43ba30e930f29b7942885d /Stars45/CampaignMissionStarship.cpp | |
parent | b2805409566af00bc15639494f5a186fbd2f16e6 (diff) | |
download | starshatter-9a2f3d3377b82b597f00d1d8fb8ee58d141cfb95.zip starshatter-9a2f3d3377b82b597f00d1d8fb8ee58d141cfb95.tar.gz starshatter-9a2f3d3377b82b597f00d1d8fb8ee58d141cfb95.tar.bz2 |
More string safety stuff
Diffstat (limited to 'Stars45/CampaignMissionStarship.cpp')
-rw-r--r-- | Stars45/CampaignMissionStarship.cpp | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/Stars45/CampaignMissionStarship.cpp b/Stars45/CampaignMissionStarship.cpp index f26c7ad..45eda11 100644 --- a/Stars45/CampaignMissionStarship.cpp +++ b/Stars45/CampaignMissionStarship.cpp @@ -114,8 +114,9 @@ CampaignMissionStarship::CreateMission(CampaignMissionRequest* req) Text script = mission->Serialize();
char fname[32];
- sprintf(fname, "msn%03d.def", info->id);
- FILE* f = fopen(fname, "w");
+ sprintf_s(fname, "msn%03d.def", info->id);
+ FILE* f;
+ fopen_s(&f, fname, "w");
if (f) {
fprintf(f, "%s\n", script.data());
fclose(f);
@@ -169,7 +170,7 @@ CampaignMissionStarship::GenerateMission(int id) }
char name[64];
- sprintf(name, "Starship Mission %d", id);
+ sprintf_s(name, "Starship Mission %d", id);
mission->SetName(name);
mission->SetTeam(player_group->GetIFF());
@@ -1356,21 +1357,18 @@ CampaignMissionStarship::DescribeMission() char player_info[256];
if (mission_info && mission_info->name.length())
- sprintf(name, "MSN-%03d %s", mission->Identity(), mission_info->name.data());
-
+ sprintf_s(name, "MSN-%03d %s", mission->Identity(), mission_info->name.data());
else if (ward)
- sprintf(name, "MSN-%03d %s %s", mission->Identity(), Game::GetText(mission->TypeName()).data(), ward->Name().data());
-
+ sprintf_s(name, "MSN-%03d %s %s", mission->Identity(), Game::GetText(mission->TypeName()).data(), ward->Name().data());
else if (prime_target)
- sprintf(name, "MSN-%03d %s %s %s", mission->Identity(), Game::GetText(mission->TypeName()).data(),
- Ship::ClassName(prime_target->GetDesign()->type),
- prime_target->Name().data());
-
+ sprintf_s(name, "MSN-%03d %s %s %s", mission->Identity(), Game::GetText(mission->TypeName()).data(),
+ Ship::ClassName(prime_target->GetDesign()->type),
+ prime_target->Name().data());
else
- sprintf(name, "MSN-%03d %s", mission->Identity(), Game::GetText(mission->TypeName()).data());
+ sprintf_s(name, "MSN-%03d %s", mission->Identity(), Game::GetText(mission->TypeName()).data());
if (player) {
- strcpy(player_info, player->GetCombatGroup()->GetDescription());
+ strcpy_s(player_info, player->GetCombatGroup()->GetDescription());
}
MissionInfo* info = new(__FILE__,__LINE__) MissionInfo;
|