#include <Main/fg_io.hxx>
#include <Main/globals.hxx>
#include <Main/fg_props.hxx>
-#include <Main/options.hxx>
#include <Main/viewmgr.hxx>
#ifdef FG_NETWORK_OLK
#include "apt_dlg.hxx"
#include "net_dlg.hxx"
#include "sgVec3Slider.hxx"
+#include "prop_picker.hxx"
SG_USING_STD(string);
string msg = txt;
msg += '\n';
msg += throwable.getFormattedMessage();
- if (throwable.getOrigin() != "") {
+ if (throwable.getOrigin() != (string)"") {
msg += "\n (reported by ";
msg += throwable.getOrigin();
msg += ')';
if( gui_menu_on ) {
// printf("Hiding Menu\n");
mainMenuBar->hide ();
-#if defined(WIN32_CURSOR_TWEAKS)
+#if defined(WIN32_CURSOR_TWEAKS_OFF)
if( mouse_mode == MOUSE_POINTER )
TurnCursorOff();
-#endif // #ifdef WIN32_CURSOR_TWEAKS
+#endif // WIN32_CURSOR_TWEAKS_OFF
} else {
// printf("Showing Menu\n");
mainMenuBar->reveal();
#ifdef WIN32
TurnCursorOn();
-#endif // #ifdef WIN32
+#endif // WIN32
}
gui_menu_on = ~gui_menu_on;
}
}
}
-// Do this is the person presses cancel
+// Do this if the person presses cancel
void LoadDialogCancel(puObject *) {
FG_POP_PUI_DIALOG( LoadDialog );
}
int y = (fgGetInt("/sim/startup/ysize")/2 - 100/2);
YNdialogBox = new puDialogBox (x, y); // 150, 50
- // YNdialogBox = new puDialogBox (150, 50);
{
YNdialogFrame = new puFrame (0,0,400, 100);
#if defined(FX) && !defined(WIN32)
# if defined(XMESA_FX_FULLSCREEN) && defined(XMESA_FX_WINDOW)
- if ( global_fullscreen ) {
- global_fullscreen = false;
+ if ( globals->get_fullscreen() ) {
+ globals->set_fullscreen(false);
XMesaSetFXmode( XMESA_FX_WINDOW );
}
# endif
SGPath path( globals->get_fg_root() );
path.append( "Docs/index.html" );
+#if !defined(WIN32)
string help_app = fgGetString("/sim/startup/browser-app");
if ( system("xwininfo -name Netscape > /dev/null 2>&1") == 0 ) {
} else {
command = help_app + " " + path.str();
}
-#if !defined(WIN32)
command += " &";
+#else // WIN32
+ command = "start ";
+ command += path.str();
#endif
system( command.c_str() );
char *filename = new char [24];
static int count = 1;
- int freeze = globals->get_freeze();
- if(!freeze)
- globals->set_freeze( true );
+ static const SGPropertyNode *master_freeze
+ = fgGetNode("/sim/freeze/master");
+
+ bool freeze = master_freeze->getBoolValue();
+ if ( !freeze ) {
+ fgSetBool("/sim/freeze/master", true);
+ }
if(gui_menu_on) {
show_menu = true;
glMatrixMode(GL_MODELVIEW);
glLoadIdentity();
ssgSetCamera( (sgVec4 *)globals->get_current_view()->get_VIEW() );
- float fov = globals->get_current_view()->get_fov();
- ssgSetFOV(fov, fov * globals->get_current_view()->get_fov_ratio());
+ ssgSetFOV( globals->get_current_view()->get_h_fov(),
+ globals->get_current_view()->get_v_fov() );
// ssgSetNearFar( 10.0f, 120000.0f );
ssgSetNearFar( 0.5f, 1200000.0f );
puShowCursor();
}
- if(!freeze)
- globals->set_freeze( false );
+ if ( !freeze ) {
+ fgSetBool("/sim/freeze/master", false);
+ }
}
#endif // #if defined( TR_HIRES_SNAP)
show_pu_cursor = true;
puHideCursor();
}
- BusyCursor( 0 );
+ // BusyCursor( 0 );
mainMenuBar->hide();
CGlPrinter p( CGlPrinter::PRINT_BITMAP );
if( gui_menu_on ) {
mainMenuBar->reveal();
}
- BusyCursor(1);
+ // BusyCursor(1);
if ( show_pu_cursor ) {
puShowCursor();
}
string message;
static int count = 1;
- int freeze = globals->get_freeze();
- if(!freeze)
- globals->set_freeze( true );
+ static const SGPropertyNode *master_freeze
+ = fgGetNode("/sim/freeze/master");
+
+ bool freeze = master_freeze->getBoolValue();
+ if ( !freeze ) {
+ fgSetBool("/sim/freeze/master", true);
+ }
mainMenuBar->hide();
TurnCursorOff();
mainMenuBar->reveal();
}
- if(!freeze)
- globals->set_freeze( false );
+ if ( !freeze ) {
+ fgSetBool("/sim/freeze/master", false);
+ }
}
#ifdef FG_NETWORK_OLK
extern void fgHUDalphaAdjust( puObject * );
char *viewSubmenu [] = {
+ "Properties",
"HUD Alpha",
"Pilot Offset",
/* "Cockpit View > ", "View >","------------", */
"Toggle Panel...", NULL
};
puCallback viewSubmenuCb [] = {
+ prop_pickerView,
fgHUDalphaAdjust,
PilotOffsetAdjust,
/* notCb, notCb, NULL, */
// Set up our Dialog Boxes
ConfirmExitDialogInit();
NewAirportInit();
+
#ifdef FG_NETWORK_OLK
NewNetIdInit();
NewNetFGDInit();