Added write-all parameter to save command. If set to true, the

[flightgear.git] / src / NetworkOLK / network.cxx

diff --git a/src/NetworkOLK/network.cxx b/src/NetworkOLK/network.cxx
index 6e9ca43e12659f687ec17ec3b8eac57fb6a3b38e..d145ed5abc02cec68d8077b499db0679a9553113 100644 (file)
--- a/src/NetworkOLK/network.cxx
+++ b/src/NetworkOLK/network.cxx
@@ -50,7 +50,6 @@
 
 #include <Aircraft/aircraft.hxx>
 #include <GUI/gui.h>
-#include <Main/options.hxx>
 #include <Scenery/scenery.hxx>
 #include <Time/fg_timer.hxx>
 
@@ -61,10 +60,12 @@ extern "C" {
 #endif
 */
 
-#include <Main/options.hxx>
 #include <plib/sg.h>
 #include <plib/ssg.h>
 
+#include <Main/globals.hxx>
+#include <Main/fg_props.hxx>
+
 int  net_blast_toggle, net_hud_display, net_is_registered;
 char *net_callsign, *FGFS_host;
 sgMat4 sgFGD_VIEW;
@@ -79,7 +80,7 @@ char *fg_net_init( ssgRoot *orig_scene ){
  // We enable display of netinfos only if user wishes it via cmd-line param
  net_hud_display = (net_hud_display == 0) ? 0 : 1; 
  // Get pilot's name from options, can be modified at runtime via menu
- net_callsign = (char *) current_options.get_net_id().c_str();
+ net_callsign = (char *)(fgGetString("/sim/networking/call-sign").c_str());
  // Disable Blast Mode -1 = Disable, 0 = Enable  
  net_blast_toggle = -1;
  // We start unregistered, we reg. later via menu to fgd