From a9fdc0e3415420bdfd2d90531447ddeb4390c2ad Mon Sep 17 00:00:00 2001
From: curt <curt>
Date: Mon, 19 Jan 1998 18:35:40 +0000
Subject: [PATCH] Minor tweaks and fixes for cygwin32.

---
 FDM/flight.c       | 11 +++++++++--
 Main/GLUTmain.c    | 12 +++++++++---
 Simulator/make.inc |  7 +++++--
 Time/fg_time.c     | 16 +++++++++++-----
 4 files changed, 34 insertions(+), 12 deletions(-)

diff --git a/FDM/flight.c b/FDM/flight.c
index 283543b5f..bd51d5500 100644
--- a/FDM/flight.c
+++ b/FDM/flight.c
@@ -42,6 +42,8 @@ int fgFlightModelInit(int model, struct fgFLIGHT *f, double dt) {
 	printf("Unimplemented flight model == %d\n", model);
     }
 
+    result = 1;
+
     return(result);
 }
 
@@ -58,14 +60,19 @@ int fgFlightModelUpdate(int model, struct fgFLIGHT *f, int multiloop) {
 	printf("Unimplemented flight model == %d\n", model);
     }
 
+    result = 1;
+
     return(result);
 }
 
 
 /* $Log$
-/* Revision 1.5  1997/12/30 20:47:37  curt
-/* Integrated new event manager with subsystem initializations.
+/* Revision 1.6  1998/01/19 18:35:43  curt
+/* Minor tweaks and fixes for cygwin32.
 /*
+ * Revision 1.5  1997/12/30 20:47:37  curt
+ * Integrated new event manager with subsystem initializations.
+ *
  * Revision 1.4  1997/12/10 22:37:42  curt
  * Prepended "fg" on the name of all global structures that didn't have it yet.
  * i.e. "struct WEATHER {}" became "struct fgWEATHER {}"
diff --git a/Main/GLUTmain.c b/Main/GLUTmain.c
index 8152da3ae..0a94cb303 100644
--- a/Main/GLUTmain.c
+++ b/Main/GLUTmain.c
@@ -111,6 +111,9 @@ static void fgInitVisuals() {
     xglFogf (GL_FOG_END, w->visibility);
     /* xglFogf (GL_FOG_DENSITY, w->visibility); */
     xglHint (GL_FOG_HINT, GL_NICEST /* GL_FASTEST */ );
+
+    /* draw wire frame */
+    /* xglPolygonMode(GL_FRONT_AND_BACK,GL_LINE); */
 }
 
 
@@ -633,10 +636,13 @@ int main( int argc, char *argv[] ) {
 
 
 /* $Log$
-/* Revision 1.47  1998/01/13 00:23:08  curt
-/* Initial changes to support loading and management of scenery tiles.  Note,
-/* there's still a fair amount of work left to be done.
+/* Revision 1.48  1998/01/19 18:35:46  curt
+/* Minor tweaks and fixes for cygwin32.
 /*
+ * Revision 1.47  1998/01/13 00:23:08  curt
+ * Initial changes to support loading and management of scenery tiles.  Note,
+ * there's still a fair amount of work left to be done.
+ *
  * Revision 1.46  1998/01/08 02:22:06  curt
  * Beginning to integrate Tile management subsystem.
  *
diff --git a/Simulator/make.inc b/Simulator/make.inc
index 047be9237..94b7fd855 100644
--- a/Simulator/make.inc
+++ b/Simulator/make.inc
@@ -30,7 +30,7 @@
 #---------------------------------------------------------------------------
 
 FG_VERSION_MAJOR = 0
-FG_VERSION_MINOR = 23
+FG_VERSION_MINOR = 24
 FG_VERSION = $(FG_VERSION_MAJOR).$(FG_VERSION_MINOR)
 
 
@@ -153,12 +153,15 @@ FG_CFLAGS = $(GLOBAL_CFLAGS) $(FG_DEBUG_FLAGS)
 # INTERFACE_FILES = GLUTmain.c GLUTkey.c
 # GRAPHICS_LIBS = -lglu32 -lopengl32 -luser32 -lgdi32
 # FG_CFLAGS = $(GLOBAL_CFLAGS) $(FG_DEBUG_FLAGS) -DWIN32 -DUSE_RAND
-# LN = ren
+# LN = cp
 #---------------------------------------------------------------------------
 
 
 #---------------------------------------------------------------------------
 # $Log$
+# Revision 1.32  1998/01/19 18:35:40  curt
+# Minor tweaks and fixes for cygwin32.
+#
 # Revision 1.31  1998/01/08 02:21:46  curt
 # Version 0.23
 #
diff --git a/Time/fg_time.c b/Time/fg_time.c
index 8018b6348..6b49f0d02 100644
--- a/Time/fg_time.c
+++ b/Time/fg_time.c
@@ -57,7 +57,7 @@ void fgTimeInit(struct fgTIME *t) {
 
     t->gst_diff = -9999.0;
     t->warp = 0;
-    t->warp = 5 * 3600;
+    t->warp = 0 * 3600;
     t->warp_delta = 0;
 }
 
@@ -167,9 +167,12 @@ double sidereal_course(struct tm *gmt, time_t now, double lng) {
 
 #ifdef USE_FTIME
     struct timeb current;
+#endif /* USE_FTIME */
+
+#ifdef WIN32
     int daylight;
     long int timezone;
-#endif /* USE_FTIME */
+#endif /* WIN32 */
 
     /*
     printf("  COURSE: GMT = %d/%d/%2d %d:%02d:%02d\n", 
@@ -298,10 +301,13 @@ void fgTimeUpdate(struct fgFLIGHT *f, struct fgTIME *t) {
 
 
 /* $Log$
-/* Revision 1.27  1998/01/13 00:23:13  curt
-/* Initial changes to support loading and management of scenery tiles.  Note,
-/* there's still a fair amount of work left to be done.
+/* Revision 1.28  1998/01/19 18:35:49  curt
+/* Minor tweaks and fixes for cygwin32.
 /*
+ * Revision 1.27  1998/01/13 00:23:13  curt
+ * Initial changes to support loading and management of scenery tiles.  Note,
+ * there's still a fair amount of work left to be done.
+ *
  * Revision 1.26  1998/01/05 18:44:36  curt
  * Add an option to advance/decrease time from keyboard.
  *
-- 
2.39.2