pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-19 20:41:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix compile error with GCC

Browse Source
This commit is contained in:
Michael Cook (mackal) 2015-01-20 00:04:22 -05:00
parent e70e443950
commit 5c56929a23
4 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
zone/client.cpp
View File

@ -246,7 +246,7 @@ Client::Client(EQStreamInterface* ieqs)
GlobalChatLimiterTimer = new Timer(RuleI(Chat, IntervalDurationMS)); GlobalChatLimiterTimer = new Timer(RuleI(Chat, IntervalDurationMS));
AttemptedMessages = 0; AttemptedMessages = 0;
TotalKarma = 0; TotalKarma = 0;
ClientVersion = ClientVersion::Unknown; m_ClientVersion = ClientVersion::Unknown;
ClientVersionBit = 0; ClientVersionBit = 0;
AggroCount = 0; AggroCount = 0;
RestRegenHP = 0; RestRegenHP = 0;

5
zone/client.h
View File

@ -1019,8 +1019,9 @@ public:
inline int ActiveTasksInSet(int TaskSet) { return (taskstate ? taskstate->ActiveTasksInSet(TaskSet) :0); } inline int ActiveTasksInSet(int TaskSet) { return (taskstate ? taskstate->ActiveTasksInSet(TaskSet) :0); }
inline int CompletedTasksInSet(int TaskSet) { return (taskstate ? taskstate->CompletedTasksInSet(TaskSet) :0); } inline int CompletedTasksInSet(int TaskSet) { return (taskstate ? taskstate->CompletedTasksInSet(TaskSet) :0); }
inline const ClientVersion GetClientVersion() const { return ClientVersion; } inline const ClientVersion GetClientVersion() const { return m_ClientVersion; }
inline const uint32 GetClientVersionBit() const { return ClientVersionBit; } inline const uint32 GetClientVersionBit() const { return ClientVersionBit; }
inline void SetClientVersion(ClientVersion in) { m_ClientVersion = in; }
/** Adventure Stuff **/ /** Adventure Stuff **/
void SendAdventureError(const char *error); void SendAdventureError(const char *error);
@ -1506,7 +1507,7 @@ private:
Timer *GlobalChatLimiterTimer; //60 seconds Timer *GlobalChatLimiterTimer; //60 seconds
uint32 AttemptedMessages; uint32 AttemptedMessages;
ClientVersion ClientVersion; ClientVersion m_ClientVersion;
uint32 ClientVersionBit; uint32 ClientVersionBit;
int XPRate; int XPRate;

2
zone/client_mods.cpp
View File

@ -1172,7 +1172,7 @@ uint32 Client::CalcCurrentWeight() {
*/ */
// SoD+ client has no weight for coin // SoD+ client has no weight for coin
if (EQLimits::CoinHasWeight(ClientVersion)) if (EQLimits::CoinHasWeight(GetClientVersion()))
Total += (m_pp.platinum + m_pp.gold + m_pp.silver + m_pp.copper) / 4; Total += (m_pp.platinum + m_pp.gold + m_pp.silver + m_pp.copper) / 4;
float Packrat = (float)spellbonuses.Packrat + (float)aabonuses.Packrat + (float)itembonuses.Packrat; float Packrat = (float)spellbonuses.Packrat + (float)aabonuses.Packrat + (float)itembonuses.Packrat;

10
zone/client_packet.cpp
View File

@ -1309,12 +1309,12 @@ void Client::Handle_Connect_OP_ZoneEntry(const EQApplicationPacket *app)
conn_state = ReceivedZoneEntry; conn_state = ReceivedZoneEntry;
ClientVersion = Connection()->GetClientVersion(); SetClientVersion(Connection()->GetClientVersion());
if (ClientVersion != ClientVersion::Unknown) if (m_ClientVersion != ClientVersion::Unknown)
ClientVersionBit = 1 << (static_cast<unsigned int>(ClientVersion) - 1); ClientVersionBit = 1 << (static_cast<unsigned int>(m_ClientVersion) - 1);
bool siv = m_inv.SetInventoryVersion(ClientVersion); bool siv = m_inv.SetInventoryVersion(m_ClientVersion);
LogFile->write(EQEmuLog::Debug, "%s inventory version to %s(%i)", (siv ? "Succeeded in setting" : "Failed to set"), ClientVersionName(ClientVersion), ClientVersion); LogFile->write(EQEmuLog::Debug, "%s inventory version to %s(%i)", (siv ? "Succeeded in setting" : "Failed to set"), ClientVersionName(m_ClientVersion), m_ClientVersion);
/* Antighost code /* Antighost code
tmp var is so the search doesnt find this object tmp var is so the search doesnt find this object