#endif
#include <math.h>
-#include <GL/glut.h>
+#include GLUT_H
#include <stdlib.h>
#include <string.h>
#include <simgear/logstream.hxx>
#include <simgear/constants.h>
#include <simgear/fg_random.h>
-#include <simgear/mat3.h>
#include <simgear/polar3d.hxx>
#include <Aircraft/aircraft.hxx>
#include <GUI/gui.h>
-#include <Main/options.hxx>
#include <Scenery/scenery.hxx>
#include <Time/fg_timer.hxx>
#endif
*/
-#include <Main/options.hxx>
#include <plib/sg.h>
#include <plib/ssg.h>
+#include <simgear/compiler.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;
// 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"));
// Disable Blast Mode -1 = Disable, 0 = Enable
net_blast_toggle = -1;
// We start unregistered, we reg. later via menu to fgd