X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Ffreeglut_structure.c;h=276146c5e57b80b2fa062483d1dd53020da6a710;hb=fe573d6af98de430357a7321cd50f5e92e9a2aab;hp=ecb4f10b9b7cea3890d56bb2d4b30eb600173472;hpb=fc98e7c77fdb427eab9de022cff9e149d6737971;p=freeglut diff --git a/src/freeglut_structure.c b/src/freeglut_structure.c index ecb4f10..276146c 100644 --- a/src/freeglut_structure.c +++ b/src/freeglut_structure.c @@ -65,7 +65,8 @@ static void fghClearCallBacks( SFG_Window *window ) * If parent is set to NULL, the window created will be a topmost one. */ SFG_Window* fgCreateWindow( SFG_Window* parent, const char* title, - int x, int y, int w, int h, + GLboolean positionUse, int x, int y, + GLboolean sizeUse, int w, int h, GLboolean gameMode, GLboolean isMenu ) { /* Have the window object created */ @@ -98,7 +99,7 @@ SFG_Window* fgCreateWindow( SFG_Window* parent, const char* title, * Open the window now. The fgOpenWindow() function is system * dependant, and resides in freeglut_window.c. Uses fgState. */ - fgOpenWindow( window, title, x, y, w, h, gameMode, + fgOpenWindow( window, title, positionUse, x, y, sizeUse, w, h, gameMode, (GLboolean)(parent ? GL_TRUE : GL_FALSE) ); return window; @@ -119,7 +120,8 @@ SFG_Menu* fgCreateMenu( FGCBMenu menuCallback ) /* Create a window for the menu to reside in. */ - fgCreateWindow( NULL, "freeglut menu", x, y, w, h, GL_FALSE, GL_TRUE ); + fgCreateWindow( NULL, "freeglut menu", GL_TRUE, x, y, GL_TRUE, w, h, + GL_FALSE, GL_TRUE ); menu->Window = fgStructure.CurrentWindow; glutDisplayFunc( fgDisplayMenu ); @@ -346,7 +348,7 @@ void fgCreateStructure( void ) fgStructure.CurrentWindow = NULL; fgStructure.CurrentMenu = NULL; fgStructure.MenuContext = NULL; - fgStructure.GameMode = NULL; + fgStructure.GameModeWindow = NULL; fgStructure.WindowID = 0; fgStructure.MenuID = 0; }