diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | src/game.cpp | 4 | ||||
| -rw-r--r-- | src/openglgraphics.cpp | 4 |
3 files changed, 12 insertions, 2 deletions
@@ -1,3 +1,9 @@ +2008-04-18 David Athay <ko2fan@gmail.com> + + * src/game.cpp, src/openglgraphics.cpp: Mac now uses Apple key for + emoticons, so alt can be used for alternate characters. Disable vsync + on mac. + 2008-04-17 Dennis Friis <peavey@placid.dk> * src/gui/sell.cpp: Fix shop list not to scroll to top when selling. 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 |