diff options
| author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2008-11-01 10:50:42 +0000 |
|---|---|---|
| committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2008-11-01 10:50:42 +0000 |
| commit | c2c435686f5b6c1152daf370fb1dcb98f7d789e2 (patch) | |
| tree | 0137f7ff34dd3e3a94238fb2a2d426ca9e93f4c4 | |
| parent | 052cdbd8fce689b64371da82409bfd4e0f189f45 (diff) | |
| download | mana-client-c2c435686f5b6c1152daf370fb1dcb98f7d789e2.tar.gz mana-client-c2c435686f5b6c1152daf370fb1dcb98f7d789e2.tar.bz2 mana-client-c2c435686f5b6c1152daf370fb1dcb98f7d789e2.tar.xz mana-client-c2c435686f5b6c1152daf370fb1dcb98f7d789e2.zip | |
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.
........
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | src/game.cpp | 6 | ||||
| -rw-r--r-- | src/openglgraphics.cpp | 4 |
3 files changed, 8 insertions, 5 deletions
@@ -569,6 +569,9 @@ src/net/guildhandler.cpp, src/net/chathandler.cpp, src/Makefile.am, tmw.cbp: Fixed numerous crashes with chat and guild windows using new tabbed area. + * 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 David Athay <ko2fan@gmail.com> 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 |