]> git.mxchange.org Git - flightgear.git/commitdiff
Fix an MSVC compile error.
authorcurt <curt>
Mon, 19 Apr 2004 02:24:22 +0000 (02:24 +0000)
committercurt <curt>
Mon, 19 Apr 2004 02:24:22 +0000 (02:24 +0000)
src/Main/fg_init.cxx
src/Main/options.cxx

index 6eb034f31519593be870bea14ca6655ada0d87c9..6e1197735e764a2c002335a09dcd7c34cb0792ba 100644 (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);
-      }
-   }
+    }
+}
 
  
  
index c719def4fdde8e82ad1604d7b3c303b1f4c07585..0e19d6ee38f6f7f379c5826334d07d2873150ec1 100644 (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);
 }