summaryrefslogtreecommitdiff
path: root/src/game.cpp
diff options
context:
space:
mode:
authorBjørn Lindeijer <bjorn@lindeijer.nl>2006-08-13 10:20:19 +0000
committerBjørn Lindeijer <bjorn@lindeijer.nl>2006-08-13 10:20:19 +0000
commitd3385829ca6f7d52e21706b25b14fe1083cfe984 (patch)
treeaea368b2434a49864b33183f95b6aae36abef3b7 /src/game.cpp
parent7d287027babe615e01ddcf20edc1057f7d778c58 (diff)
downloadmana-client-d3385829ca6f7d52e21706b25b14fe1083cfe984.tar.gz
mana-client-d3385829ca6f7d52e21706b25b14fe1083cfe984.tar.bz2
mana-client-d3385829ca6f7d52e21706b25b14fe1083cfe984.tar.xz
mana-client-d3385829ca6f7d52e21706b25b14fe1083cfe984.zip
Merged Guichan 0.5.0 support from guichan-0.5.0 branch, plus several updates
from the 0.1.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 fec186e6..819e863e 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;
}
@@ -451,7 +451,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