[8447] Small code cleanups in guild loading.

This commit is contained in:
VladimirMangos 2009-09-01 15:55:27 +04:00
parent eec534f1f6
commit 747a53cb67
2 changed files with 7 additions and 7 deletions

View file

@ -151,11 +151,11 @@ bool Guild::AddMember(uint64 plGuid, uint32 plRank)
Field *fields = result->Fetch(); Field *fields = result->Fetch();
newmember.name = fields[0].GetCppString(); newmember.name = fields[0].GetCppString();
newmember.zoneId = fields[1].GetUInt32(); newmember.zoneId = fields[1].GetUInt32();
newmember.level = fields[2].GetUInt32(); newmember.level = fields[2].GetUInt8();
newmember.Class = fields[3].GetUInt32(); newmember.Class = fields[3].GetUInt8();
delete result; delete result;
if(newmember.level < 1 || newmember.level > STRONG_MAX_LEVEL if (newmember.level < 1 || newmember.level > STRONG_MAX_LEVEL ||
|| newmember.Class < CLASS_WARRIOR || newmember.Class >= MAX_CLASSES) 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)); sLog.outError("Player (GUID: %u) has a broken data in field `characters` table, cannot add him to guild.",GUID_LOPART(plGuid));
return false; return false;
@ -389,9 +389,9 @@ bool Guild::LoadMembersFromDB(uint32 GuildId)
} }
newmember.name = fields[18].GetCppString(); newmember.name = fields[18].GetCppString();
newmember.level = fields[19].GetUInt32(); newmember.level = fields[19].GetUInt8();
newmember.zoneId = fields[20].GetUInt32(); newmember.zoneId = fields[20].GetUInt32();
newmember.Class = fields[21].GetUInt32(); newmember.Class = fields[21].GetUInt8();
newmember.logout_time = fields[22].GetUInt64(); newmember.logout_time = fields[22].GetUInt64();
//this code will remove unexisting character guids from guild //this code will remove unexisting character guids from guild

View file

@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__ #ifndef __REVISION_NR_H__
#define __REVISION_NR_H__ #define __REVISION_NR_H__
#define REVISION_NR "8446" #define REVISION_NR "8447"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__