From c2c435686f5b6c1152daf370fb1dcb98f7d789e2 Mon Sep 17 00:00:00 2001 From: Bjørn Lindeijer Date: Sat, 1 Nov 2008 10:50:42 +0000 Subject: Merged revisions 4130 via svnmerge from https://themanaworld.svn.sourceforge.net/svnroot/themanaworld/tmw/branches/0.0 ........ r4130 | the_enemy | 2008-04-18 22:39:29 +0200 (Fri, 18 Apr 2008) | 3 lines Mac now uses Apple key for emoticons, so alt can be used for alternate characters. Disable vsync on mac. ........ --- src/game.cpp | 6 +++--- src/openglgraphics.cpp | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/game.cpp b/src/game.cpp index 6c370d83..6ae1a0f4 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -661,11 +661,11 @@ void Game::handleInput() // Keys pressed together with Alt/Meta // Emotions and some internal gui windows - #ifndef __APPLE__ +#ifndef __APPLE__ if (event.key.keysym.mod & KMOD_LALT) - #else +#else if (event.key.keysym.mod & KMOD_LMETA) - #endif +#endif { switch (event.key.keysym.sym) { diff --git a/src/openglgraphics.cpp b/src/openglgraphics.cpp index 76efe380..b6a4e7d8 100644 --- a/src/openglgraphics.cpp +++ b/src/openglgraphics.cpp @@ -76,8 +76,8 @@ bool OpenGLGraphics::setVideoMode(int w, int h, int bpp, bool fs, bool hwaccel) } #ifdef __APPLE__ - const GLint VBL = 1; - CGLSetParameter(CGLGetCurrentContext(), kCGLCPSwapInterval, &VBL); + //const GLint VBL = 1; + //CGLSetParameter(CGLGetCurrentContext(), kCGLCPSwapInterval, &VBL); #endif // Setup OpenGL -- cgit v1.2.3-70-g09d2