#include <simgear/compiler.h>
-#include STL_STRING
-#include STL_FSTREAM
+#include <string>
+#include <fstream>
#include <simgear/sg_inlines.h>
#include <simgear/debug/logstream.hxx>
#include <simgear/structure/exception.hxx>
#include <simgear/structure/commands.hxx>
#include <simgear/props/props.hxx>
+#include <simgear/structure/event_mgr.hxx>
#include <Cockpit/panel.hxx>
#include <Cockpit/panel_io.hxx>
#include "viewmgr.hxx"
#include "main.hxx"
-SG_USING_STD(string);
-SG_USING_STD(ifstream);
-SG_USING_STD(ofstream);
+using std::string;
+using std::ifstream;
+using std::ofstream;
\f
static bool
do_load (const SGPropertyNode * arg)
{
- const string &file = arg->getStringValue("file", "fgfs.sav");
+ string file = arg->getStringValue("file", "fgfs.sav");
+ if (file.size() < 4 || file.substr(file.size() - 4) != ".sav")
+ file += ".sav";
if (!fgValidatePath(file.c_str(), false)) {
SG_LOG(SG_IO, SG_ALERT, "load: reading '" << file << "' denied "
static bool
do_save (const SGPropertyNode * arg)
{
- const string &file = arg->getStringValue("file", "fgfs.sav");
+ string file = arg->getStringValue("file", "fgfs.sav");
+ if (file.size() < 4 || file.substr(file.size() - 4) != ".sav")
+ file += ".sav";
if (!fgValidatePath(file.c_str(), false)) {
SG_LOG(SG_IO, SG_ALERT, "save: reading '" << file << "' denied "