diff options
| author | David Athay <ko2fan@gmail.com> | 2008-07-05 16:13:56 +0000 |
|---|---|---|
| committer | David Athay <ko2fan@gmail.com> | 2008-07-05 16:13:56 +0000 |
| commit | 1762fcad22bca9b74900e5a5190ba9f1f863a71a (patch) | |
| tree | fcc081b351639df7c3299f572c9597bca95548bd | |
| parent | 6423c8eda76babaa50c13525b0deb7df5f2d24bd (diff) | |
| download | mana-1762fcad22bca9b74900e5a5190ba9f1f863a71a.tar.gz mana-1762fcad22bca9b74900e5a5190ba9f1f863a71a.tar.bz2 mana-1762fcad22bca9b74900e5a5190ba9f1f863a71a.tar.xz mana-1762fcad22bca9b74900e5a5190ba9f1f863a71a.zip | |
Allow alt key for chatting on Mac, remove unneeded includes.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | src/game.cpp | 4 | ||||
| -rw-r--r-- | src/gui/gui.cpp | 5 |
3 files changed, 9 insertions, 5 deletions
@@ -1,3 +1,8 @@ +2008-07-05 David Athay <ko2fan@gmail.com> + + * src/game.cpp, src/gui/gui.cpp: Allow foreign keyboards to use alt key + on Mac. Remove includes no longer needed. + 2008-07-04 David Athay <ko2fan@gmail.com> * src/gui/chat.cpp, src/gui/chat.h: Ugly hack for chat scrolling. diff --git a/src/game.cpp b/src/game.cpp index 6b73b8ca..dcc2ba0a 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -648,7 +648,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/gui/gui.cpp b/src/gui/gui.cpp index d9c8f1ce..bc2f017b 100644 --- a/src/gui/gui.cpp +++ b/src/gui/gui.cpp @@ -26,11 +26,6 @@ #include <guichan/exception.hpp> #include <guichan/image.hpp> #include <guichan/imagefont.hpp> -#ifdef __APPLE__ -#include <SDL_ttf/SDL_ttf.h> -#else -#include <SDL/SDL_ttf.h> -#endif #include "focushandler.h" #include "sdlinput.h" |