X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FNetworkOLK%2Fnetwork.cxx;h=d145ed5abc02cec68d8077b499db0679a9553113;hb=b9e866cfdd765cc742a6c9b3e35c8a9c1ca08dfc;hp=845bed907887c610e74b90165a6728ef8820e7ba;hpb=a93e97c4383f6ee403f8ecc3d2f5fedc8ebacba6;p=flightgear.git

diff --git a/src/NetworkOLK/network.cxx b/src/NetworkOLK/network.cxx
index 845bed907..d145ed5ab 100644
--- a/src/NetworkOLK/network.cxx
+++ b/src/NetworkOLK/network.cxx
@@ -2,7 +2,7 @@
 //
 // Written by Oliver Delise, started May 1999.
 //
-// Copyleft (C) 1999  Oliver Delise - delise@rp-plus.de
+// Copyleft (C) 1999  Oliver Delise - delise@mail.isis.de
 //
 // This program is free software; you can redistribute it and/or
 // modify it under the terms of the GNU General Public License as
@@ -43,14 +43,13 @@
 #  include <values.h>  // for MAXINT
 #endif
 
+#include <simgear/logstream.hxx>
+#include <simgear/constants.h>
+#include <simgear/fg_random.h>
+#include <simgear/polar3d.hxx>
+
 #include <Aircraft/aircraft.hxx>
-#include <Debug/logstream.hxx>
 #include <GUI/gui.h>
-#include <Include/fg_constants.h>
-#include <Main/options.hxx>
-#include <Math/fg_random.h>
-#include <Math/mat3.h>
-#include <Math/polar3d.hxx>
 #include <Scenery/scenery.hxx>
 #include <Time/fg_timer.hxx>
 
@@ -61,9 +60,11 @@ extern "C" {
 #endif
 */
 
-#include <Main/options.hxx>
-#include <sg.h>
-#include <ssg.h>
+#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;
@@ -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