Changed #ifdef FILE_H to #ifdef _FILE_H

[flightgear.git] / Main / fg_init.c

diff --git a/Main/fg_init.c b/Main/fg_init.c
index c1c9df13372c0bde8eb2ea682a6c399cc2a3df20..9b95510bb4e3f2ed9cccd97eb4e3ca02cdaf9e77 100644 (file)
--- a/Main/fg_init.c
+++ b/Main/fg_init.c
@@ -27,27 +27,27 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "fg_init.h"
-#include "views.h"
-
-#include "../Include/constants.h"
-#include "../Include/general.h"
-
-#include "../Aircraft/aircraft.h"
-#include "../Astro/moon.h"
-#include "../Astro/sky.h"
-#include "../Astro/stars.h"
-#include "../Astro/sun.h"
-#include "../Cockpit/cockpit.h"
-#include "../Joystick/joystick.h"
-#include "../Math/fg_random.h"
-#include "../Scenery/mesh.h"
-#include "../Scenery/scenery.h"
-#include "../Scenery/tilemgr.h"
-#include "../Time/event.h"
-#include "../Time/fg_time.h"
-#include "../Time/sunpos.h"
-#include "../Weather/weather.h"
+#include <Main/fg_init.h>
+#include <Main/views.h>
+
+#include <Include/constants.h>
+#include <Include/general.h>
+
+#include <Aircraft/aircraft.h>
+#include <Astro/moon.h>
+#include <Astro/sky.h>
+#include <Astro/stars.h>
+#include <Astro/sun.h>
+#include <Cockpit/cockpit.h>
+#include <Joystick/joystick.h>
+#include <Math/fg_random.h>
+#include <Scenery/mesh.h>
+#include <Scenery/scenery.h>
+#include <Scenery/tilemgr.h>
+#include <Time/event.h>
+#include <Time/fg_time.h>
+#include <Time/sunpos.h>
+#include <Weather/weather.h>
 
 
 extern int show_hud;             /* HUD state */
@@ -113,22 +113,29 @@ void fgInitSubsystems( void ) {
     /* Initial Position at (P13) GLOBE airport */
     FG_Longitude = ( -398391.28 / 3600.0 ) * DEG_TO_RAD;
     FG_Latitude  = (  120070.41 / 3600.0 ) * DEG_TO_RAD;
+    FG_Runway_altitude = (3234.5 + 300);
     FG_Altitude = FG_Runway_altitude + 3.758099;
     
     /* Initial Position at (SEZ) SEDONA airport */
-    FG_Longitude = -111.7884614 * DEG_TO_RAD;
-    FG_Latitude  = 34.8486289 * DEG_TO_RAD;
-    FG_Runway_altitude = 4827;
-    FG_Altitude = FG_Runway_altitude + 3.758099;
+    /* FG_Longitude = (-111.7884614 + 0.02) * DEG_TO_RAD; */
+    /* FG_Latitude  = (  34.8486289 - 0.04) * DEG_TO_RAD; */
+    /* FG_Runway_altitude = (4827 + 800); */
+    /* FG_Altitude = FG_Runway_altitude + 3.758099; */
+        
+    /* Initial Position at (HSP) Hot Springs, VA */
+    /* FG_Longitude = (-79.8338964 + 0.02) * DEG_TO_RAD; */
+    /* FG_Latitude  = ( 37.9514564 + 0.05) * DEG_TO_RAD; */
+    /* FG_Runway_altitude = (792 + 1500); */
+    /* FG_Altitude = FG_Runway_altitude + 3.758099; */
     
     /* Initial Position at (ANE) Anoka County airport */
-    FG_Longitude = -93.2113889 * DEG_TO_RAD;
-    FG_Latitude  = 45.145 * DEG_TO_RAD;
-    FG_Runway_altitude = 912;
-    FG_Altitude = FG_Runway_altitude + 3.758099;
+    /* FG_Longitude = -93.2113889 * DEG_TO_RAD; */
+    /* FG_Latitude  = 45.145 * DEG_TO_RAD; */
+    /* FG_Runway_altitude = 912; */
+    /* FG_Altitude = FG_Runway_altitude + 3.758099; */
     
     /* Initial Position north of the city of Globe */
-    /* FG_Longitude = ( -398673.28 / 3600.0 ) * DEG_TO_RAD; */
+    /* FGto do the install_Longitude = ( -398673.28 / 3600.0 ) * DEG_TO_RAD; */
     /* FG_Latitude  = (  120625.64 / 3600.0 ) * DEG_TO_RAD; */
     /* FG_Longitude = ( -397867.44 / 3600.0 ) * DEG_TO_RAD; */
     /* FG_Latitude  = (  119548.21 / 3600.0 ) * DEG_TO_RAD; */
@@ -149,8 +156,7 @@ void fgInitSubsystems( void ) {
     /* FG_Longitude = ( 88128.00 / 3600.0 ) * DEG_TO_RAD; */
     /* FG_Latitude  = ( 93312.00 / 3600.0 ) * DEG_TO_RAD; */
 
- 
-   printf("Initial position is: (%.4f, %.4f, %.2f)\n", 
+     printf("Initial position is: (%.4f, %.4f, %.2f)\n", 
           FG_Longitude * RAD_TO_DEG, FG_Latitude * RAD_TO_DEG, 
           FG_Altitude * FEET_TO_METER);
 
@@ -287,10 +293,20 @@ void fgInitSubsystems( void ) {
 
 
 /* $Log$
-/* Revision 1.31  1998/01/19 18:40:32  curt
-/* Tons of little changes to clean up the code and to remove fatal errors
-/* when building with the c++ compiler.
+/* Revision 1.34  1998/01/22 02:59:37  curt
+/* Changed #ifdef FILE_H to #ifdef _FILE_H
 /*
+ * Revision 1.33  1998/01/21 21:11:34  curt
+ * Misc. tweaks.
+ *
+ * Revision 1.32  1998/01/19 19:27:08  curt
+ * Merged in make system changes from Bob Kuehne <rpk@sgi.com>
+ * This should simplify things tremendously.
+ *
+ * Revision 1.31  1998/01/19 18:40:32  curt
+ * Tons of little changes to clean up the code and to remove fatal errors
+ * when building with the c++ compiler.
+ *
  * Revision 1.30  1998/01/13 00:23:09  curt
  * Initial changes to support loading and management of scenery tiles.  Note,
  * there's still a fair amount of work left to be done.