Client version is now returned by the stream proxy as a number.

This commit is contained in:
Derision
2013-02-17 18:09:31 +00:00
parent d1afad47aa
commit 07979ce2de
23 changed files with 79 additions and 90 deletions
+1 -10
View File
@@ -47,6 +47,7 @@ class Client;
#include <set>
#include <string>
#include "../common/item_struct.h"
#include "../common/clientversions.h"
#include "QGlobals.h"
#define CLIENT_TIMEOUT 90000
@@ -120,16 +121,6 @@ typedef enum {
MQGhost
} CheatTypes;
typedef enum {
EQClientUnknown = 0,
EQClient62,
EQClientTitanium,
EQClientSoF,
EQClientSoD,
EQClientUnderfoot,
EQClientRoF
} EQClientVersion;
enum {
HideCorpseNone = 0,
HideCorpseAll = 1,
+3 -31
View File
@@ -517,38 +517,10 @@ void Client::Handle_Connect_OP_ZoneEntry(const EQApplicationPacket *app)
conn_state = ReceivedZoneEntry;
string StreamDescription = Connection()->Describe();
if(StreamDescription == "Patch Titanium")
{
ClientVersion = EQClientTitanium;
ClientVersionBit = BIT_Titanium;
}
else if(StreamDescription == "Patch 6.2")
{
ClientVersion = EQClient62;
ClientVersionBit = BIT_Client62;
}
else if(StreamDescription == "Patch SoF")
{
ClientVersion = EQClientSoF;
ClientVersionBit = BIT_SoF;
}
else if(StreamDescription == "Patch SoD")
{
ClientVersion = EQClientSoD;
ClientVersionBit = BIT_SoD;
}
else if(StreamDescription == "Patch Underfoot")
{
ClientVersion = EQClientUnderfoot;
ClientVersionBit = BIT_Underfoot;
}
else if(StreamDescription == "Patch RoF")
{
ClientVersion = EQClientRoF;
ClientVersionBit = BIT_RoF;
}
ClientVersion = Connection()->ClientVersion();
ClientVersionBit = 1 << (ClientVersion - 1);
// Antighost code
// tmp var is so the search doesnt find this object
Client* client = entity_list.GetClientByName(cze->char_name);
+3 -3
View File
@@ -689,7 +689,7 @@ void Zone::LoadMercTemplates(){
mysql_free_result(DatasetResult);
}
safe_delete(Query);
safe_delete_array(Query);
Query = 0;
if(!errorMessage.empty()) {
@@ -763,7 +763,7 @@ void Zone::LoadMercSpells(){
LogFile->write(EQEMuLog::Debug, "Mercenary Debug: Loaded %i merc spells.", merc_spells_list[1].size() + merc_spells_list[2].size() + merc_spells_list[9].size() + merc_spells_list[12].size());
}
safe_delete(Query);
safe_delete_array(Query);
Query = 0;
if(!errorMessage.empty()) {
@@ -2648,4 +2648,4 @@ void Zone::ReloadWorld(uint32 Option){
zone->Repop(0);
parse->ReloadQuests();
}
}
}