diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | src/Makefile.am | 4 | ||||
| -rw-r--r-- | src/game.cpp | 3 | ||||
| -rw-r--r-- | src/gui/button.cpp | 2 |
4 files changed, 11 insertions, 3 deletions
@@ -1,3 +1,8 @@ +2005-10-13 Bjørn Lindeijer <bjorn@lindeijer.nl> + + * src/game.cpp: Prevent Alt+p/s/f from appearing in chatbox. + * src/Makefile.am: Some updates for added/removed headers. + 2005-10-13 Björn Steinbrink <B.Steinbrink@gmx.de> * src/engine.cpp, src/gui/browserbox.cpp, src/gui/gui.cpp, 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()); |