X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Fmswin%2Ffg_init_mswin.c;h=b1c51da15b63efe6700bc3c67f3da184372ddebc;hb=831749819dcdc1ea884c18607c2b447bbf5fca72;hp=f80fe78803769031e384a286ba4d2674c88cc148;hpb=5b3d339481bac6dbaeb599bffc1325f716585bfe;p=freeglut

diff --git a/src/mswin/fg_init_mswin.c b/src/mswin/fg_init_mswin.c
index f80fe78..b1c51da 100644
--- a/src/mswin/fg_init_mswin.c
+++ b/src/mswin/fg_init_mswin.c
@@ -1,5 +1,5 @@
 /*
- * freeglut_init_mswin.c
+ * fg_init_mswin.c
  *
  * The Windows-specific mouse cursor related stuff.
  *
@@ -33,6 +33,8 @@
 
 extern LRESULT CALLBACK fgPlatformWindowProc( HWND hWnd, UINT uMsg,
                                WPARAM wParam, LPARAM lParam );
+extern void fgPlatformInitSystemTime();
+extern void fghCloseInputDevices(void);
 
 
 /*
@@ -41,7 +43,7 @@ extern LRESULT CALLBACK fgPlatformWindowProc( HWND hWnd, UINT uMsg,
 void fgPlatformInitialize( const char* displayName )
 {
     WNDCLASS wc;
-    ATOM atom;
+    BOOL atom;
 
     /* What we need to do is to initialize the fgDisplay global structure here. */
     fgDisplay.pDisplay.Instance = GetModuleHandle( NULL );
@@ -56,9 +58,6 @@ void fgPlatformInitialize( const char* displayName )
          * Each of the windows should have its own device context, and we
          * want redraw events during Vertical and Horizontal Resizes by
          * the user.
-         *
-         * XXX Old code had "| CS_DBCLCKS" commented out.  Plans for the
-         * XXX future?  Dead-end idea?
          */
         wc.lpfnWndProc    = fgPlatformWindowProc;
         wc.cbClsExtra     = 0;
@@ -117,6 +116,10 @@ void fgPlatformInitialize( const char* displayName )
     }
     /* Set the timer granularity to 1 ms */
     timeBeginPeriod ( 1 );
+    /* Init setup to deal with timer wrap, can't query system time before this is done */
+    fgPlatformInitSystemTime();
+    /* Get start time */
+    fgState.Time = fgSystemTime();
 
 
     fgState.Initialised = GL_TRUE;
@@ -136,8 +139,6 @@ void fgPlatformInitialize( const char* displayName )
 
 
 /* Platform-Specific Deinitialization Functions: */
-extern void fghCloseInputDevices ( void );
-
 void fgPlatformDeinitialiseInputDevices ( void )
 {
 #if !defined(_WIN32_WCE)