X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Ffg_menu.c;h=fdc827b518e8dfaaca646eb6a6032760d5ccb52d;hb=b1ed93dd348f7b8f3bd2c75474f5d4151d502f1f;hp=1b07b1ab07c6aeb2bde6d42032e5573b808573c8;hpb=831749819dcdc1ea884c18607c2b447bbf5fca72;p=freeglut

diff --git a/src/fg_menu.c b/src/fg_menu.c
index 1b07b1a..fdc827b 100644
--- a/src/fg_menu.c
+++ b/src/fg_menu.c
@@ -135,7 +135,7 @@ static void fghDeactivateSubMenu( SFG_MenuEntry *menuEntry )
 static GLvoid fghGetVMaxExtent( SFG_Window* window, int* x, int* y )
 {
     if( fgStructure.GameModeWindow )
-		fgPlatformGetGameModeVMaxExtent ( window, x, y );
+        fgPlatformGetGameModeVMaxExtent ( window, x, y );
     else
     {
         *x = fgDisplay.ScreenWidth;
@@ -785,24 +785,29 @@ int FGAPIENTRY glutCreateMenuUcall( FGCBMenuUC callback, FGCBUserData userData )
     /* The menu object creation code resides in fg_structure.c */
     FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutCreateMenuUcall" );
     if (fgState.ActiveMenus)
-        fgError("Menu manipulation not allowed while menus in use.");
+    {
+        fgError( "Menu manipulation not allowed while menus in use." );
+    }
 
     return fgCreateMenu( callback, userData )->ID;
 }
 
 /* Standard glutCreateMenu */
-static void glutCreateMenuCallback( int menu, FGCBUserData userData )
+static void fghCreateMenuCallback( int menu, FGCBUserData userData )
 {
-    FGCBMenu callback = (FGCBMenu)userData;
-    callback( menu );
+    FGCBMenu* callback = (FGCBMenu*)&userData;
+    (*callback)( menu );
 }
 
 int FGAPIENTRY glutCreateMenu( FGCBMenu callback )
 {
     FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutCreateMenu" );
     if (!callback)
+    {
         return glutCreateMenuUcall( NULL, NULL );
-    return glutCreateMenuUcall( glutCreateMenuCallback, (FGCBUserData)callback );
+    }
+    FGCBMenu* reference = &callback;
+    return glutCreateMenuUcall( fghCreateMenuCallback, *((FGCBUserData*)reference) );
 }
 
 /*