From 10caae39a3d804c29cc874844e3cf59a404f68a7 Mon Sep 17 00:00:00 2001
From: shlainn <shlainnblaze@gmail.com>
Date: Thu, 15 Sep 2011 13:49:34 +0200
Subject: [PATCH] * Remove custom settings for client version and build

Now, any client version that PseuWoW supports needs to be implemented specifically
---
 bin/conf/PseuWoW.conf.default |  7 -------
 src/Client/PseuWoW.cpp        | 13 ++++---------
 src/Client/PseuWoW.h          |  7 +++++++
 3 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/bin/conf/PseuWoW.conf.default b/bin/conf/PseuWoW.conf.default
index 8c33b8f..202eb32 100644
--- a/bin/conf/PseuWoW.conf.default
+++ b/bin/conf/PseuWoW.conf.default
@@ -78,14 +78,7 @@ charname=Pseuwow
 // Client 1: TBC 2.4.3  Build 8606
 // Client 2: WoTLK 3.3.5 Build 12340
 // Client 3: Cata 4.x.x Build XXX NOT IMPLEMENTED
-// !!!! 
-// !!!! WARNING!!!! For all of the above Client Version and Client Build are IGNORED
-// !!!!
-// Client 9: Custom Settings for Client Version and Client Build
 Client=0
-// Uncomment if you use Client=9
-// ClientVersion=3.3.5
-// ClientBuild=12340
 
 ClientLanguage=enGB
 // or change to enGB, deDE, ...
diff --git a/src/Client/PseuWoW.cpp b/src/Client/PseuWoW.cpp
index 8a3de2b..ed025a8 100644
--- a/src/Client/PseuWoW.cpp
+++ b/src/Client/PseuWoW.cpp
@@ -494,11 +494,6 @@ void PseuInstanceConf::ApplyFromVarSet(VarSet &v)
     reconnect=atoi(v.Get("RECONNECT").c_str());
     realmport=atoi(v.Get("REALMPORT").c_str());
     client=atoi(v.Get("CLIENT").c_str());
-    if(client==9) //9 = Custom settings
-    {
-      clientversion_string=v.Get("CLIENTVERSION");
-      clientbuild=atoi(v.Get("CLIENTBUILD").c_str());
-    }
     clientlang=v.Get("CLIENTLANGUAGE");
     realmname=v.Get("REALMNAME");
     charname=v.Get("CHARNAME");
@@ -524,25 +519,25 @@ void PseuInstanceConf::ApplyFromVarSet(VarSet &v)
 
     switch(client)
     {
-      case 0:
+      case CLIENT_CLASSIC_WOW:
       {
         clientbuild = 6005;
         clientversion_string="1.12.2";
         break;
       }
-      case 1:
+      case CLIENT_TBC:
       {
         clientbuild = 8606;
         clientversion_string="2.4.3";
         break;
       }
-      case 2:
+      case CLIENT_WOTLK:
       {
         clientbuild = 12340;
         clientversion_string="3.3.5";
         break;
       }
-      case 3:
+      case CLIENT_CATA:
       default:
       {
         logerror("Unknown client - check conf");
diff --git a/src/Client/PseuWoW.h b/src/Client/PseuWoW.h
index b8c38f8..421b1e5 100644
--- a/src/Client/PseuWoW.h
+++ b/src/Client/PseuWoW.h
@@ -29,6 +29,13 @@ enum InstanceConditions
     COND_MAX
 };
 
+enum Client
+{
+    CLIENT_CLASSIC_WOW,
+    CLIENT_TBC,
+    CLIENT_WOTLK,
+    CLIENT_CATA
+};
 
 class PseuInstanceConf
 {