X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Ffreeglut_state.c;h=0ddceaf706ee97071c6943bd2bab037bc16d4497;hb=df33277ecd0e20914a9cb3aa5bfc17e0023b3334;hp=b09f27202d50e5de04232e5725b3fdf257d247e4;hpb=554638f5afb409d7c83c31e12475a77230b844e2;p=freeglut diff --git a/src/freeglut_state.c b/src/freeglut_state.c index b09f272..0ddceaf 100644 --- a/src/freeglut_state.c +++ b/src/freeglut_state.c @@ -29,8 +29,6 @@ #include "config.h" #endif -#define G_LOG_DOMAIN "freeglut-state" - #include "../include/GL/freeglut.h" #include "freeglut_internal.h" @@ -129,8 +127,14 @@ int FGAPIENTRY glutGet( GLenum eWhat ) int returnValue ; GLboolean boolValue ; - if ( eWhat == GLUT_INIT_STATE ) - return ( fgState.Time.Set ) ; + switch (eWhat) + { + case GLUT_INIT_STATE: + return ( fgState.Initalized ) ; + + case GLUT_ELAPSED_TIME: + return( fgElapsedTime() ); + } freeglut_assert_ready; @@ -139,9 +143,6 @@ int FGAPIENTRY glutGet( GLenum eWhat ) */ switch( eWhat ) { - case GLUT_ELAPSED_TIME: - return( fgElapsedTime() ); - /* * Following values are stored in fgState and fgDisplay global structures */ @@ -230,7 +231,7 @@ int FGAPIENTRY glutGet( GLenum eWhat ) case GLUT_WINDOW_Y: return y; } - if ( w == 0 ) + if ( w == 0 ) return( 0 ); XTranslateCoordinates( fgDisplay.Display,