From 2e0b16e90ba13eb62da04b6f4a6760327eb87d00 Mon Sep 17 00:00:00 2001
From: Max-Wilhelm Bruker <m.bruker@digitalmedia.de>
Date: Tue, 7 Jul 2009 14:49:35 +0200
Subject: [PATCH] small protocol change

---
 cockatrice/src/client.cpp        | 11 +++++------
 servatrice/src/returnmessage.cpp | 10 ++++------
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/cockatrice/src/client.cpp b/cockatrice/src/client.cpp
index 57088530..d5bb7e2d 100644
--- a/cockatrice/src/client.cpp
+++ b/cockatrice/src/client.cpp
@@ -111,21 +111,20 @@ void Client::readLine()
 			} else
 				emit gameEvent(event);
 		} else if (prefix == "resp") {
+			if (values.size() != 2) {
+				// XXX
+			}
 			bool ok;
 			int msgid = values.takeFirst().toInt(&ok);
 			if (!ok) {
 				// XXX
 			}
 
-			if (values.empty()) {
-				// XXX
-			}
-
 			ServerResponse resp;
 			if (values[0] == "ok")
 				resp = RespOk;
-			else if (values[1] == "password")
-				resp  = RespPassword;
+			else if (values[0] == "password")
+				resp = RespPassword;
 			else
 				resp = RespErr;
 			emit responseReceived(msgid, resp);
diff --git a/servatrice/src/returnmessage.cpp b/servatrice/src/returnmessage.cpp
index a88e1ce9..210f2644 100644
--- a/servatrice/src/returnmessage.cpp
+++ b/servatrice/src/returnmessage.cpp
@@ -6,20 +6,18 @@ bool ReturnMessage::send(ReturnCode code)
 	ServerSocket *s = qobject_cast<ServerSocket *>(parent());
 	if (!s)
 		return false;
-	bool success = (code == ReturnOk);
 	QString returnCodeString;
 	switch (code) {
 		case ReturnNothing: return true;
-		case ReturnOk: break;
+		case ReturnOk: returnCodeString = "ok"; break;
 		case ReturnLoginNeeded: returnCodeString = "login_needed"; break;
 		case ReturnSyntaxError: returnCodeString = "syntax"; break;
 		case ReturnContextError: returnCodeString = "context"; break;
 		case ReturnPasswordWrong: returnCodeString = "password"; break;
 	}
-	s->msg(QString("resp|%1|%2|%3").arg(msg_id)
-				       .arg(success ? "ok" : "err")
-				       .arg(returnCodeString));
-	return success;
+	s->msg(QString("resp|%1|%2").arg(msg_id)
+				    .arg(returnCodeString));
+	return (code == ReturnOk);
 }
 
 bool ReturnMessage::sendList(const QStringList &args)