summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--src/net/loginhandler.cpp6
2 files changed, 8 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index a3ed1f12..66ed8d6d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-08-28 Philipp Sehmisch <tmw@crushnet.org>
+
+ * src/net/loginhandler.cpp: Removed the usually incorrect "for 5 minutes"
+ clause from the message displayed to banned users.
+
2008-08-27 Bjørn Lindeijer <bjorn@lindeijer.nl>
* src/particleemitter.h, src/particle.h, src/particleemitter.cpp,
diff --git a/src/net/loginhandler.cpp b/src/net/loginhandler.cpp
index 8b057afd..fa74f489 100644
--- a/src/net/loginhandler.cpp
+++ b/src/net/loginhandler.cpp
@@ -89,7 +89,7 @@ void LoginHandler::handleMessage(MessageIn *msg)
iptostring(server_info[i]->address),
server_info[i]->port);
}
- state = CHAR_SERVER_STATE;
+ state = CHAR_SERVER_STATE;
break;
case 0x006a:
@@ -110,10 +110,10 @@ void LoginHandler::handleMessage(MessageIn *msg)
errorMessage = "Rejected from server";
break;
case 4:
- errorMessage = "You have been blocked by the GM Team";
+ errorMessage = "You have been banned from the game. Please contact the GM Team";
break;
case 6:
- errorMessage = "You have been banned for 5 minutes";
+ errorMessage = "You have been temporarily banned from the game. Please contact the GM team";
break;
case 9:
errorMessage = "This user name is already taken";