diff options
| author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2005-10-13 15:21:36 +0000 |
|---|---|---|
| committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2005-10-13 15:21:36 +0000 |
| commit | bf23cb55879943f7c29ff66ae99dab341aba5c66 (patch) | |
| tree | a713e509739e69bace491c6f059798185638b4d0 /src | |
| parent | acf69fd277e17c6bdf001551697d7321f84909df (diff) | |
| download | mana-bf23cb55879943f7c29ff66ae99dab341aba5c66.tar.gz mana-bf23cb55879943f7c29ff66ae99dab341aba5c66.tar.bz2 mana-bf23cb55879943f7c29ff66ae99dab341aba5c66.tar.xz mana-bf23cb55879943f7c29ff66ae99dab341aba5c66.zip | |
Make sure Alt shortcuts don't appear in chatbox.
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.am | 4 | ||||
| -rw-r--r-- | src/game.cpp | 3 | ||||
| -rw-r--r-- | src/gui/button.cpp | 2 |
3 files changed, 6 insertions, 3 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 1284e7bb..8a6b5b9d 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -120,7 +120,6 @@ tmw_SOURCES = graphic/spriteset.cpp \ net/packet.h \ net/protocol.cpp \ net/protocol.h \ - net/win2linux.h \ resources/image.cpp \ resources/image.h \ resources/imagewriter.cpp \ @@ -177,7 +176,8 @@ tmw_SOURCES = graphic/spriteset.cpp \ serverinfo.h \ sound.cpp \ sound.h \ - sprite.h + sprite.h \ + tileset.h # set the include path found by configure INCLUDES = \ diff --git a/src/game.cpp b/src/game.cpp index 8c1eee60..9f267449 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -620,6 +620,7 @@ void do_input() case Being::STAND: action(2, 0); break; case Being::SIT: action(3, 0); break; } + used = true; break; case SDLK_p: @@ -632,6 +633,7 @@ void do_input() } SDL_FreeSurface(screenshot); } + used = true; break; default: @@ -640,6 +642,7 @@ void do_input() case SDLK_f: // Find path to mouse (debug purpose) displayPathToMouse = !displayPathToMouse; + used = true; break; } diff --git a/src/gui/button.cpp b/src/gui/button.cpp index bf2ca6c6..78fbf7c7 100644 --- a/src/gui/button.cpp +++ b/src/gui/button.cpp @@ -135,7 +135,7 @@ void Button::draw(gcn::Graphics* graphics) throw GCN_EXCEPTION("Button::draw. Uknown alignment."); } - graphics->setFont((gcn::ImageFont*)getFont()); + graphics->setFont(getFont()); if (isPressed()) { graphics->drawText(getCaption(), textX + 1, textY + 1, getAlignment()); |