X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=freeglut-1.3%2Ffreeglut_gamemode.c;h=39640689b95741dd87fb75e48b7b8c2d7892aa49;hb=9dcd337fca13aef8da422f5385d495aab3a319ed;hp=13f25267e5b385f55a8813abef4cce12bf2bf17a;hpb=d0dde87efb130eeb45fe61dd63b582432b972606;p=freeglut

diff --git a/freeglut-1.3/freeglut_gamemode.c b/freeglut-1.3/freeglut_gamemode.c
index 13f2526..3964068 100644
--- a/freeglut-1.3/freeglut_gamemode.c
+++ b/freeglut-1.3/freeglut_gamemode.c
@@ -82,9 +82,9 @@ void fghRememberState( void )
      */
 
 /* hack to get around my stupid cross-gcc headers */
-#define ENUM_CURRENT_SETTINGS -1
+#define FREEGLUT_ENUM_CURRENT_SETTINGS -1
 
-    EnumDisplaySettings( NULL, ENUM_CURRENT_SETTINGS, &fgDisplay.DisplayMode );
+    EnumDisplaySettings( NULL, FREEGLUT_ENUM_CURRENT_SETTINGS, &fgDisplay.DisplayMode );
 
     /*
      * Make sure we will be restoring all settings needed
@@ -254,7 +254,7 @@ GLboolean fghChangeDisplayMode( GLboolean haveToTest )
                                  devMode.dmBitsPerPel, fgState.GameModeRefresh ) )
         {
             /*
-             * OKi, we've found a matching display mode, remember it's number and break
+             * OKi, we've found a matching display mode, remember its number and break
              */
             mode = displayModes;
             break;
@@ -355,7 +355,7 @@ int FGAPIENTRY glutEnterGameMode( void )
         /*
          * ...if so, delete it before proceeding...
          */
-        fgDestroyWindow( fgStructure.GameMode, TRUE );
+        fgAddToWindowDestroyList( fgStructure.GameMode, TRUE );
     }
     else
     {
@@ -370,7 +370,7 @@ int FGAPIENTRY glutEnterGameMode( void )
      */
     if( fghChangeDisplayMode( FALSE ) == FALSE )
     {
-	fgWarning( "failed to change screen settings" );
+	      fgWarning( "failed to change screen settings" );
         return( FALSE );
     }
 
@@ -434,9 +434,9 @@ void FGAPIENTRY glutLeaveGameMode( void )
     freeglut_return_if_fail( fgStructure.GameMode != NULL );
 
     /*
-     * First of all, have the game mode window created
+     * First of all, have the game mode window destroyed
      */
-    fgDestroyWindow( fgStructure.GameMode, TRUE );
+    fgAddToWindowDestroyList( fgStructure.GameMode, TRUE );
 
 #if TARGET_HOST_UNIX_X11