projects
/
freeglut
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixing the build after Diederick Niehorster's full screen fixes: they are only valid...
[freeglut]
/
src
/
freeglut_init.c
diff --git
a/src/freeglut_init.c
b/src/freeglut_init.c
index
bbe9ec8
..
57bb020
100644
(file)
--- a/
src/freeglut_init.c
+++ b/
src/freeglut_init.c
@@
-86,6
+86,7
@@
SFG_State fgState = { { -1, -1, GL_FALSE }, /* Position */
GL_FALSE, /* JoysticksInitialised */
0, /* NumActiveJoysticks */
GL_FALSE, /* InputDevsInitialised */
GL_FALSE, /* JoysticksInitialised */
0, /* NumActiveJoysticks */
GL_FALSE, /* InputDevsInitialised */
+ 0, /* MouseWheelTicks */
1, /* AuxiliaryBufferNumber */
4, /* SampleNumber */
1, /* MajorVersion */
1, /* AuxiliaryBufferNumber */
4, /* SampleNumber */
1, /* MajorVersion */
@@
-313,7
+314,7
@@
static void fghInitialize( const char* displayName )
/* What we need to do is to initialize the fgDisplay global structure here. */
fgDisplay.Instance = GetModuleHandle( NULL );
/* What we need to do is to initialize the fgDisplay global structure here. */
fgDisplay.Instance = GetModuleHandle( NULL );
- fgDisplay.DisplayName=strdup(displayName);
+ fgDisplay.DisplayName= displayName ? strdup(displayName) : 0 ;
atom = GetClassInfo( fgDisplay.Instance, _T("FREEGLUT"), &wc );
if( atom == 0 )
atom = GetClassInfo( fgDisplay.Instance, _T("FREEGLUT"), &wc );
if( atom == 0 )
@@
-442,6
+443,8
@@
void fgDeinitialize( void )
fgState.JoysticksInitialised = GL_FALSE;
fgState.InputDevsInitialised = GL_FALSE;
fgState.JoysticksInitialised = GL_FALSE;
fgState.InputDevsInitialised = GL_FALSE;
+ fgState.MouseWheelTicks = 0;
+
fgState.MajorVersion = 1;
fgState.MinorVersion = 0;
fgState.ContextFlags = 0;
fgState.MajorVersion = 1;
fgState.MinorVersion = 0;
fgState.ContextFlags = 0;