Fixes for Mac OS X (still no textures)
This commit is contained in:
@@ -70,7 +70,9 @@ namespace OpenArena
|
||||
uint32 FPS();
|
||||
void ParseCmds(const char*);
|
||||
void Print(int x, int y, const char* string, unsigned int set);
|
||||
|
||||
void SetWindow(Window*);
|
||||
Window* GetWindow();
|
||||
|
||||
/*Not Yet Implemented
|
||||
void PlayerConnect(); // implement later
|
||||
void PlayerDisconnect(); // implement later
|
||||
@@ -105,7 +107,7 @@ namespace OpenArena
|
||||
//list<GL_MY_TEXTURE> textures;
|
||||
Texture* textures;
|
||||
Texture menuTextures[NUM_MENU_TEXTURES];
|
||||
|
||||
Window* _window;
|
||||
|
||||
|
||||
// private:
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
#include <GL/glx.h>
|
||||
#include <X11/Xlib.h>
|
||||
#include <X11/Xutil.h>
|
||||
#include <X11/extensions/xf86vmode.h>
|
||||
//#include <X11/extensions/xf86vmode.h>
|
||||
#include <X11/keysym.h>
|
||||
#endif
|
||||
|
||||
@@ -82,7 +82,7 @@ namespace OpenArena
|
||||
GLXContext hRC;
|
||||
XSetWindowAttributes attributes;
|
||||
bool doubleBuffered;
|
||||
XF86VidModeModeInfo vidMode;
|
||||
//XF86VidModeModeInfo vidMode;
|
||||
int x, y;
|
||||
Display* display;
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user