fly/flightgear
1
0
Fork 0
Code Activity

Fix an MSVC compile error.

Browse source
This commit is contained in:
curt 2004-04-19 02:24:22 +00:00
parent be7e5e4990
commit bded088de1
2 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/Main/fg_init.cxx
View file

@ -1001,26 +1001,25 @@ static bool fgSetPosFromFix( const string& id ) {
}
}
static bool parseWaypoints()
{
static void parseWaypoints() {
string_list *waypoints = globals->get_initial_waypoints();
if (waypoints)
{
if (waypoints) {
vector<string>::iterator i;
for (i = waypoints->begin();
i != waypoints->end();
i++)
{
NewWaypoint(*i);
}
{
NewWaypoint(*i);
}
// Now were done using the way points we can deallocate the
// memory they used
while (waypoints->begin() != waypoints->end())
waypoints->pop_back();
while (waypoints->begin() != waypoints->end()) {
waypoints->pop_back();
}
delete waypoints;
globals->set_initial_waypoints(0);
}
}
}
}

13
src/Main/options.cxx
View file

@ -539,13 +539,14 @@ add_channel( const string& type, const string& channel_str ) {
// at this stage.
// Parse --wp=ID[@alt]
static bool
static void
parse_wp( const string& arg ) {
string_list *waypoints = globals->get_initial_waypoints();
if (!waypoints)
waypoints = new string_list;
waypoints->push_back(arg);
globals->set_initial_waypoints(waypoints);
string_list *waypoints = globals->get_initial_waypoints();
if (!waypoints) {
waypoints = new string_list;
}
waypoints->push_back(arg);
globals->set_initial_waypoints(waypoints);
}