summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog2
-rw-r--r--src/gui/register.cpp2
-rw-r--r--src/main.h2
3 files changed, 3 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 956ef0d9..87b2f178 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -18,6 +18,8 @@
entries in the code.
* src/net/network.h, src/net/network.cpp: Added documentation and did
a bit of cleanup (peer pointers now stored in an array).
+ * src/gui/register.cpp, src/main.h: Made cancel button in register
+ dialog go back to the login dialog and cleaned up two unused states.
2006-08-19 Bjørn Lindeijer <bjorn@lindeijer.nl>
diff --git a/src/gui/register.cpp b/src/gui/register.cpp
index 52833aea..8004d30e 100644
--- a/src/gui/register.cpp
+++ b/src/gui/register.cpp
@@ -119,7 +119,7 @@ RegisterDialog::action(const std::string &eventId, gcn::Widget *widget)
{
if (eventId == "cancel")
{
- state = STATE_EXIT;
+ state = STATE_LOGIN;
}
else if (eventId == "register")
{
diff --git a/src/main.h b/src/main.h
index 47c650af..089f3f18 100644
--- a/src/main.h
+++ b/src/main.h
@@ -47,8 +47,6 @@ enum {
STATE_REGISTER,
STATE_REGISTER_ATTEMPT,
STATE_CHAR_SELECT,
- STATE_CHAR_NEW,
- STATE_CHAR_DELETE,
STATE_ERROR,
STATE_CONNECT_GAME,
STATE_GAME,