diff options
| author | David Athay <ko2fan@gmail.com> | 2008-04-18 20:39:29 +0000 |
|---|---|---|
| committer | David Athay <ko2fan@gmail.com> | 2008-04-18 20:39:29 +0000 |
| commit | 1f08333d22512ea6a1e769475c873fa50415f404 (patch) | |
| tree | 8870ce4cfa69603e130e9a5268588c43577829f1 /src | |
| parent | 5744876f2f8da0ae48d90a746508a8ff96c91510 (diff) | |
| download | mana-1f08333d22512ea6a1e769475c873fa50415f404.tar.gz mana-1f08333d22512ea6a1e769475c873fa50415f404.tar.bz2 mana-1f08333d22512ea6a1e769475c873fa50415f404.tar.xz mana-1f08333d22512ea6a1e769475c873fa50415f404.zip | |
Mac now uses Apple key for
emoticons, so alt can be used for alternate characters. Disable vsync
on mac.
Diffstat (limited to 'src')
| -rw-r--r-- | src/game.cpp | 4 | ||||
| -rw-r--r-- | src/openglgraphics.cpp | 4 |
2 files changed, 6 insertions, 2 deletions
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 |