diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/game/Chat/Chat.cpp | 2 | ||||
| -rw-r--r-- | src/server/game/Chat/Chat.h | 2 | ||||
| -rw-r--r-- | src/server/scripts/Commands/cs_misc.cpp | 32 |
3 files changed, 18 insertions, 18 deletions
diff --git a/src/server/game/Chat/Chat.cpp b/src/server/game/Chat/Chat.cpp index c374352acd8..3f2908cbdad 100644 --- a/src/server/game/Chat/Chat.cpp +++ b/src/server/game/Chat/Chat.cpp @@ -143,7 +143,7 @@ bool ChatHandler::isAvailable(ChatCommand const& cmd) const return m_session->GetSecurity() >= AccountTypes(cmd.SecurityLevel); } - return m_session->HasPermission(permission); + return HasPermission(permission); } bool ChatHandler::HasLowerSecurity(Player* target, uint64 guid, bool strong) diff --git a/src/server/game/Chat/Chat.h b/src/server/game/Chat/Chat.h index 4b93ddc1f42..604d911abc6 100644 --- a/src/server/game/Chat/Chat.h +++ b/src/server/game/Chat/Chat.h @@ -86,6 +86,7 @@ class ChatHandler // function with different implementation for chat/console virtual bool isAvailable(ChatCommand const& cmd) const; + virtual bool HasPermission(uint32 permission) const { return m_session->HasPermission(permission); } virtual std::string GetNameLink() const { return GetNameLink(m_session->GetPlayer()); } virtual bool needReportToTarget(Player* chr) const; virtual LocaleConstant GetSessionDbcLocale() const; @@ -149,6 +150,7 @@ class CliHandler : public ChatHandler // overwrite functions const char *GetTrinityString(int32 entry) const; bool isAvailable(ChatCommand const& cmd) const; + bool HasPermission(uint32 permission) const { return true; } void SendSysMessage(const char *str); std::string GetNameLink() const; bool needReportToTarget(Player* chr) const; diff --git a/src/server/scripts/Commands/cs_misc.cpp b/src/server/scripts/Commands/cs_misc.cpp index 1842563ba66..3051580a933 100644 --- a/src/server/scripts/Commands/cs_misc.cpp +++ b/src/server/scripts/Commands/cs_misc.cpp @@ -1550,9 +1550,9 @@ public: std::string eMail = handler->GetTrinityString(LANG_ERROR); uint32 security = 0; std::string lastIp = handler->GetTrinityString(LANG_ERROR); - uint32 locked = 0; + uint8 locked = 0; std::string lastLogin = handler->GetTrinityString(LANG_ERROR); - int16 flogin = 0; + uint32 failedLogins = 0; uint32 latency = 0; std::string OS = "None"; @@ -1636,6 +1636,12 @@ public: mapId = fields[6].GetUInt16(); areaId = fields[7].GetUInt16(); gender = fields[8].GetUInt8(); + uint32 health = fields[9].GetUInt32(); + uint32 playerFlags = fields[10].GetUInt32(); + if (!health || playerFlags & PLAYER_FLAGS_GHOST) + alive = "No"; + else + alive = "Yes"; } // Query the prepared statement for login data @@ -1658,15 +1664,8 @@ public: lastIp = fields[3].GetString(); lastLogin = fields[4].GetString(); - // For crossplattforming. Quoting ByteConverter.h - /** ByteConverter reverses the byte order. This is used - for cross platform where they have different endians. - */ - uint32 ip = inet_addr(lastIp.c_str()); - #if TRINITY_ENDIAN == BIGENDIAN EndianConvertReverse(ip); - #endif // If ip2nation table is populated, it displays the country PreparedStatement* stmt = LoginDatabase.GetPreparedStatement(LOGIN_SEL_IP2NATION_COUNTRY); @@ -1682,8 +1681,8 @@ public: muteTime = fields[5].GetUInt64(); muteReason = fields[6].GetString(); muteBy = fields[7].GetString(); - flogin = fields[8].GetInt16(); - locked = fields[9].GetUInt16(); + failedLogins = fields[8].GetUInt32(); + locked = fields[9].GetUInt8(); OS = fields[10].GetString(); } @@ -1752,13 +1751,13 @@ public: handler->PSendSysMessage(LANG_PINFO_ACC_ACCOUNT, userName.c_str(), accId, security); // Output VI. LANG_PINFO_ACC_LASTLOGIN - handler->PSendSysMessage(LANG_PINFO_ACC_LASTLOGIN, lastLogin.c_str(), flogin); + handler->PSendSysMessage(LANG_PINFO_ACC_LASTLOGIN, lastLogin.c_str(), failedLogins); // Output VIII. LANG_PINFO_ACC_OS handler->PSendSysMessage(LANG_PINFO_ACC_OS, OS.c_str(), latency, eMail.c_str()); // Output IX. LANG_PINFO_ACC_IP - handler->PSendSysMessage(LANG_PINFO_ACC_IP, lastIp.c_str(), locked == 0 ? "No" : "Yes"); + handler->PSendSysMessage(LANG_PINFO_ACC_IP, lastIp.c_str(), locked ? "Yes" : "No"); // Output X. LANG_PINFO_CHR_LEVEL handler->PSendSysMessage(LANG_PINFO_CHR_LEVEL, level, xp, xptotal, (xptotal - xp)); @@ -1830,16 +1829,15 @@ public: if (result6) { // Define the variables, so the compiler knows they exist - int rmailint = 0; + uint32 rmailint = 0; // Fetch the fields - readmail is a SUM(x) and given out as char! Thus... Field* fields = result6->Fetch(); - const char* readmail = fields[0].GetCString(); + std::string readmail = fields[0].GetString(); uint64 totalmail = fields[1].GetUInt64(); // ... we have to convert it from Char to int. We can use totalmail as it is - if (readmail) - rmailint = atoi(readmail); + rmailint = atol(readmail.c_str()); // Output XXII. LANG_INFO_CHR_MAILS if at least one mails is given if (totalmail >= 1) |