X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Ffreeglut_state.c;h=5e4ad049df719952db470a76b374cd0ac460645d;hb=8f96cc73e71a8e4f2acb579c29132c16358191f0;hp=3c1ae792aa4490aeca3352f8c44f8d4e0061719f;hpb=074fe7a4ceb20811af83f735d5db74d69d11442c;p=freeglut diff --git a/src/freeglut_state.c b/src/freeglut_state.c index 3c1ae79..5e4ad04 100644 --- a/src/freeglut_state.c +++ b/src/freeglut_state.c @@ -124,13 +124,15 @@ void FGAPIENTRY glutSetOption( GLenum eWhat, int value ) */ int FGAPIENTRY glutGet( GLenum eWhat ) { +#if TARGET_HOST_WIN32 int returnValue ; GLboolean boolValue ; +#endif switch (eWhat) { case GLUT_INIT_STATE: - return ( fgState.Initalized ) ; + return ( fgState.Initialised ) ; case GLUT_ELAPSED_TIME: return( fgElapsedTime() ); @@ -562,16 +564,13 @@ int FGAPIENTRY glutDeviceGet( GLenum eWhat ) */ int FGAPIENTRY glutGetModifiers( void ) { - if( fgStructure.Window == NULL ) - return( 0 ); - - if( fgStructure.Window->State.Modifiers == 0xffffffff ) + if( fgState.Modifiers == 0xffffffff ) { fgWarning( "glutGetModifiers() called outside an input callback" ); return( 0 ); } - return( fgStructure.Window->State.Modifiers ); + return( fgState.Modifiers ); } /*