From 747a53cb67ec721a785bbd39e1be63e9e65dd47f Mon Sep 17 00:00:00 2001 From: VladimirMangos Date: Tue, 1 Sep 2009 15:55:27 +0400 Subject: [PATCH] [8447] Small code cleanups in guild loading. --- src/game/Guild.cpp | 12 ++++++------ src/shared/revision_nr.h | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/game/Guild.cpp b/src/game/Guild.cpp index 0148a42a2..2f0efe5d4 100644 --- a/src/game/Guild.cpp +++ b/src/game/Guild.cpp @@ -151,11 +151,11 @@ bool Guild::AddMember(uint64 plGuid, uint32 plRank) Field *fields = result->Fetch(); newmember.name = fields[0].GetCppString(); newmember.zoneId = fields[1].GetUInt32(); - newmember.level = fields[2].GetUInt32(); - newmember.Class = fields[3].GetUInt32(); + newmember.level = fields[2].GetUInt8(); + newmember.Class = fields[3].GetUInt8(); delete result; - if(newmember.level < 1 || newmember.level > STRONG_MAX_LEVEL - || newmember.Class < CLASS_WARRIOR || newmember.Class >= MAX_CLASSES) + if (newmember.level < 1 || newmember.level > STRONG_MAX_LEVEL || + newmember.Class < CLASS_WARRIOR || newmember.Class >= MAX_CLASSES) { sLog.outError("Player (GUID: %u) has a broken data in field `characters` table, cannot add him to guild.",GUID_LOPART(plGuid)); return false; @@ -389,9 +389,9 @@ bool Guild::LoadMembersFromDB(uint32 GuildId) } newmember.name = fields[18].GetCppString(); - newmember.level = fields[19].GetUInt32(); + newmember.level = fields[19].GetUInt8(); newmember.zoneId = fields[20].GetUInt32(); - newmember.Class = fields[21].GetUInt32(); + newmember.Class = fields[21].GetUInt8(); newmember.logout_time = fields[22].GetUInt64(); //this code will remove unexisting character guids from guild diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index 0dfdb2a3e..c2e206821 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "8446" + #define REVISION_NR "8447" #endif // __REVISION_NR_H__