summaryrefslogtreecommitdiff
path: root/src/game.cpp
diff options
context:
space:
mode:
authorBjørn Lindeijer <bjorn@lindeijer.nl>2006-07-30 14:33:28 +0000
committerBjørn Lindeijer <bjorn@lindeijer.nl>2006-07-30 14:33:28 +0000
commitaff167beefadc32add4b44626cc2f1cbef800c7b (patch)
tree43796105cc107ec55742e88562e064d8031d3b23 /src/game.cpp
parent18b73fdadd715d356416a95c31a25b3293fa2596 (diff)
downloadmana-aff167beefadc32add4b44626cc2f1cbef800c7b.tar.gz
mana-aff167beefadc32add4b44626cc2f1cbef800c7b.tar.bz2
mana-aff167beefadc32add4b44626cc2f1cbef800c7b.tar.xz
mana-aff167beefadc32add4b44626cc2f1cbef800c7b.zip
Updated TMW to be compatible with Guichan 0.5.0 (merged from guichan-0.5.0
branch).
Diffstat (limited to 'src/game.cpp')
-rw-r--r--src/game.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/game.cpp b/src/game.cpp
index 51b541a6..fab88aa9 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -122,7 +122,7 @@ const int MAX_TIME = 10000;
*/
namespace {
struct ExitListener : public gcn::ActionListener {
- void action(const std::string &eventId) {
+ void action(const std::string &eventId, gcn::Widget *widget) {
if (eventId == "yes") {
done = true;
}
@@ -465,7 +465,7 @@ void Game::handleInput()
// Close the config window, cancelling changes if opened
else if (setupWindow->isVisible())
{
- setupWindow->action("cancel");
+ setupWindow->action("cancel", NULL);
}
// Else, open the chat edit box
else