From 1f08333d22512ea6a1e769475c873fa50415f404 Mon Sep 17 00:00:00 2001
From: David Athay <ko2fan@gmail.com>
Date: Fri, 18 Apr 2008 20:39:29 +0000
Subject: Mac now uses Apple key for emoticons, so alt can be used for
 alternate characters. Disable vsync on mac.

---
 src/game.cpp           | 4 ++++
 src/openglgraphics.cpp | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/game.cpp b/src/game.cpp
index 9eadeba0..e963b5d7 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -613,7 +613,11 @@ void Game::handleInput()
 
             // Keys pressed together with Alt/Meta
             // Emotions and some internal gui windows
+            #ifndef __APPLE__
             if (event.key.keysym.mod & KMOD_ALT)
+            #else
+            if (event.key.keysym.mod & KMOD_LMETA)
+            #endif
             {
                 switch (event.key.keysym.sym)
                 {
diff --git a/src/openglgraphics.cpp b/src/openglgraphics.cpp
index 76eff9f5..5b34de18 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__
-    long VBL = 1;
-    CGLSetParameter(CGLGetCurrentContext(), kCGLCPSwapInterval, &VBL);
+//    long VBL = 1;
+//    CGLSetParameter(CGLGetCurrentContext(), kCGLCPSwapInterval, &VBL);
 #endif
 
     // Setup OpenGL
-- 
cgit v1.2.3-70-g09d2