From 579e8b1fabbf30ef24178f979b671bc221c0bee1 Mon Sep 17 00:00:00 2001
From: Markus Mittendrein <git@maxmitti.tk>
Date: Thu, 23 May 2019 13:51:10 +0200
Subject: Remove CUID

---
 src/ClientInfo.hpp | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

(limited to 'src/ClientInfo.hpp')

diff --git a/src/ClientInfo.hpp b/src/ClientInfo.hpp
index 416fd4a..f84df7d 100644
--- a/src/ClientInfo.hpp
+++ b/src/ClientInfo.hpp
@@ -32,7 +32,6 @@ public:
     QStringList players;
 
     ClientInterface interface = Clonk;
-    int CUID = 0;
     bool activated = false;
 
     bool dcc = false;
@@ -53,13 +52,12 @@ public:
         return ret;
     }
 
-    static inline ClientInfo clonkClient(QString nick, QString pcName, int CUID, bool activated = false)
+    static inline ClientInfo clonkClient(QString nick, QString pcName, bool activated = false)
     {
         ClientInfo ret;
         ret.interface = Clonk;
         ret.nick = nick;
         ret.pcName = pcName;
-        ret.CUID = CUID;
         ret.activated = activated;
         return ret;
     }
@@ -92,7 +90,7 @@ public:
         }
         else
         {
-            return other.interface == interface && other.nick == nick && (interface == Clonk ? other.pcName == pcName && other.CUID == CUID : true);
+            return other.interface == interface && other.nick == nick && (interface == Clonk ? other.pcName == pcName : true);
         }
     }
 
@@ -166,7 +164,7 @@ public:
             {
                 if(parts.length() != 6 && parts.length() != 5) throw ConfigException("Cannot read corrupt ClientInfo with Clonk-ClientInterface: " + string.toStdString());
                 info.pcName = parts.at(1);
-                info.CUID = parts.at(2).toInt();
+                // CUID used to be 2; keep compatible
                 info.nick = parts.at(3);
                 info.activated = ConfigValueBase::getValue<bool>(parts.at(4));
                 if(parts.length() > 5)
@@ -199,7 +197,7 @@ public:
         switch(info.interface)
         {
             case Auto: break;
-            case Clonk: ret.append(info.pcName); ret.append(QString::number(info.CUID)); ret.append(info.nick); ret.append(ConfigValueBase::getStringValue(info.activated)); ret.append(ConfigValueBase::getStringValue<QList<QString>>(info.players)); break;
+            case Clonk: ret.append(info.pcName); ret.append("0"); ret.append(info.nick); ret.append(ConfigValueBase::getStringValue(info.activated)); ret.append(ConfigValueBase::getStringValue<QList<QString>>(info.players)); break;
             case IRC: ret.append(info.nick); break;
             case Management: ret.append(info.management.name); break;
         }
-- 
cgit v1.2.3-54-g00ecf