josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Core/Guilds: Fifth part of converting int to bigint guids in database

Browse Source
This commit is contained in:
Shauren
2014-10-25 15:04:38 +02:00
parent ddd57d3332
commit a363c88f03
33 changed files with 261 additions and 235 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sql/base/characters_database.sql
+28 -28
View File
@@ -1675,7 +1675,7 @@ DROP TABLE IF EXISTS `group_member`;
/*!40101 SET character_set_client = utf8 */;
CREATE TABLE `group_member` (
`guid` int(10) unsigned NOT NULL,
`memberGuid` int(10) unsigned NOT NULL,
`memberGuid` bigint(20) unsigned NOT NULL,
`memberFlags` tinyint(3) unsigned NOT NULL DEFAULT '0',
`subgroup` tinyint(3) unsigned NOT NULL DEFAULT '0',
`roles` tinyint(3) unsigned NOT NULL DEFAULT '0',
@@ -1701,9 +1701,9 @@ DROP TABLE IF EXISTS `groups`;
/*!40101 SET character_set_client = utf8 */;
CREATE TABLE `groups` (
`guid` int(10) unsigned NOT NULL,
`leaderGuid` int(10) unsigned NOT NULL,
`leaderGuid` bigint(20) unsigned NOT NULL,
`lootMethod` tinyint(3) unsigned NOT NULL,
`looterGuid` int(10) unsigned NOT NULL,
`looterGuid` bigint(20) unsigned NOT NULL,
`lootThreshold` tinyint(3) unsigned NOT NULL,
`icon1` binary(16) NOT NULL,
`icon2` binary(16) NOT NULL,
@@ -1716,7 +1716,7 @@ CREATE TABLE `groups` (
`groupType` tinyint(3) unsigned NOT NULL,
`difficulty` tinyint(3) unsigned NOT NULL DEFAULT '0',
`raiddifficulty` tinyint(3) unsigned NOT NULL DEFAULT '0',
`masterLooterGuid` int(10) unsigned NOT NULL,
`masterLooterGuid` bigint(20) unsigned NOT NULL,
PRIMARY KEY (`guid`),
KEY `leaderGuid` (`leaderGuid`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Groups';
@@ -1739,9 +1739,9 @@ DROP TABLE IF EXISTS `guild`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
CREATE TABLE `guild` (
`guildid` int(10) unsigned NOT NULL DEFAULT '0',
`guildid` bigint(20) unsigned NOT NULL DEFAULT '0',
`name` varchar(24) NOT NULL DEFAULT '',
`leaderguid` int(10) unsigned NOT NULL DEFAULT '0',
`leaderguid` bigint(20) unsigned NOT NULL DEFAULT '0',
`EmblemStyle` tinyint(3) unsigned NOT NULL DEFAULT '0',
`EmblemColor` tinyint(3) unsigned NOT NULL DEFAULT '0',
`BorderStyle` tinyint(3) unsigned NOT NULL DEFAULT '0',
@@ -1775,7 +1775,7 @@ DROP TABLE IF EXISTS `guild_achievement`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
CREATE TABLE `guild_achievement` (
`guildId` int(10) unsigned NOT NULL,
`guildId` bigint(20) unsigned NOT NULL,
`achievement` smallint(5) unsigned NOT NULL,
`date` int(10) unsigned NOT NULL DEFAULT '0',
`guids` text NOT NULL,
@@ -1800,11 +1800,11 @@ DROP TABLE IF EXISTS `guild_achievement_progress`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
CREATE TABLE `guild_achievement_progress` (
`guildId` int(10) unsigned NOT NULL,
`guildId` bigint(20) unsigned NOT NULL,
`criteria` smallint(5) unsigned NOT NULL,
`counter` bigint(20) unsigned NOT NULL,
`date` int(10) unsigned NOT NULL DEFAULT '0',
`completedGuid` int(10) unsigned NOT NULL DEFAULT '0',
`completedGuid` bigint(20) unsigned NOT NULL DEFAULT '0',
PRIMARY KEY (`guildId`,`criteria`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
/*!40101 SET character_set_client = @saved_cs_client */;
@@ -1826,12 +1826,12 @@ DROP TABLE IF EXISTS `guild_bank_eventlog`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
CREATE TABLE `guild_bank_eventlog` (
`guildid` int(10) unsigned NOT NULL DEFAULT '0' COMMENT 'Guild Identificator',
`guildid` bigint(20) unsigned NOT NULL DEFAULT '0' COMMENT 'Guild Identificator',
`LogGuid` int(10) unsigned NOT NULL DEFAULT '0' COMMENT 'Log record identificator - auxiliary column',
`TabId` tinyint(3) unsigned NOT NULL DEFAULT '0' COMMENT 'Guild bank TabId',
`EventType` tinyint(3) unsigned NOT NULL DEFAULT '0' COMMENT 'Event type',
`PlayerGuid` int(10) unsigned NOT NULL DEFAULT '0',
`ItemOrMoney` int(10) unsigned NOT NULL DEFAULT '0',
`PlayerGuid` bigint(20) unsigned NOT NULL DEFAULT '0',
`ItemOrMoney` bigint(20) unsigned NOT NULL DEFAULT '0',
`ItemStackCount` smallint(5) unsigned NOT NULL DEFAULT '0',
`DestTabId` tinyint(3) unsigned NOT NULL DEFAULT '0' COMMENT 'Destination Tab Id',
`TimeStamp` int(10) unsigned NOT NULL DEFAULT '0' COMMENT 'Event UNIX time',
@@ -1859,10 +1859,10 @@ DROP TABLE IF EXISTS `guild_bank_item`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
CREATE TABLE `guild_bank_item` (
`guildid` int(10) unsigned NOT NULL DEFAULT '0',
`guildid` bigint(20) unsigned NOT NULL DEFAULT '0',
`TabId` tinyint(3) unsigned NOT NULL DEFAULT '0',
`SlotId` tinyint(3) unsigned NOT NULL DEFAULT '0',
`item_guid` int(10) unsigned NOT NULL DEFAULT '0',
`item_guid` bigint(20) unsigned NOT NULL DEFAULT '0',
PRIMARY KEY (`guildid`,`TabId`,`SlotId`),
KEY `guildid_key` (`guildid`),
KEY `Idx_item_guid` (`item_guid`)
@@ -1886,7 +1886,7 @@ DROP TABLE IF EXISTS `guild_bank_right`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
CREATE TABLE `guild_bank_right` (
`guildid` int(10) unsigned NOT NULL DEFAULT '0',
`guildid` bigint(20) unsigned NOT NULL DEFAULT '0',
`TabId` tinyint(3) unsigned NOT NULL DEFAULT '0',
`rid` tinyint(3) unsigned NOT NULL DEFAULT '0',
`gbright` tinyint(3) unsigned NOT NULL DEFAULT '0',
@@ -1913,7 +1913,7 @@ DROP TABLE IF EXISTS `guild_bank_tab`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
CREATE TABLE `guild_bank_tab` (
`guildid` int(10) unsigned NOT NULL DEFAULT '0',
`guildid` bigint(20) unsigned NOT NULL DEFAULT '0',
`TabId` tinyint(3) unsigned NOT NULL DEFAULT '0',
`TabName` varchar(16) NOT NULL DEFAULT '',
`TabIcon` varchar(100) NOT NULL DEFAULT '',
@@ -1940,11 +1940,11 @@ DROP TABLE IF EXISTS `guild_eventlog`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
CREATE TABLE `guild_eventlog` (
`guildid` int(10) unsigned NOT NULL COMMENT 'Guild Identificator',
`guildid` bigint(20) unsigned NOT NULL COMMENT 'Guild Identificator',
`LogGuid` int(10) unsigned NOT NULL COMMENT 'Log record identificator - auxiliary column',
`EventType` tinyint(3) unsigned NOT NULL COMMENT 'Event type',
`PlayerGuid1` int(10) unsigned NOT NULL COMMENT 'Player 1',
`PlayerGuid2` int(10) unsigned NOT NULL COMMENT 'Player 2',
`PlayerGuid1` bigint(20) unsigned NOT NULL COMMENT 'Player 1',
`PlayerGuid2` bigint(20) unsigned NOT NULL COMMENT 'Player 2',
`NewRank` tinyint(3) unsigned NOT NULL COMMENT 'New rank(in case promotion/demotion)',
`TimeStamp` int(10) unsigned NOT NULL COMMENT 'Event UNIX time',
PRIMARY KEY (`guildid`,`LogGuid`),
@@ -1971,8 +1971,8 @@ DROP TABLE IF EXISTS `guild_finder_applicant`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
CREATE TABLE `guild_finder_applicant` (
`guildId` int(10) unsigned DEFAULT NULL,
`playerGuid` int(10) unsigned DEFAULT NULL,
`guildId` bigint(20) unsigned DEFAULT NULL,
`playerGuid` bigint(20) unsigned DEFAULT NULL,
`availability` tinyint(3) unsigned DEFAULT '0',
`classRole` tinyint(3) unsigned DEFAULT '0',
`interests` tinyint(3) unsigned DEFAULT '0',
@@ -1999,7 +1999,7 @@ DROP TABLE IF EXISTS `guild_finder_guild_settings`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
CREATE TABLE `guild_finder_guild_settings` (
`guildId` int(10) unsigned NOT NULL,
`guildId` bigint(20) unsigned NOT NULL,
`availability` tinyint(3) unsigned NOT NULL DEFAULT '0',
`classRoles` tinyint(3) unsigned NOT NULL DEFAULT '0',
`interests` tinyint(3) unsigned NOT NULL DEFAULT '0',
@@ -2027,8 +2027,8 @@ DROP TABLE IF EXISTS `guild_member`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
CREATE TABLE `guild_member` (
`guildid` int(10) unsigned NOT NULL COMMENT 'Guild Identificator',
`guid` int(10) unsigned NOT NULL,
`guildid` bigint(20) unsigned NOT NULL COMMENT 'Guild Identificator',
`guid` bigint(20) unsigned NOT NULL,
`rank` tinyint(3) unsigned NOT NULL,
`pnote` varchar(31) NOT NULL DEFAULT '',
`offnote` varchar(31) NOT NULL DEFAULT '',
@@ -2055,7 +2055,7 @@ DROP TABLE IF EXISTS `guild_member_withdraw`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
CREATE TABLE `guild_member_withdraw` (
`guid` int(10) unsigned NOT NULL,
`guid` bigint(20) unsigned NOT NULL,
`tab0` int(10) unsigned NOT NULL DEFAULT '0',
`tab1` int(10) unsigned NOT NULL DEFAULT '0',
`tab2` int(10) unsigned NOT NULL DEFAULT '0',
@@ -2086,10 +2086,10 @@ DROP TABLE IF EXISTS `guild_newslog`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
CREATE TABLE `guild_newslog` (
`guildid` int(10) unsigned NOT NULL DEFAULT '0' COMMENT 'Guild Identificator',
`guildid` bigint(20) unsigned NOT NULL DEFAULT '0' COMMENT 'Guild Identificator',
`LogGuid` int(10) unsigned NOT NULL DEFAULT '0' COMMENT 'Log record identificator - auxiliary column',
`EventType` tinyint(3) unsigned NOT NULL DEFAULT '0' COMMENT 'Event type',
`PlayerGuid` int(10) unsigned NOT NULL DEFAULT '0',
`PlayerGuid` bigint(20) unsigned NOT NULL DEFAULT '0',
`Flags` int(10) unsigned NOT NULL DEFAULT '0',
`Value` int(10) unsigned NOT NULL DEFAULT '0',
`TimeStamp` int(10) unsigned NOT NULL DEFAULT '0' COMMENT 'Event UNIX time',
@@ -2117,7 +2117,7 @@ DROP TABLE IF EXISTS `guild_rank`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
CREATE TABLE `guild_rank` (
`guildid` int(10) unsigned NOT NULL DEFAULT '0',
`guildid` bigint(20) unsigned NOT NULL DEFAULT '0',
`rid` tinyint(3) unsigned NOT NULL,
`rname` varchar(20) NOT NULL DEFAULT '',
`rights` mediumint(8) unsigned NOT NULL DEFAULT '0',
sql/updates/characters/2014_10_25_00_characters.sql
+28
View File
@@ -0,0 +1,28 @@
ALTER TABLE `group_member` CHANGE `memberGuid` `memberGuid` BIGINT(20) UNSIGNED NOT NULL DEFAULT '0';
ALTER TABLE `groups` CHANGE `leaderGuid` `leaderGuid` BIGINT(20) UNSIGNED NOT NULL DEFAULT '0';
ALTER TABLE `groups` CHANGE `looterGuid` `looterGuid` BIGINT(20) UNSIGNED NOT NULL DEFAULT '0';
ALTER TABLE `groups` CHANGE `masterLooterGuid` `masterLooterGuid` BIGINT(20) UNSIGNED NOT NULL DEFAULT '0';
ALTER TABLE `guild` CHANGE `guildid` `guildid` BIGINT(20) UNSIGNED NOT NULL DEFAULT '0';
ALTER TABLE `guild` CHANGE `leaderguid` `leaderguid` BIGINT(20) UNSIGNED NOT NULL DEFAULT '0';
ALTER TABLE `guild_achievement` CHANGE `guildId` `guildId` BIGINT(20) UNSIGNED NOT NULL DEFAULT '0';
ALTER TABLE `guild_achievement_progress` CHANGE `guildId` `guildId` BIGINT(20) UNSIGNED NOT NULL DEFAULT '0';
ALTER TABLE `guild_achievement_progress` CHANGE `completedGuid` `completedGuid` BIGINT(20) UNSIGNED NOT NULL DEFAULT '0';
ALTER TABLE `guild_bank_eventlog` CHANGE `guildId` `guildId` BIGINT(20) UNSIGNED NOT NULL DEFAULT '0';
ALTER TABLE `guild_bank_eventlog` CHANGE `PlayerGuid` `PlayerGuid` BIGINT(20) UNSIGNED NOT NULL DEFAULT '0';
ALTER TABLE `guild_bank_eventlog` CHANGE `ItemOrMoney` `ItemOrMoney` BIGINT(20) UNSIGNED NOT NULL DEFAULT '0';
ALTER TABLE `guild_bank_item` CHANGE `guildId` `guildId` BIGINT(20) UNSIGNED NOT NULL DEFAULT '0';
ALTER TABLE `guild_bank_item` CHANGE `item_guid` `item_guid` BIGINT(20) UNSIGNED NOT NULL DEFAULT '0';
ALTER TABLE `guild_bank_right` CHANGE `guildId` `guildId` BIGINT(20) UNSIGNED NOT NULL DEFAULT '0';
ALTER TABLE `guild_bank_tab` CHANGE `guildId` `guildId` BIGINT(20) UNSIGNED NOT NULL DEFAULT '0';
ALTER TABLE `guild_eventlog` CHANGE `guildId` `guildId` BIGINT(20) UNSIGNED NOT NULL DEFAULT '0';
ALTER TABLE `guild_eventlog` CHANGE `PlayerGuid1` `PlayerGuid1` BIGINT(20) UNSIGNED NOT NULL DEFAULT '0';
ALTER TABLE `guild_eventlog` CHANGE `PlayerGuid2` `PlayerGuid2` BIGINT(20) UNSIGNED NOT NULL DEFAULT '0';
ALTER TABLE `guild_finder_applicant` CHANGE `guildId` `guildId` BIGINT(20) UNSIGNED NOT NULL DEFAULT '0';
ALTER TABLE `guild_finder_applicant` CHANGE `playerGuid` `playerGuid` BIGINT(20) UNSIGNED NOT NULL DEFAULT '0';
ALTER TABLE `guild_finder_guild_settings` CHANGE `guildId` `guildId` BIGINT(20) UNSIGNED NOT NULL DEFAULT '0';
ALTER TABLE `guild_member` CHANGE `guildId` `guildId` BIGINT(20) UNSIGNED NOT NULL DEFAULT '0';
ALTER TABLE `guild_member` CHANGE `guid` `guid` BIGINT(20) UNSIGNED NOT NULL DEFAULT '0';
ALTER TABLE `guild_member_withdraw` CHANGE `guid` `guid` BIGINT(20) UNSIGNED NOT NULL DEFAULT '0';
ALTER TABLE `guild_newslog` CHANGE `guildId` `guildId` BIGINT(20) UNSIGNED NOT NULL DEFAULT '0';
ALTER TABLE `guild_newslog` CHANGE `PlayerGuid` `PlayerGuid` BIGINT(20) UNSIGNED NOT NULL DEFAULT '0';
ALTER TABLE `guild_rank` CHANGE `guildId` `guildId` BIGINT(20) UNSIGNED NOT NULL DEFAULT '0';
sql/updates/world/2014_10_25_00_world.sql
+2
View File
@@ -0,0 +1,2 @@
UPDATE `trinity_string` SET `content_default`='%s - guild: %s (%s) %s' WHERE `entry`=1118;
UPDATE `trinity_string` SET `content_default`='│ Guild: %s (ID: %llu)' WHERE `entry`=849;
src/server/game/Achievements/AchievementMgr.cpp
+9 -9
View File
@@ -530,11 +530,11 @@ void AchievementMgr<Guild>::DeleteFromDB(ObjectGuid guid)
SQLTransaction trans = CharacterDatabase.BeginTransaction();
PreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_DEL_ALL_GUILD_ACHIEVEMENTS);
stmt->setUInt32(0, guid.GetCounter());
stmt->setUInt64(0, guid.GetCounter());
trans->Append(stmt);
stmt = CharacterDatabase.GetPreparedStatement(CHAR_DEL_ALL_GUILD_ACHIEVEMENT_CRITERIA);
stmt->setUInt32(0, guid.GetCounter());
stmt->setUInt64(0, guid.GetCounter());
trans->Append(stmt);
CharacterDatabase.CommitTransaction(trans);
@@ -608,12 +608,12 @@ void AchievementMgr<Guild>::SaveToDB(SQLTransaction& trans)
continue;
stmt = CharacterDatabase.GetPreparedStatement(CHAR_DEL_GUILD_ACHIEVEMENT);
stmt->setUInt32(0, GetOwner()->GetId());
stmt->setUInt64(0, GetOwner()->GetId());
stmt->setUInt16(1, itr->first);
trans->Append(stmt);
stmt = CharacterDatabase.GetPreparedStatement(CHAR_INS_GUILD_ACHIEVEMENT);
stmt->setUInt32(0, GetOwner()->GetId());
stmt->setUInt64(0, GetOwner()->GetId());
stmt->setUInt16(1, itr->first);
stmt->setUInt32(2, itr->second.date);
for (GuidSet::const_iterator gItr = itr->second.guids.begin(); gItr != itr->second.guids.end(); ++gItr)
@@ -631,16 +631,16 @@ void AchievementMgr<Guild>::SaveToDB(SQLTransaction& trans)
continue;
stmt = CharacterDatabase.GetPreparedStatement(CHAR_DEL_GUILD_ACHIEVEMENT_CRITERIA);
stmt->setUInt32(0, GetOwner()->GetId());
stmt->setUInt64(0, GetOwner()->GetId());
stmt->setUInt16(1, itr->first);
trans->Append(stmt);
stmt = CharacterDatabase.GetPreparedStatement(CHAR_INS_GUILD_ACHIEVEMENT_CRITERIA);
stmt->setUInt32(0, GetOwner()->GetId());
stmt->setUInt64(0, GetOwner()->GetId());
stmt->setUInt16(1, itr->first);
stmt->setUInt64(2, itr->second.counter);
stmt->setUInt32(3, itr->second.date);
stmt->setUInt32(4, itr->second.CompletedGUID.GetCounter());
stmt->setUInt64(4, itr->second.CompletedGUID.GetCounter());
trans->Append(stmt);
}
}
@@ -735,7 +735,7 @@ void AchievementMgr<Guild>::LoadFromDB(PreparedQueryResult achievementResult, Pr
ca.date = time_t(fields[1].GetUInt32());
Tokenizer guids(fields[2].GetString(), ' ');
for (uint32 i = 0; i < guids.size(); ++i)
ca.guids.insert(ObjectGuid(HIGHGUID_PLAYER, uint32(atol(guids[i]))));
ca.guids.insert(ObjectGuid(HIGHGUID_PLAYER, uint64(strtoull(guids[i], nullptr, 10))));
ca.changed = false;
@@ -753,7 +753,7 @@ void AchievementMgr<Guild>::LoadFromDB(PreparedQueryResult achievementResult, Pr
uint32 id = fields[0].GetUInt16();
uint32 counter = fields[1].GetUInt32();
time_t date = time_t(fields[2].GetUInt32());
uint32 guid = fields[3].GetUInt32();
ObjectGuid::LowType guid = fields[3].GetUInt64();
AchievementCriteriaEntry const* criteria = sAchievementMgr->GetAchievementCriteria(id);
if (!criteria)
src/server/game/AuctionHouseBot/AuctionHouseBotSeller.cpp
+2 -2
View File
@@ -990,13 +990,13 @@ void AuctionBotSeller::AddNewAuctions(SellerConfiguration& config)
AuctionEntry* auctionEntry = new AuctionEntry();
auctionEntry->Id = sObjectMgr->GenerateAuctionID();
auctionEntry->owner = 0;
auctionEntry->owner = UI64LIT(0);
auctionEntry->itemGUIDLow = item->GetGUID().GetCounter();
auctionEntry->itemEntry = item->GetEntry();
auctionEntry->startbid = bidPrice;
auctionEntry->buyout = buyoutPrice;
auctionEntry->auctioneer = auctioneer;
auctionEntry->bidder = 0;
auctionEntry->bidder = UI64LIT(0);
auctionEntry->bid = 0;
auctionEntry->deposit = sAuctionMgr->GetAuctionDeposit(ahEntry, etime, item, stackCount);
auctionEntry->auctionHouseEntry = ahEntry;
src/server/game/Battlegrounds/Arena.cpp
+1 -1
View File
@@ -233,7 +233,7 @@ void Arena::EndBattleground(uint32 winner)
if (!guildAwarded)
{
guildAwarded = true;
if (uint32 guildId = GetBgMap()->GetOwnerGuildId(player->GetBGTeam()))
if (ObjectGuid::LowType guildId = GetBgMap()->GetOwnerGuildId(player->GetBGTeam()))
if (Guild* guild = sGuildMgr->GetGuildById(guildId))
guild->UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_WIN_RATED_ARENA, std::max<uint32>(winnerArenaTeam->GetRating(), 1), 0, 0, NULL, player);
}
src/server/game/Battlegrounds/ArenaTeam.cpp
+2 -2
View File
@@ -193,7 +193,7 @@ bool ArenaTeam::LoadArenaTeamFromDB(QueryResult result)
TeamId = fields[0].GetUInt32();
TeamName = fields[1].GetString();
CaptainGuid = ObjectGuid(HIGHGUID_PLAYER, fields[2].GetUInt32());
CaptainGuid = ObjectGuid(HIGHGUID_PLAYER, fields[2].GetUInt64());
Type = fields[3].GetUInt8();
BackgroundColor = fields[4].GetUInt32();
EmblemStyle = fields[5].GetUInt8();
@@ -232,7 +232,7 @@ bool ArenaTeam::LoadMembersFromDB(QueryResult result)
break;
ArenaTeamMember newMember;
newMember.Guid = ObjectGuid(HIGHGUID_PLAYER, fields[1].GetUInt32());
newMember.Guid = ObjectGuid(HIGHGUID_PLAYER, fields[1].GetUInt64());
newMember.WeekGames = fields[2].GetUInt16();
newMember.WeekWins = fields[3].GetUInt16();
newMember.SeasonGames = fields[4].GetUInt16();
src/server/game/Entities/Item/Container/Bag.cpp
+1 -1
View File
@@ -109,7 +109,7 @@ void Bag::SaveToDB(SQLTransaction& trans)
Item::SaveToDB(trans);
}
bool Bag::LoadFromDB(uint32 guid, ObjectGuid owner_guid, Field* fields, uint32 entry)
bool Bag::LoadFromDB(ObjectGuid::LowType guid, ObjectGuid owner_guid, Field* fields, uint32 entry)
{
if (!Item::LoadFromDB(guid, owner_guid, fields, entry))
return false;
src/server/game/Entities/Item/Container/Bag.h
+1 -1
View File
@@ -54,7 +54,7 @@ class Bag : public Item
// overwrite virtual Item::SaveToDB
void SaveToDB(SQLTransaction& trans) override;
// overwrite virtual Item::LoadFromDB
bool LoadFromDB(uint32 guid, ObjectGuid owner_guid, Field* fields, uint32 entry) override;
bool LoadFromDB(ObjectGuid::LowType guid, ObjectGuid owner_guid, Field* fields, uint32 entry) override;
// overwrite virtual Item::DeleteFromDB
void DeleteFromDB(SQLTransaction& trans) override;
src/server/game/Entities/Item/Item.cpp
+1 -1
View File
@@ -401,7 +401,7 @@ void Item::SaveToDB(SQLTransaction& trans)
CharacterDatabase.CommitTransaction(trans);
}
bool Item::LoadFromDB(uint32 guid, ObjectGuid owner_guid, Field* fields, uint32 entry)
bool Item::LoadFromDB(ObjectGuid::LowType guid, ObjectGuid owner_guid, Field* fields, uint32 entry)
{
// 0 1 2 3 4 5 6 7 8 9 10
//result = CharacterDatabase.PQuery("SELECT creatorGuid, giftCreatorGuid, count, duration, charges, flags, enchantments, randomPropertyId, durability, playedTime, text FROM item_instance WHERE guid = '%u'", guid);
src/server/game/Entities/Item/Item.h
+1 -1
View File
@@ -235,7 +235,7 @@ class Item : public Object
bool IsBindedNotWith(Player const* player) const;
bool IsBoundByEnchant() const;
virtual void SaveToDB(SQLTransaction& trans);
virtual bool LoadFromDB(uint32 guid, ObjectGuid owner_guid, Field* fields, uint32 entry);
virtual bool LoadFromDB(ObjectGuid::LowType guid, ObjectGuid owner_guid, Field* fields, uint32 entry);
static void DeleteFromDB(SQLTransaction& trans, uint32 itemGuid);
virtual void DeleteFromDB(SQLTransaction& trans);
static void DeleteFromInventoryDB(SQLTransaction& trans, ObjectGuid::LowType itemGuid);
src/server/game/Entities/Object/ObjectGuid.h
-1
View File
@@ -96,7 +96,6 @@ class ObjectGuid
typedef uint32 LowType;
ObjectGuid() : _low(0), _high(0) { }
ObjectGuid(uint64 high, uint64 low) : _low(low), _high(high) { }
ObjectGuid(HighGuid hi, uint32 entry, uint64 counter) : _low(counter ? uint64(counter) | (uint64(entry) << 32) | (uint64(hi) << ((hi == HIGHGUID_CORPSE || hi == HIGHGUID_AREATRIGGER) ? 48 : 52)) : 0), _high(0) { }
ObjectGuid(HighGuid hi, uint64 counter) : _low(counter ? uint64(counter) | (uint64(hi) << ((hi == HIGHGUID_CORPSE || hi == HIGHGUID_AREATRIGGER) ? 48 : 52)) : 0), _high(0) { }
ObjectGuid(ObjectGuid const&) = default;
src/server/game/Entities/Player/Player.cpp
+11 -11
View File
@@ -732,7 +732,7 @@ Player::Player(WorldSession* session): Unit(true)
duel = NULL;
m_GuildIdInvited = 0;
m_GuildIdInvited = UI64LIT(0);
m_ArenaTeamIdInvited = 0;
m_atLoginFlags = AT_LOGIN_NONE;
@@ -1979,7 +1979,7 @@ bool Player::BuildEnumData(PreparedQueryResult result, ByteBuffer* dataBuffer)
float x = fields[10].GetFloat();
float y = fields[11].GetFloat();
float z = fields[12].GetFloat();
uint32 guildId = fields[13].GetUInt32();
uint32 guildId = fields[13].GetUInt64();
ObjectGuid guildGuid;
if (guildId)
guildGuid = ObjectGuid(HIGHGUID_GUILD, guildId);
@@ -4678,7 +4678,7 @@ void Player::DeleteFromDB(ObjectGuid playerguid, uint32 accountId, bool updateRe
// the player was uninvited already on logout so just remove from group
PreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_SEL_GROUP_MEMBER);
stmt->setUInt32(0, guid);
stmt->setUInt64(0, guid);
PreparedQueryResult resultGroup = CharacterDatabase.Query(stmt);
if (resultGroup)
@@ -4917,12 +4917,12 @@ void Player::DeleteFromDB(ObjectGuid playerguid, uint32 accountId, bool updateRe
trans->Append(stmt);
stmt = CharacterDatabase.GetPreparedStatement(CHAR_DEL_GUILD_EVENTLOG_BY_PLAYER);
stmt->setUInt32(0, guid);
stmt->setUInt32(1, guid);
stmt->setUInt64(0, guid);
stmt->setUInt64(1, guid);
trans->Append(stmt);
stmt = CharacterDatabase.GetPreparedStatement(CHAR_DEL_GUILD_BANK_EVENTLOG_BY_PLAYER);
stmt->setUInt32(0, guid);
stmt->setUInt64(0, guid);
trans->Append(stmt);
stmt = CharacterDatabase.GetPreparedStatement(CHAR_DEL_PLAYER_BGDATA);
@@ -7588,7 +7588,7 @@ void Player::UpdateConquestCurrencyCap(uint32 currency)
}
}
void Player::SetInGuild(uint32 guildId)
void Player::SetInGuild(ObjectGuid::LowType guildId)
{
if (guildId)
SetGuidValue(OBJECT_FIELD_DATA, ObjectGuid(HIGHGUID_GUILD, guildId));
@@ -7599,12 +7599,12 @@ void Player::SetInGuild(uint32 guildId)
SetUInt16Value(OBJECT_FIELD_TYPE, 1, guildId != 0);
}
uint32 Player::GetGuildIdFromDB(ObjectGuid guid)
ObjectGuid::LowType Player::GetGuildIdFromDB(ObjectGuid guid)
{
PreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_SEL_GUILD_MEMBER);
stmt->setUInt32(0, guid.GetCounter());
stmt->setUInt64(0, guid.GetCounter());
if (PreparedQueryResult result = CharacterDatabase.Query(stmt))
return result->Fetch()[0].GetUInt32();
return result->Fetch()[0].GetUInt64();
return 0;
}
@@ -7612,7 +7612,7 @@ uint32 Player::GetGuildIdFromDB(ObjectGuid guid)
uint8 Player::GetRankFromDB(ObjectGuid guid)
{
PreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_SEL_GUILD_MEMBER);
stmt->setUInt32(0, guid.GetCounter());
stmt->setUInt64(0, guid.GetCounter());
if (PreparedQueryResult result = CharacterDatabase.Query(stmt))
return result->Fetch()[1].GetUInt8();
src/server/game/Entities/Player/Player.h
+6 -6
View File
@@ -1952,17 +1952,17 @@ class Player : public Unit, public GridObject<Player>
void RemoveFromGroup(RemoveMethod method = GROUP_REMOVEMETHOD_DEFAULT) { RemoveFromGroup(GetGroup(), GetGUID(), method); }
void SendUpdateToOutOfRangeGroupMembers();
void SetInGuild(uint32 guildId);
void SetInGuild(ObjectGuid::LowType guildId);
void SetRank(uint8 rankId) { SetUInt32Value(PLAYER_GUILDRANK, rankId); }
uint8 GetRank() const { return uint8(GetUInt32Value(PLAYER_GUILDRANK)); }
void SetGuildLevel(uint32 level) { SetUInt32Value(PLAYER_GUILDLEVEL, level); }
uint32 GetGuildLevel() { return GetUInt32Value(PLAYER_GUILDLEVEL); }
void SetGuildIdInvited(uint32 GuildId) { m_GuildIdInvited = GuildId; }
uint32 GetGuildId() const { return GetUInt32Value(OBJECT_FIELD_DATA); /* return only lower part */ }
void SetGuildIdInvited(ObjectGuid::LowType GuildId) { m_GuildIdInvited = GuildId; }
ObjectGuid::LowType GetGuildId() const { return GetUInt64Value(OBJECT_FIELD_DATA); /* return only lower part */ }
Guild* GetGuild();
static uint32 GetGuildIdFromDB(ObjectGuid guid);
static ObjectGuid::LowType GetGuildIdFromDB(ObjectGuid guid);
static uint8 GetRankFromDB(ObjectGuid guid);
int GetGuildIdInvited() { return m_GuildIdInvited; }
ObjectGuid::LowType GetGuildIdInvited() { return m_GuildIdInvited; }
static void RemovePetitionsAndSigns(ObjectGuid guid, uint32 type);
// Arena Team
@@ -2745,7 +2745,7 @@ class Player : public Unit, public GridObject<Player>
SkillStatusMap mSkillStatus;
uint32 m_GuildIdInvited;
ObjectGuid::LowType m_GuildIdInvited;
uint32 m_ArenaTeamIdInvited;
PlayerMails m_mail;
src/server/game/Globals/ObjectMgr.cpp
+3 -3
View File
@@ -6375,7 +6375,7 @@ void ObjectMgr::SetHighestGuids()
{
QueryResult result = CharacterDatabase.Query("SELECT MAX(guid) FROM characters");
if (result)
_hiCharGuid = (*result)[0].GetUInt32()+1;
_hiCharGuid = (*result)[0].GetUInt64()+1;
result = WorldDatabase.Query("SELECT MAX(guid) FROM creature");
if (result)
@@ -6409,7 +6409,7 @@ void ObjectMgr::SetHighestGuids()
result = CharacterDatabase.Query("SELECT MAX(corpseGuid) FROM corpse");
if (result)
_hiCorpseGuid = (*result)[0].GetUInt32()+1;
_hiCorpseGuid = (*result)[0].GetUInt64()+1;
result = CharacterDatabase.Query("SELECT MAX(arenateamid) FROM arena_team");
if (result)
@@ -6421,7 +6421,7 @@ void ObjectMgr::SetHighestGuids()
result = CharacterDatabase.Query("SELECT MAX(guildId) FROM guild");
if (result)
sGuildMgr->SetNextGuildId((*result)[0].GetUInt32()+1);
sGuildMgr->SetNextGuildId((*result)[0].GetUInt64()+1);
result = CharacterDatabase.Query("SELECT MAX(guid) FROM groups");
if (result)
src/server/game/Groups/Group.cpp
+10 -10
View File
@@ -130,9 +130,9 @@ bool Group::Create(Player* leader)
uint8 index = 0;
stmt->setUInt32(index++, m_dbStoreId);
stmt->setUInt32(index++, m_leaderGuid.GetCounter());
stmt->setUInt64(index++, m_leaderGuid.GetCounter());
stmt->setUInt8(index++, uint8(m_lootMethod));
stmt->setUInt32(index++, m_looterGuid.GetCounter());
stmt->setUInt64(index++, m_looterGuid.GetCounter());
stmt->setUInt8(index++, uint8(m_lootThreshold));
stmt->setBinary(index++, m_targetIcons[0].GetRawValue());
stmt->setBinary(index++, m_targetIcons[1].GetRawValue());
@@ -145,7 +145,7 @@ bool Group::Create(Player* leader)
stmt->setUInt8(index++, uint8(m_groupType));
stmt->setUInt32(index++, uint8(m_dungeonDifficulty));
stmt->setUInt32(index++, uint8(m_raidDifficulty));
stmt->setUInt32(index++, m_masterLooterGuid.GetCounter());
stmt->setUInt64(index++, m_masterLooterGuid.GetCounter());
CharacterDatabase.Execute(stmt);
@@ -199,7 +199,7 @@ void Group::LoadGroupFromDB(Field* fields)
sLFGMgr->_LoadFromDB(fields, GetGUID());
}
void Group::LoadMemberFromDB(uint32 guidLow, uint8 memberFlags, uint8 subgroup, uint8 roles)
void Group::LoadMemberFromDB(ObjectGuid::LowType guidLow, uint8 memberFlags, uint8 subgroup, uint8 roles)
{
MemberSlot member;
member.guid = ObjectGuid(HIGHGUID_PLAYER, guidLow);
@@ -208,7 +208,7 @@ void Group::LoadMemberFromDB(uint32 guidLow, uint8 memberFlags, uint8 subgroup,
if (!sObjectMgr->GetPlayerNameByGUID(member.guid, member.name))
{
PreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_DEL_GROUP_MEMBER);
stmt->setUInt32(0, guidLow);
stmt->setUInt64(0, guidLow);
CharacterDatabase.Execute(stmt);
return;
}
@@ -423,7 +423,7 @@ bool Group::AddMember(Player* player)
PreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_INS_GROUP_MEMBER);
stmt->setUInt32(0, m_dbStoreId);
stmt->setUInt32(1, member.guid.GetCounter());
stmt->setUInt64(1, member.guid.GetCounter());
stmt->setUInt8(2, member.flags);
stmt->setUInt8(3, member.group);
stmt->setUInt8(4, member.roles);
@@ -691,7 +691,7 @@ void Group::ChangeLeader(ObjectGuid newLeaderGuid)
// Update the group leader
PreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_UPD_GROUP_LEADER);
stmt->setUInt32(0, newLeader->GetGUID().GetCounter());
stmt->setUInt64(0, newLeader->GetGUID().GetCounter());
stmt->setUInt32(1, m_dbStoreId);
trans->Append(stmt);
@@ -1693,7 +1693,7 @@ bool Group::_setMembersGroup(ObjectGuid guid, uint8 group)
PreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_UPD_GROUP_MEMBER_SUBGROUP);
stmt->setUInt8(0, group);
stmt->setUInt32(1, guid.GetCounter());
stmt->setUInt64(1, guid.GetCounter());
CharacterDatabase.Execute(stmt);
}
@@ -1744,7 +1744,7 @@ void Group::ChangeMembersGroup(ObjectGuid guid, uint8 group)
PreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_UPD_GROUP_MEMBER_SUBGROUP);
stmt->setUInt8(0, group);
stmt->setUInt32(1, guid.GetCounter());
stmt->setUInt64(1, guid.GetCounter());
CharacterDatabase.Execute(stmt);
}
@@ -2394,7 +2394,7 @@ void Group::SetGroupMemberFlag(ObjectGuid guid, bool apply, GroupMemberFlags fla
PreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_UPD_GROUP_MEMBER_FLAG);
stmt->setUInt8(0, slot->flags);
stmt->setUInt32(1, guid.GetCounter());
stmt->setUInt64(1, guid.GetCounter());
CharacterDatabase.Execute(stmt);
src/server/game/Groups/Group.h
+1 -1
View File
@@ -190,7 +190,7 @@ class Group
// group manipulation methods
bool Create(Player* leader);
void LoadGroupFromDB(Field* field);
void LoadMemberFromDB(uint32 guidLow, uint8 memberFlags, uint8 subgroup, uint8 roles);
void LoadMemberFromDB(ObjectGuid::LowType guidLow, uint8 memberFlags, uint8 subgroup, uint8 roles);
bool AddInvite(Player* player);
void RemoveInvite(Player* player);
void RemoveAllInvites();
src/server/game/Groups/GroupMgr.cpp
+1 -1
View File
@@ -181,7 +181,7 @@ void GroupMgr::LoadGroups()
Group* group = GetGroupByDbStoreId(fields[0].GetUInt32());
if (group)
group->LoadMemberFromDB(fields[1].GetUInt32(), fields[2].GetUInt8(), fields[3].GetUInt8(), fields[4].GetUInt8());
group->LoadMemberFromDB(fields[1].GetUInt64(), fields[2].GetUInt8(), fields[3].GetUInt8(), fields[4].GetUInt8());
else
TC_LOG_ERROR("misc", "GroupMgr::LoadGroups: Consistency failed, can't find group (storage id: %u)", fields[0].GetUInt32());
src/server/game/Guilds/Guild.cpp
+69 -70
View File
@@ -181,17 +181,17 @@ inline uint32 Guild::LogHolder::GetNextGUID()
void Guild::EventLogEntry::SaveToDB(SQLTransaction& trans) const
{
PreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_DEL_GUILD_EVENTLOG);
stmt->setUInt32(0, m_guildId);
stmt->setUInt64(0, m_guildId);
stmt->setUInt32(1, m_guid);
CharacterDatabase.ExecuteOrAppend(trans, stmt);
uint8 index = 0;
stmt = CharacterDatabase.GetPreparedStatement(CHAR_INS_GUILD_EVENTLOG);
stmt->setUInt32( index, m_guildId);
stmt->setUInt64( index, m_guildId);
stmt->setUInt32(++index, m_guid);
stmt->setUInt8 (++index, uint8(m_eventType));
stmt->setUInt32(++index, m_playerGuid1);
stmt->setUInt32(++index, m_playerGuid2);
stmt->setUInt64(++index, m_playerGuid1);
stmt->setUInt64(++index, m_playerGuid2);
stmt->setUInt8 (++index, m_newRank);
stmt->setUInt64(++index, m_timestamp);
CharacterDatabase.ExecuteOrAppend(trans, stmt);
@@ -255,18 +255,18 @@ void Guild::BankEventLogEntry::SaveToDB(SQLTransaction& trans) const
uint8 index = 0;
PreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_DEL_GUILD_BANK_EVENTLOG);
stmt->setUInt32( index, m_guildId);
stmt->setUInt64( index, m_guildId);
stmt->setUInt32(++index, m_guid);
stmt->setUInt8 (++index, m_bankTabId);
CharacterDatabase.ExecuteOrAppend(trans, stmt);
index = 0;
stmt = CharacterDatabase.GetPreparedStatement(CHAR_INS_GUILD_BANK_EVENTLOG);
stmt->setUInt32( index, m_guildId);
stmt->setUInt64( index, m_guildId);
stmt->setUInt32(++index, m_guid);
stmt->setUInt8 (++index, m_bankTabId);
stmt->setUInt8 (++index, uint8(m_eventType));
stmt->setUInt32(++index, m_playerGuid);
stmt->setUInt64(++index, m_playerGuid);
stmt->setUInt32(++index, m_itemOrMoney);
stmt->setUInt16(++index, m_itemStackCount);
stmt->setUInt8 (++index, m_destTabId);
@@ -326,10 +326,10 @@ void Guild::NewsLogEntry::SaveToDB(SQLTransaction& trans) const
{
uint8 index = 0;
PreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_INS_GUILD_NEWS);
stmt->setUInt32( index, m_guildId);
stmt->setUInt64( index, m_guildId);
stmt->setUInt32(++index, GetGUID());
stmt->setUInt8 (++index, GetType());
stmt->setUInt32(++index, GetPlayerGuid().GetCounter());
stmt->setUInt64(++index, GetPlayerGuid().GetCounter());
stmt->setUInt32(++index, GetFlags());
stmt->setUInt32(++index, GetValue());
stmt->setUInt64(++index, GetTimestamp());
@@ -385,7 +385,7 @@ void Guild::RankInfo::LoadFromDB(Field* fields)
void Guild::RankInfo::SaveToDB(SQLTransaction& trans) const
{
PreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_INS_GUILD_RANK);
stmt->setUInt32(0, m_guildId);
stmt->setUInt64(0, m_guildId);
stmt->setUInt8 (1, m_rankId);
stmt->setString(2, m_name);
stmt->setUInt32(3, m_rights);
@@ -409,7 +409,7 @@ void Guild::RankInfo::CreateMissingTabsIfNeeded(uint8 tabs, SQLTransaction& tran
TC_LOG_ERROR("guild", "Guild %u has broken Tab %u for rank %u. Created default tab.", m_guildId, i, m_rankId);
PreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_INS_GUILD_BANK_RIGHT);
stmt->setUInt32(0, m_guildId);
stmt->setUInt64(0, m_guildId);
stmt->setUInt8(1, i);
stmt->setUInt8(2, m_rankId);
stmt->setUInt8(3, rightsAndSlots.GetRights());
@@ -428,7 +428,7 @@ void Guild::RankInfo::SetName(std::string const& name)
PreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_UPD_GUILD_RANK_NAME);
stmt->setString(0, m_name);
stmt->setUInt8 (1, m_rankId);
stmt->setUInt32(2, m_guildId);
stmt->setUInt64(2, m_guildId);
CharacterDatabase.Execute(stmt);
}
@@ -445,7 +445,7 @@ void Guild::RankInfo::SetRights(uint32 rights)
PreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_UPD_GUILD_RANK_RIGHTS);
stmt->setUInt32(0, m_rights);
stmt->setUInt8 (1, m_rankId);
stmt->setUInt32(2, m_guildId);
stmt->setUInt64(2, m_guildId);
CharacterDatabase.Execute(stmt);
}
@@ -462,7 +462,7 @@ void Guild::RankInfo::SetBankMoneyPerDay(uint32 money)
PreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_UPD_GUILD_RANK_BANK_MONEY);
stmt->setUInt32(0, money);
stmt->setUInt8 (1, m_rankId);
stmt->setUInt32(2, m_guildId);
stmt->setUInt64(2, m_guildId);
CharacterDatabase.Execute(stmt);
}
@@ -477,7 +477,7 @@ void Guild::RankInfo::SetBankTabSlotsAndRights(GuildBankRightsAndSlots rightsAnd
if (saveToDB)
{
PreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_INS_GUILD_BANK_RIGHT);
stmt->setUInt32(0, m_guildId);
stmt->setUInt64(0, m_guildId);
stmt->setUInt8 (1, guildBR.GetTabId());
stmt->setUInt8 (2, m_rankId);
stmt->setUInt8 (3, guildBR.GetRights());
@@ -497,28 +497,28 @@ void Guild::BankTab::LoadFromDB(Field* fields)
bool Guild::BankTab::LoadItemFromDB(Field* fields)
{
uint8 slotId = fields[13].GetUInt8();
uint32 itemGuid = fields[14].GetUInt32();
ObjectGuid::LowType itemGuid = fields[14].GetUInt64();
uint32 itemEntry = fields[15].GetUInt32();
if (slotId >= GUILD_BANK_MAX_SLOTS)
{
TC_LOG_ERROR("guild", "Invalid slot for item (GUID: %u, id: %u) in guild bank, skipped.", itemGuid, itemEntry);
TC_LOG_ERROR("guild", "Invalid slot for item (GUID: " UI64FMTD ", id: %u) in guild bank, skipped.", itemGuid, itemEntry);
return false;
}
ItemTemplate const* proto = sObjectMgr->GetItemTemplate(itemEntry);
if (!proto)
{
TC_LOG_ERROR("guild", "Unknown item (GUID: %u, id: %u) in guild bank, skipped.", itemGuid, itemEntry);
TC_LOG_ERROR("guild", "Unknown item (GUID: " UI64FMTD ", id: %u) in guild bank, skipped.", itemGuid, itemEntry);
return false;
}
Item* pItem = NewItemOrBag(proto);
if (!pItem->LoadFromDB(itemGuid, ObjectGuid::Empty, fields, itemEntry))
{
TC_LOG_ERROR("guild", "Item (GUID %u, id: %u) not found in item_instance, deleting from guild bank!", itemGuid, itemEntry);
TC_LOG_ERROR("guild", "Item (GUID " UI64FMTD ", id: %u) not found in item_instance, deleting from guild bank!", itemGuid, itemEntry);
PreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_DEL_NONEXISTENT_GUILD_BANK_ITEM);
stmt->setUInt32(0, m_guildId);
stmt->setUInt64(0, m_guildId);
stmt->setUInt8 (1, m_tabId);
stmt->setUInt8 (2, slotId);
CharacterDatabase.Execute(stmt);
@@ -557,7 +557,7 @@ void Guild::BankTab::SetInfo(std::string const& name, std::string const& icon)
PreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_UPD_GUILD_BANK_TAB_INFO);
stmt->setString(0, m_name);
stmt->setString(1, m_icon);
stmt->setUInt32(2, m_guildId);
stmt->setUInt64(2, m_guildId);
stmt->setUInt8 (3, m_tabId);
CharacterDatabase.Execute(stmt);
}
@@ -572,7 +572,7 @@ void Guild::BankTab::SetText(std::string const& text)
PreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_UPD_GUILD_BANK_TAB_TEXT);
stmt->setString(0, m_text);
stmt->setUInt32(1, m_guildId);
stmt->setUInt64(1, m_guildId);
stmt->setUInt8 (2, m_tabId);
CharacterDatabase.Execute(stmt);
}
@@ -587,7 +587,7 @@ bool Guild::BankTab::SetItem(SQLTransaction& trans, uint8 slotId, Item* item)
m_items[slotId] = item;
PreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_DEL_GUILD_BANK_ITEM);
stmt->setUInt32(0, m_guildId);
stmt->setUInt64(0, m_guildId);
stmt->setUInt8 (1, m_tabId);
stmt->setUInt8 (2, slotId);
CharacterDatabase.ExecuteOrAppend(trans, stmt);
@@ -595,10 +595,10 @@ bool Guild::BankTab::SetItem(SQLTransaction& trans, uint8 slotId, Item* item)
if (item)
{
stmt = CharacterDatabase.GetPreparedStatement(CHAR_INS_GUILD_BANK_ITEM);
stmt->setUInt32(0, m_guildId);
stmt->setUInt64(0, m_guildId);
stmt->setUInt8 (1, m_tabId);
stmt->setUInt8 (2, slotId);
stmt->setUInt32(3, item->GetGUID().GetCounter());
stmt->setUInt64(3, item->GetGUID().GetCounter());
CharacterDatabase.ExecuteOrAppend(trans, stmt);
item->SetGuidValue(ITEM_FIELD_CONTAINED, ObjectGuid::Empty);
@@ -659,7 +659,7 @@ void Guild::Member::SetPublicNote(std::string const& publicNote)
PreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_UPD_GUILD_MEMBER_PNOTE);
stmt->setString(0, publicNote);
stmt->setUInt32(1, m_guid.GetCounter());
stmt->setUInt64(1, m_guid.GetCounter());
CharacterDatabase.Execute(stmt);
}
@@ -672,7 +672,7 @@ void Guild::Member::SetOfficerNote(std::string const& officerNote)
PreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_UPD_GUILD_MEMBER_OFFNOTE);
stmt->setString(0, officerNote);
stmt->setUInt32(1, m_guid.GetCounter());
stmt->setUInt64(1, m_guid.GetCounter());
CharacterDatabase.Execute(stmt);
}
@@ -686,15 +686,15 @@ void Guild::Member::ChangeRank(uint8 newRank)
PreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_UPD_GUILD_MEMBER_RANK);
stmt->setUInt8 (0, newRank);
stmt->setUInt32(1, m_guid.GetCounter());
stmt->setUInt64(1, m_guid.GetCounter());
CharacterDatabase.Execute(stmt);
}
void Guild::Member::SaveToDB(SQLTransaction& trans) const
{
PreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_INS_GUILD_MEMBER);
stmt->setUInt32(0, m_guildId);
stmt->setUInt32(1, m_guid.GetCounter());
stmt->setUInt64(0, m_guildId);
stmt->setUInt64(1, m_guid.GetCounter());
stmt->setUInt8 (2, m_rankId);
stmt->setString(3, m_publicNote);
stmt->setString(4, m_officerNote);
@@ -761,7 +761,7 @@ void Guild::Member::UpdateBankWithdrawValue(SQLTransaction& trans, uint8 tabId,
m_bankWithdraw[tabId] += amount;
PreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_INS_GUILD_MEMBER_WITHDRAW);
stmt->setUInt32(0, m_guid.GetCounter());
stmt->setUInt64(0, m_guid.GetCounter());
for (uint8 i = 0; i <= GUILD_BANK_MAX_TABS;)
{
uint32 withdraw = m_bankWithdraw[i++];
@@ -819,7 +819,7 @@ void EmblemInfo::WritePacket(WorldPacket& data) const
data << uint32(m_backgroundColor);
}
void EmblemInfo::SaveToDB(uint32 guildId) const
void EmblemInfo::SaveToDB(ObjectGuid::LowType guildId) const
{
PreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_UPD_GUILD_EMBLEM_INFO);
stmt->setUInt32(0, m_style);
@@ -827,7 +827,7 @@ void EmblemInfo::SaveToDB(uint32 guildId) const
stmt->setUInt32(2, m_borderStyle);
stmt->setUInt32(3, m_borderColor);
stmt->setUInt32(4, m_backgroundColor);
stmt->setUInt32(5, guildId);
stmt->setUInt64(5, guildId);
CharacterDatabase.Execute(stmt);
}
@@ -1158,7 +1158,7 @@ InventoryResult Guild::BankMoveItemData::CanStore(Item* pItem, bool swap)
// Guild
Guild::Guild():
m_id(0),
m_id(UI64LIT(0)),
m_leaderGuid(),
m_createdDate(0),
m_accountsNumber(0),
@@ -1226,14 +1226,14 @@ bool Guild::Create(Player* pLeader, std::string const& name)
SQLTransaction trans = CharacterDatabase.BeginTransaction();
PreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_DEL_GUILD_MEMBERS);
stmt->setUInt32(0, m_id);
stmt->setUInt64(0, m_id);
trans->Append(stmt);
uint8 index = 0;
stmt = CharacterDatabase.GetPreparedStatement(CHAR_INS_GUILD);
stmt->setUInt32( index, m_id);
stmt->setUInt64( index, m_id);
stmt->setString(++index, name);
stmt->setUInt32(++index, m_leaderGuid.GetCounter());
stmt->setUInt64(++index, m_leaderGuid.GetCounter());
stmt->setString(++index, m_info);
stmt->setString(++index, m_motd);
stmt->setUInt64(++index, uint32(m_createdDate));
@@ -1275,34 +1275,34 @@ void Guild::Disband()
SQLTransaction trans = CharacterDatabase.BeginTransaction();
PreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_DEL_GUILD);
stmt->setUInt32(0, m_id);
stmt->setUInt64(0, m_id);
trans->Append(stmt);
stmt = CharacterDatabase.GetPreparedStatement(CHAR_DEL_GUILD_RANKS);
stmt->setUInt32(0, m_id);
stmt->setUInt64(0, m_id);
trans->Append(stmt);
stmt = CharacterDatabase.GetPreparedStatement(CHAR_DEL_GUILD_BANK_TABS);
stmt->setUInt32(0, m_id);
stmt->setUInt64(0, m_id);
trans->Append(stmt);
// Free bank tab used memory and delete items stored in them
_DeleteBankItems(trans, true);
stmt = CharacterDatabase.GetPreparedStatement(CHAR_DEL_GUILD_BANK_ITEMS);
stmt->setUInt32(0, m_id);
stmt->setUInt64(0, m_id);
trans->Append(stmt);
stmt = CharacterDatabase.GetPreparedStatement(CHAR_DEL_GUILD_BANK_RIGHTS);
stmt->setUInt32(0, m_id);
stmt->setUInt64(0, m_id);
trans->Append(stmt);
stmt = CharacterDatabase.GetPreparedStatement(CHAR_DEL_GUILD_BANK_EVENTLOGS);
stmt->setUInt32(0, m_id);
stmt->setUInt64(0, m_id);
trans->Append(stmt);
stmt = CharacterDatabase.GetPreparedStatement(CHAR_DEL_GUILD_EVENTLOGS);
stmt->setUInt32(0, m_id);
stmt->setUInt64(0, m_id);
trans->Append(stmt);
CharacterDatabase.CommitTransaction(trans);
@@ -1320,7 +1320,7 @@ void Guild::SaveToDB()
stmt->setUInt32(0, GetLevel());
stmt->setUInt64(1, GetExperience());
stmt->setUInt64(2, GetTodayExperience());
stmt->setUInt32(3, GetId());
stmt->setUInt64(3, GetId());
trans->Append(stmt);
m_achievementMgr.SaveToDB(trans);
@@ -1369,7 +1369,7 @@ bool Guild::SetName(std::string const& name)
m_name = name;
PreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_UPD_GUILD_NAME);
stmt->setString(0, m_name);
stmt->setUInt32(1, GetId());
stmt->setUInt64(1, GetId());
CharacterDatabase.Execute(stmt);
ObjectGuid guid = GetGUID();
@@ -1603,7 +1603,7 @@ void Guild::HandleSetMOTD(WorldSession* session, std::string const& motd)
PreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_UPD_GUILD_MOTD);
stmt->setString(0, motd);
stmt->setUInt32(1, m_id);
stmt->setUInt64(1, m_id);
CharacterDatabase.Execute(stmt);
_BroadcastEvent(GE_MOTD, ObjectGuid::Empty, motd.c_str());
@@ -1624,7 +1624,7 @@ void Guild::HandleSetInfo(WorldSession* session, std::string const& info)
PreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_UPD_GUILD_INFO);
stmt->setString(0, info);
stmt->setUInt32(1, m_id);
stmt->setUInt64(1, m_id);
CharacterDatabase.Execute(stmt);
}
}
@@ -1814,7 +1814,7 @@ void Guild::HandleInviteMember(WorldSession* session, std::string const& name)
data << uint32(m_emblemInfo.GetColor());
ObjectGuid oldGuildGuid;
if (uint32 oldId = pInvitee->GetGuildId())
if (ObjectGuid::LowType oldId = pInvitee->GetGuildId())
oldGuildGuid = ObjectGuid(HIGHGUID_GUILD, oldId);
ObjectGuid newGuildGuid = GetGUID();
@@ -2052,12 +2052,12 @@ void Guild::HandleRemoveRank(WorldSession* session, uint8 rankId)
// Delete bank rights for rank
PreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_DEL_GUILD_BANK_RIGHTS_FOR_RANK);
stmt->setUInt32(0, m_id);
stmt->setUInt64(0, m_id);
stmt->setUInt8(1, rankId);
CharacterDatabase.Execute(stmt);
// Delete rank
stmt = CharacterDatabase.GetPreparedStatement(CHAR_DEL_GUILD_RANK);
stmt->setUInt32(0, m_id);
stmt->setUInt64(0, m_id);
stmt->setUInt8(1, rankId);
CharacterDatabase.Execute(stmt);
@@ -2388,9 +2388,9 @@ void Guild::SendLoginInfo(WorldSession* session)
// Loading methods
bool Guild::LoadFromDB(Field* fields)
{
m_id = fields[0].GetUInt32();
m_id = fields[0].GetUInt64();
m_name = fields[1].GetString();
m_leaderGuid = ObjectGuid(HIGHGUID_PLAYER, fields[2].GetUInt32());
m_leaderGuid = ObjectGuid(HIGHGUID_PLAYER, fields[2].GetUInt64());
m_emblemInfo.LoadFromDB(fields);
m_info = fields[8].GetString();
m_motd = fields[9].GetString();
@@ -2423,7 +2423,7 @@ void Guild::LoadRankFromDB(Field* fields)
bool Guild::LoadMemberFromDB(Field* fields)
{
uint32 lowguid = fields[1].GetUInt32();
ObjectGuid::LowType lowguid = fields[1].GetUInt64();
Member *member = new Member(m_id, ObjectGuid(HIGHGUID_PLAYER, lowguid), fields[2].GetUInt8());
if (!member->LoadFromDB(fields))
{
@@ -2453,8 +2453,8 @@ bool Guild::LoadEventLogFromDB(Field* fields)
fields[1].GetUInt32(), // guid
time_t(fields[6].GetUInt32()), // timestamp
GuildEventLogTypes(fields[2].GetUInt8()), // event type
fields[3].GetUInt32(), // player guid 1
fields[4].GetUInt32(), // player guid 2
fields[3].GetUInt64(), // player guid 1
fields[4].GetUInt64(), // player guid 2
fields[5].GetUInt8())); // rank
return true;
}
@@ -2492,8 +2492,8 @@ bool Guild::LoadBankEventLogFromDB(Field* fields)
time_t(fields[8].GetUInt32()), // timestamp
dbTabId, // tab id
eventType, // event type
fields[4].GetUInt32(), // player guid
fields[5].GetUInt32(), // item or money
fields[4].GetUInt64(), // player guid
fields[5].GetUInt64(), // item or money
fields[6].GetUInt16(), // itam stack count
fields[7].GetUInt8())); // dest tab id
}
@@ -2511,7 +2511,7 @@ void Guild::LoadGuildNewsLogFromDB(Field* fields)
fields[1].GetUInt32(), // guid
fields[6].GetUInt32(), // timestamp //64 bits?
GuildNews(fields[2].GetUInt8()), // type
ObjectGuid(HIGHGUID_PLAYER, fields[3].GetUInt32()), // player guid
ObjectGuid(HIGHGUID_PLAYER, fields[3].GetUInt64()), // player guid
fields[4].GetUInt32(), // Flags
fields[5].GetUInt32())); // value
}
@@ -2777,7 +2777,6 @@ bool Guild::AddMember(ObjectGuid guid, uint8 rankId)
void Guild::DeleteMember(ObjectGuid guid, bool isDisbanding, bool isKicked, bool canDeleteGuild)
{
uint32 lowguid = guid.GetCounter();
Player* player = ObjectAccessor::FindConnectedPlayer(guid);
// Guild master can be deleted when loading guild and guid doesn't exist in characters table
@@ -2835,7 +2834,7 @@ void Guild::DeleteMember(ObjectGuid guid, bool isDisbanding, bool isKicked, bool
player->RemoveSpell(entry->SpellId, false, false);
}
_DeleteMemberFromDB(lowguid);
_DeleteMemberFromDB(guid.GetCounter());
if (!isDisbanding)
_UpdateAccountsNumber();
}
@@ -2912,12 +2911,12 @@ void Guild::_CreateNewBankTab()
SQLTransaction trans = CharacterDatabase.BeginTransaction();
PreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_DEL_GUILD_BANK_TAB);
stmt->setUInt32(0, m_id);
stmt->setUInt64(0, m_id);
stmt->setUInt8 (1, tabId);
trans->Append(stmt);
stmt = CharacterDatabase.GetPreparedStatement(CHAR_INS_GUILD_BANK_TAB);
stmt->setUInt32(0, m_id);
stmt->setUInt64(0, m_id);
stmt->setUInt8 (1, tabId);
trans->Append(stmt);
@@ -2931,11 +2930,11 @@ void Guild::_CreateNewBankTab()
void Guild::_CreateDefaultGuildRanks(LocaleConstant loc)
{
PreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_DEL_GUILD_RANKS);
stmt->setUInt32(0, m_id);
stmt->setUInt64(0, m_id);
CharacterDatabase.Execute(stmt);
stmt = CharacterDatabase.GetPreparedStatement(CHAR_DEL_GUILD_BANK_RIGHTS);
stmt->setUInt32(0, m_id);
stmt->setUInt64(0, m_id);
CharacterDatabase.Execute(stmt);
_CreateRank(sObjectMgr->GetTrinityString(LANG_GUILD_MASTER, loc), GR_RIGHT_ALL);
@@ -3012,7 +3011,7 @@ bool Guild::_ModifyBankMoney(SQLTransaction& trans, uint64 amount, bool add)
PreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_UPD_GUILD_BANK_MONEY);
stmt->setUInt64(0, m_bankMoney);
stmt->setUInt32(1, m_id);
stmt->setUInt64(1, m_id);
trans->Append(stmt);
return true;
}
@@ -3026,8 +3025,8 @@ void Guild::_SetLeaderGUID(Member* pLeader)
pLeader->ChangeRank(GR_GUILDMASTER);
PreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_UPD_GUILD_LEADER);
stmt->setUInt32(0, m_leaderGuid.GetCounter());
stmt->setUInt32(1, m_id);
stmt->setUInt64(0, m_leaderGuid.GetCounter());
stmt->setUInt64(1, m_id);
CharacterDatabase.Execute(stmt);
}
@@ -3141,7 +3140,7 @@ inline bool Guild::_MemberHasTabRights(ObjectGuid guid, uint8 tabId, uint32 righ
}
// Add new event log record
inline void Guild::_LogEvent(GuildEventLogTypes eventType, uint32 playerGuid1, uint32 playerGuid2, uint8 newRank)
inline void Guild::_LogEvent(GuildEventLogTypes eventType, ObjectGuid::LowType playerGuid1, ObjectGuid::LowType playerGuid2, uint8 newRank)
{
SQLTransaction trans = CharacterDatabase.BeginTransaction();
m_eventLog->AddEvent(trans, new EventLogEntry(m_id, m_eventLog->GetNextGUID(), eventType, playerGuid1, playerGuid2, newRank));
@@ -3151,7 +3150,7 @@ inline void Guild::_LogEvent(GuildEventLogTypes eventType, uint32 playerGuid1, u
}
// Add new bank event log record
void Guild::_LogBankEvent(SQLTransaction& trans, GuildBankEventLogTypes eventType, uint8 tabId, uint32 lowguid, uint32 itemOrMoney, uint16 itemStackCount, uint8 destTabId)
void Guild::_LogBankEvent(SQLTransaction& trans, GuildBankEventLogTypes eventType, uint8 tabId, ObjectGuid::LowType lowguid, uint64 itemOrMoney, uint16 itemStackCount, uint8 destTabId)
{
if (tabId > GUILD_BANK_MAX_TABS)
return;
src/server/game/Guilds/Guild.h
+27 -27
View File
@@ -283,7 +283,7 @@ public:
EmblemInfo() : m_style(0), m_color(0), m_borderStyle(0), m_borderColor(0), m_backgroundColor(0) { }
void LoadFromDB(Field* fields);
void SaveToDB(uint32 guildId) const;
void SaveToDB(ObjectGuid::LowType guildId) const;
void ReadPacket(WorldPacket& recv);
void WritePacket(WorldPacket& data) const;
@@ -340,7 +340,7 @@ private:
class Member
{
public:
Member(uint32 guildId, ObjectGuid guid, uint8 rankId) :
Member(ObjectGuid::LowType guildId, ObjectGuid guid, uint8 rankId) :
m_guildId(guildId),
m_guid(guid),
m_zoneId(0),
@@ -416,7 +416,7 @@ private:
inline Player* FindConnectedPlayer() const { return ObjectAccessor::FindConnectedPlayer(m_guid); }
private:
uint32 m_guildId;
ObjectGuid::LowType m_guildId;
// Fields from characters table
ObjectGuid m_guid;
std::string m_name;
@@ -445,8 +445,8 @@ private:
class LogEntry
{
public:
LogEntry(uint32 guildId, uint32 guid) : m_guildId(guildId), m_guid(guid), m_timestamp(::time(NULL)) { }
LogEntry(uint32 guildId, uint32 guid, time_t timestamp) : m_guildId(guildId), m_guid(guid), m_timestamp(timestamp) { }
LogEntry(ObjectGuid::LowType guildId, uint32 guid) : m_guildId(guildId), m_guid(guid), m_timestamp(::time(NULL)) { }
LogEntry(ObjectGuid::LowType guildId, uint32 guid, time_t timestamp) : m_guildId(guildId), m_guid(guid), m_timestamp(timestamp) { }
virtual ~LogEntry() { }
uint32 GetGUID() const { return m_guid; }
@@ -456,7 +456,7 @@ private:
virtual void WritePacket(WorldPacket& data, ByteBuffer& content) const = 0;
protected:
uint32 m_guildId;
ObjectGuid::LowType m_guildId;
uint32 m_guid;
uint64 m_timestamp;
};
@@ -465,10 +465,10 @@ private:
class EventLogEntry : public LogEntry
{
public:
EventLogEntry(uint32 guildId, uint32 guid, GuildEventLogTypes eventType, uint32 playerGuid1, uint32 playerGuid2, uint8 newRank) :
EventLogEntry(ObjectGuid::LowType guildId, uint32 guid, GuildEventLogTypes eventType, ObjectGuid::LowType playerGuid1, ObjectGuid::LowType playerGuid2, uint8 newRank) :
LogEntry(guildId, guid), m_eventType(eventType), m_playerGuid1(playerGuid1), m_playerGuid2(playerGuid2), m_newRank(newRank) { }
EventLogEntry(uint32 guildId, uint32 guid, time_t timestamp, GuildEventLogTypes eventType, uint32 playerGuid1, uint32 playerGuid2, uint8 newRank) :
EventLogEntry(ObjectGuid::LowType guildId, uint32 guid, time_t timestamp, GuildEventLogTypes eventType, ObjectGuid::LowType playerGuid1, ObjectGuid::LowType playerGuid2, uint8 newRank) :
LogEntry(guildId, guid, timestamp), m_eventType(eventType), m_playerGuid1(playerGuid1), m_playerGuid2(playerGuid2), m_newRank(newRank) { }
~EventLogEntry() { }
@@ -478,8 +478,8 @@ private:
private:
GuildEventLogTypes m_eventType;
uint32 m_playerGuid1;
uint32 m_playerGuid2;
ObjectGuid::LowType m_playerGuid1;
ObjectGuid::LowType m_playerGuid2;
uint8 m_newRank;
};
@@ -501,11 +501,11 @@ private:
return IsMoneyEvent(m_eventType);
}
BankEventLogEntry(uint32 guildId, uint32 guid, GuildBankEventLogTypes eventType, uint8 tabId, uint32 playerGuid, uint64 itemOrMoney, uint16 itemStackCount, uint8 destTabId) :
BankEventLogEntry(ObjectGuid::LowType guildId, uint32 guid, GuildBankEventLogTypes eventType, uint8 tabId, ObjectGuid::LowType playerGuid, uint64 itemOrMoney, uint16 itemStackCount, uint8 destTabId) :
LogEntry(guildId, guid), m_eventType(eventType), m_bankTabId(tabId), m_playerGuid(playerGuid),
m_itemOrMoney(itemOrMoney), m_itemStackCount(itemStackCount), m_destTabId(destTabId) { }
BankEventLogEntry(uint32 guildId, uint32 guid, time_t timestamp, uint8 tabId, GuildBankEventLogTypes eventType, uint32 playerGuid, uint64 itemOrMoney, uint16 itemStackCount, uint8 destTabId) :
BankEventLogEntry(ObjectGuid::LowType guildId, uint32 guid, time_t timestamp, uint8 tabId, GuildBankEventLogTypes eventType, ObjectGuid::LowType playerGuid, uint64 itemOrMoney, uint16 itemStackCount, uint8 destTabId) :
LogEntry(guildId, guid, timestamp), m_eventType(eventType), m_bankTabId(tabId), m_playerGuid(playerGuid),
m_itemOrMoney(itemOrMoney), m_itemStackCount(itemStackCount), m_destTabId(destTabId) { }
@@ -517,7 +517,7 @@ private:
private:
GuildBankEventLogTypes m_eventType;
uint8 m_bankTabId;
uint32 m_playerGuid;
ObjectGuid::LowType m_playerGuid;
uint64 m_itemOrMoney;
uint16 m_itemStackCount;
uint8 m_destTabId;
@@ -527,10 +527,10 @@ private:
class NewsLogEntry : public LogEntry
{
public:
NewsLogEntry(uint32 guildId, uint32 guid, GuildNews type, ObjectGuid playerGuid, uint32 flags, uint32 value) :
NewsLogEntry(ObjectGuid::LowType guildId, uint32 guid, GuildNews type, ObjectGuid playerGuid, uint32 flags, uint32 value) :
LogEntry(guildId, guid), m_type(type), m_playerGuid(playerGuid), m_flags(flags), m_value(value) { }
NewsLogEntry(uint32 guildId, uint32 guid, time_t timestamp, GuildNews type, ObjectGuid playerGuid, uint32 flags, uint32 value) :
NewsLogEntry(ObjectGuid::LowType guildId, uint32 guid, time_t timestamp, GuildNews type, ObjectGuid playerGuid, uint32 flags, uint32 value) :
LogEntry(guildId, guid, timestamp), m_type(type), m_playerGuid(playerGuid), m_flags(flags), m_value(value) { }
~NewsLogEntry() { }
@@ -588,9 +588,9 @@ private:
class RankInfo
{
public:
RankInfo(): m_guildId(0), m_rankId(GUILD_RANK_NONE), m_rights(GR_RIGHT_EMPTY), m_bankMoneyPerDay(0) { }
RankInfo(uint32 guildId) : m_guildId(guildId), m_rankId(GUILD_RANK_NONE), m_rights(GR_RIGHT_EMPTY), m_bankMoneyPerDay(0) { }
RankInfo(uint32 guildId, uint8 rankId, std::string const& name, uint32 rights, uint32 money) :
RankInfo(): m_guildId(UI64LIT(0)), m_rankId(GUILD_RANK_NONE), m_rights(GR_RIGHT_EMPTY), m_bankMoneyPerDay(0) { }
RankInfo(ObjectGuid::LowType guildId) : m_guildId(guildId), m_rankId(GUILD_RANK_NONE), m_rights(GR_RIGHT_EMPTY), m_bankMoneyPerDay(0) { }
RankInfo(ObjectGuid::LowType guildId, uint8 rankId, std::string const& name, uint32 rights, uint32 money) :
m_guildId(guildId), m_rankId(rankId), m_name(name), m_rights(rights),
m_bankMoneyPerDay(rankId != GR_GUILDMASTER ? money : GUILD_WITHDRAW_MONEY_UNLIMITED) { }
@@ -623,7 +623,7 @@ private:
void CreateMissingTabsIfNeeded(uint8 ranks, SQLTransaction& trans, bool logOnCreate = false);
private:
uint32 m_guildId;
ObjectGuid::LowType m_guildId;
uint8 m_rankId;
std::string m_name;
uint32 m_rights;
@@ -634,7 +634,7 @@ private:
class BankTab
{
public:
BankTab(uint32 guildId, uint8 tabId) : m_guildId(guildId), m_tabId(tabId)
BankTab(ObjectGuid::LowType guildId, uint8 tabId) : m_guildId(guildId), m_tabId(tabId)
{
memset(m_items, 0, GUILD_BANK_MAX_SLOTS * sizeof(Item*));
}
@@ -663,7 +663,7 @@ private:
bool SetItem(SQLTransaction& trans, uint8 slotId, Item* item);
private:
uint32 m_guildId;
ObjectGuid::LowType m_guildId;
uint8 m_tabId;
Item* m_items[GUILD_BANK_MAX_SLOTS];
@@ -776,7 +776,7 @@ public:
void SaveToDB();
// Getters
uint32 GetId() const { return m_id; }
ObjectGuid::LowType GetId() const { return m_id; }
ObjectGuid GetGUID() const { return ObjectGuid(HIGHGUID_GUILD, m_id); }
ObjectGuid GetLeaderGUID() const { return m_leaderGuid; }
std::string const& GetName() const { return m_name; }
@@ -894,7 +894,7 @@ public:
void UpdateAchievementCriteria(AchievementCriteriaTypes type, uint64 miscValue1, uint64 miscValue2, uint64 miscValue3, Unit* unit, Player* player);
protected:
uint32 m_id;
ObjectGuid::LowType m_id;
std::string m_name;
ObjectGuid m_leaderGuid;
std::string m_motd;
@@ -958,10 +958,10 @@ private:
return NULL;
}
inline void _DeleteMemberFromDB(uint32 lowguid) const
inline void _DeleteMemberFromDB(ObjectGuid::LowType lowguid) const
{
PreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_DEL_GUILD_MEMBER);
stmt->setUInt32(0, lowguid);
stmt->setUInt64(0, lowguid);
CharacterDatabase.Execute(stmt);
}
@@ -993,8 +993,8 @@ private:
void _UpdateMemberWithdrawSlots(SQLTransaction& trans, ObjectGuid guid, uint8 tabId);
bool _MemberHasTabRights(ObjectGuid guid, uint8 tabId, uint32 rights) const;
void _LogEvent(GuildEventLogTypes eventType, uint32 playerGuid1, uint32 playerGuid2 = 0, uint8 newRank = 0);
void _LogBankEvent(SQLTransaction& trans, GuildBankEventLogTypes eventType, uint8 tabId, uint32 playerGuid, uint32 itemOrMoney, uint16 itemStackCount = 0, uint8 destTabId = 0);
void _LogEvent(GuildEventLogTypes eventType, ObjectGuid::LowType playerGuid1, ObjectGuid::LowType playerGuid2 = UI64LIT(0), uint8 newRank = 0);
void _LogBankEvent(SQLTransaction& trans, GuildBankEventLogTypes eventType, uint8 tabId, ObjectGuid::LowType playerGuid, uint64 itemOrMoney, uint16 itemStackCount = 0, uint8 destTabId = 0);
Item* _GetItem(uint8 tabId, uint8 slotId) const;
void _RemoveItem(SQLTransaction& trans, uint8 tabId, uint8 slotId);
src/server/game/Guilds/GuildFinderMgr.cpp
+13 -13
View File
@@ -54,7 +54,7 @@ void GuildFinderMgr::LoadGuildSettings()
do
{
Field* fields = result->Fetch();
ObjectGuid guildId(HIGHGUID_GUILD, fields[0].GetUInt32());
ObjectGuid guildId(HIGHGUID_GUILD, fields[0].GetUInt64());
uint8 availability = fields[1].GetUInt8();
uint8 classRoles = fields[2].GetUInt8();
uint8 interests = fields[3].GetUInt8();
@@ -94,8 +94,8 @@ void GuildFinderMgr::LoadMembershipRequests()
do
{
Field* fields = result->Fetch();
ObjectGuid guildId(HIGHGUID_GUILD, fields[0].GetUInt32());
ObjectGuid playerId(HIGHGUID_PLAYER, fields[1].GetUInt32());
ObjectGuid guildId(HIGHGUID_GUILD, fields[0].GetUInt64());
ObjectGuid playerId(HIGHGUID_PLAYER, fields[1].GetUInt64());
uint8 availability = fields[2].GetUInt8();
uint8 classRoles = fields[3].GetUInt8();
uint8 interests = fields[4].GetUInt8();
@@ -118,8 +118,8 @@ void GuildFinderMgr::AddMembershipRequest(ObjectGuid const& guildGuid, Membershi
SQLTransaction trans = CharacterDatabase.BeginTransaction();
PreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_REP_GUILD_FINDER_APPLICANT);
stmt->setUInt32(0, request.GetGuildGuid().GetCounter());
stmt->setUInt32(1, request.GetPlayerGUID().GetCounter());
stmt->setUInt64(0, request.GetGuildGuid().GetCounter());
stmt->setUInt64(1, request.GetPlayerGUID().GetCounter());
stmt->setUInt8(2, request.GetAvailability());
stmt->setUInt8(3, request.GetClassRoles());
stmt->setUInt8(4, request.GetInterests());
@@ -151,8 +151,8 @@ void GuildFinderMgr::RemoveAllMembershipRequestsFromPlayer(ObjectGuid const& pla
SQLTransaction trans = CharacterDatabase.BeginTransaction();
PreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_DEL_GUILD_FINDER_APPLICANT);
stmt->setUInt32(0, itr2->GetGuildGuid().GetCounter());
stmt->setUInt32(1, itr2->GetPlayerGUID().GetCounter());
stmt->setUInt64(0, itr2->GetGuildGuid().GetCounter());
stmt->setUInt64(1, itr2->GetPlayerGUID().GetCounter());
trans->Append(stmt);
CharacterDatabase.CommitTransaction(trans);
@@ -177,8 +177,8 @@ void GuildFinderMgr::RemoveMembershipRequest(ObjectGuid const& playerId, ObjectG
SQLTransaction trans = CharacterDatabase.BeginTransaction();
PreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_DEL_GUILD_FINDER_APPLICANT);
stmt->setUInt32(0, itr->GetGuildGuid().GetCounter());
stmt->setUInt32(1, itr->GetPlayerGUID().GetCounter());
stmt->setUInt64(0, itr->GetGuildGuid().GetCounter());
stmt->setUInt64(1, itr->GetPlayerGUID().GetCounter());
trans->Append(stmt);
CharacterDatabase.CommitTransaction(trans);
@@ -271,7 +271,7 @@ void GuildFinderMgr::SetGuildSettings(ObjectGuid const& guildGuid, LFGuildSettin
SQLTransaction trans = CharacterDatabase.BeginTransaction();
PreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_REP_GUILD_FINDER_GUILD_SETTINGS);
stmt->setUInt32(0, settings.GetGUID().GetCounter());
stmt->setUInt64(0, settings.GetGUID().GetCounter());
stmt->setUInt8(1, settings.GetAvailability());
stmt->setUInt8(2, settings.GetClassRoles());
stmt->setUInt8(3, settings.GetInterests());
@@ -291,12 +291,12 @@ void GuildFinderMgr::DeleteGuild(ObjectGuid const& guildId)
SQLTransaction trans = CharacterDatabase.BeginTransaction();
PreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_DEL_GUILD_FINDER_APPLICANT);
stmt->setUInt32(0, itr->GetGuildGuid().GetCounter());
stmt->setUInt32(1, itr->GetPlayerGUID().GetCounter());
stmt->setUInt64(0, itr->GetGuildGuid().GetCounter());
stmt->setUInt64(1, itr->GetPlayerGUID().GetCounter());
trans->Append(stmt);
stmt = CharacterDatabase.GetPreparedStatement(CHAR_DEL_GUILD_FINDER_GUILD_SETTINGS);
stmt->setUInt32(0, itr->GetGuildGuid().GetCounter());
stmt->setUInt64(0, itr->GetGuildGuid().GetCounter());
trans->Append(stmt);
CharacterDatabase.CommitTransaction(trans);
src/server/game/Guilds/GuildMgr.cpp
+13 -13
View File
@@ -32,7 +32,7 @@ void GuildMgr::AddGuild(Guild* guild)
GuildStore[guild->GetId()] = guild;
}
void GuildMgr::RemoveGuild(uint32 guildId)
void GuildMgr::RemoveGuild(ObjectGuid::LowType guildId)
{
GuildStore.erase(guildId);
}
@@ -54,7 +54,7 @@ uint32 GuildMgr::GenerateGuildId()
}
// Guild collection
Guild* GuildMgr::GetGuildById(uint32 guildId) const
Guild* GuildMgr::GetGuildById(ObjectGuid::LowType guildId) const
{
GuildContainer::const_iterator itr = GuildStore.find(guildId);
if (itr != GuildStore.end())
@@ -105,7 +105,7 @@ Guild* GuildMgr::GetGuildByLeader(ObjectGuid guid) const
return NULL;
}
uint32 GuildMgr::GetXPForGuildLevel(uint8 level) const
uint64 GuildMgr::GetXPForGuildLevel(uint8 level) const
{
if (level < GuildXPperLevel.size())
return GuildXPperLevel[level];
@@ -175,7 +175,7 @@ void GuildMgr::LoadGuilds()
do
{
Field* fields = result->Fetch();
uint32 guildId = fields[0].GetUInt32();
uint32 guildId = fields[0].GetUInt64();
if (Guild* guild = GetGuildById(guildId))
guild->LoadRankFromDB(fields);
@@ -214,7 +214,7 @@ void GuildMgr::LoadGuilds()
do
{
Field* fields = result->Fetch();
uint32 guildId = fields[0].GetUInt32();
uint32 guildId = fields[0].GetUInt64();
if (Guild* guild = GetGuildById(guildId))
guild->LoadMemberFromDB(fields);
@@ -248,7 +248,7 @@ void GuildMgr::LoadGuilds()
do
{
Field* fields = result->Fetch();
uint32 guildId = fields[0].GetUInt32();
uint32 guildId = fields[0].GetUInt64();
if (Guild* guild = GetGuildById(guildId))
guild->LoadBankRightFromDB(fields);
@@ -281,7 +281,7 @@ void GuildMgr::LoadGuilds()
do
{
Field* fields = result->Fetch();
uint32 guildId = fields[0].GetUInt32();
uint32 guildId = fields[0].GetUInt64();
if (Guild* guild = GetGuildById(guildId))
guild->LoadEventLogFromDB(fields);
@@ -315,7 +315,7 @@ void GuildMgr::LoadGuilds()
do
{
Field* fields = result->Fetch();
uint32 guildId = fields[0].GetUInt32();
uint32 guildId = fields[0].GetUInt64();
if (Guild* guild = GetGuildById(guildId))
guild->LoadBankEventLogFromDB(fields);
@@ -346,7 +346,7 @@ void GuildMgr::LoadGuilds()
do
{
Field* fields = result->Fetch();
uint32 guildId = fields[0].GetUInt32();
uint32 guildId = fields[0].GetUInt64();
if (Guild* guild = GetGuildById(guildId))
guild->LoadGuildNewsLogFromDB(fields);
@@ -381,7 +381,7 @@ void GuildMgr::LoadGuilds()
do
{
Field* fields = result->Fetch();
uint32 guildId = fields[0].GetUInt32();
uint32 guildId = fields[0].GetUInt64();
if (Guild* guild = GetGuildById(guildId))
guild->LoadBankTabFromDB(fields);
@@ -417,7 +417,7 @@ void GuildMgr::LoadGuilds()
do
{
Field* fields = result->Fetch();
uint32 guildId = fields[11].GetUInt32();
uint32 guildId = fields[11].GetUInt64();
if (Guild* guild = GetGuildById(guildId))
guild->LoadBankItemFromDB(fields);
@@ -437,10 +437,10 @@ void GuildMgr::LoadGuilds()
for (GuildContainer::const_iterator itr = GuildStore.begin(); itr != GuildStore.end(); ++itr)
{
PreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_SEL_GUILD_ACHIEVEMENT);
stmt->setUInt32(0, itr->first);
stmt->setUInt64(0, itr->first);
achievementResult = CharacterDatabase.Query(stmt);
stmt = CharacterDatabase.GetPreparedStatement(CHAR_SEL_GUILD_ACHIEVEMENT_CRITERIA);
stmt->setUInt32(0, itr->first);
stmt->setUInt64(0, itr->first);
criteriaResult = CharacterDatabase.Query(stmt);
itr->second->GetAchievementMgr().LoadFromDB(achievementResult, criteriaResult);
src/server/game/Guilds/GuildMgr.h
+7 -7
View File
@@ -34,7 +34,7 @@ public:
}
Guild* GetGuildByLeader(ObjectGuid guid) const;
Guild* GetGuildById(uint32 guildId) const;
Guild* GetGuildById(ObjectGuid::LowType guildId) const;
Guild* GetGuildByGuid(ObjectGuid guid) const;
Guild* GetGuildByName(std::string const& guildName) const;
std::string GetGuildNameById(uint32 guildId) const;
@@ -44,22 +44,22 @@ public:
void LoadGuilds();
void AddGuild(Guild* guild);
void RemoveGuild(uint32 guildId);
void RemoveGuild(ObjectGuid::LowType guildId);
void SaveGuilds();
void ResetReputationCaps();
uint32 GenerateGuildId();
void SetNextGuildId(uint32 Id) { NextGuildId = Id; }
ObjectGuid::LowType GenerateGuildId();
void SetNextGuildId(ObjectGuid::LowType Id) { NextGuildId = Id; }
uint32 GetXPForGuildLevel(uint8 level) const;
uint64 GetXPForGuildLevel(uint8 level) const;
std::vector<GuildReward> const& GetGuildRewards() const { return GuildRewards; }
void ResetTimes(bool week);
protected:
typedef std::unordered_map<uint32, Guild*> GuildContainer;
uint32 NextGuildId;
typedef std::unordered_map<ObjectGuid::LowType, Guild*> GuildContainer;
ObjectGuid::LowType NextGuildId;
GuildContainer GuildStore;
std::vector<uint64> GuildXPperLevel;
std::vector<GuildReward> GuildRewards;
src/server/game/Handlers/AuctionHouseHandler.cpp
+3 -3
View File
@@ -285,7 +285,7 @@ void WorldSession::HandleAuctionSellItem(WorldPacket& recvData)
AuctionEntry* AH = new AuctionEntry();
if (sWorld->getBoolConfig(CONFIG_ALLOW_TWO_SIDE_INTERACTION_AUCTION))
AH->auctioneer = 23442; ///@TODO - HARDCODED DB GUID, BAD BAD BAD
AH->auctioneer = UI64LIT(23442); ///@TODO - HARDCODED DB GUID, BAD BAD BAD
else
AH->auctioneer = auctioneer.GetCounter();
@@ -304,7 +304,7 @@ void WorldSession::HandleAuctionSellItem(WorldPacket& recvData)
AH->itemCount = item->GetCount();
AH->owner = _player->GetGUID().GetCounter();
AH->startbid = bid;
AH->bidder = 0;
AH->bidder = UI64LIT(0);
AH->bid = 0;
AH->buyout = buyout;
AH->expire_time = time(NULL) + auctionTime;
@@ -352,7 +352,7 @@ void WorldSession::HandleAuctionSellItem(WorldPacket& recvData)
AH->itemCount = newItem->GetCount();
AH->owner = _player->GetGUID().GetCounter();
AH->startbid = bid;
AH->bidder = 0;
AH->bidder = UI64LIT(0);
AH->bid = 0;
AH->buyout = buyout;
AH->expire_time = time(NULL) + auctionTime;
src/server/game/Handlers/CharacterHandler.cpp
+5 -5
View File
@@ -74,7 +74,7 @@ bool LoginQueryHolder::Initialize()
res &= SetPreparedQuery(PLAYER_LOGIN_QUERY_LOAD_FROM, stmt);
stmt = CharacterDatabase.GetPreparedStatement(CHAR_SEL_GROUP_MEMBER);
stmt->setUInt32(0, lowGuid);
stmt->setUInt64(0, lowGuid);
res &= SetPreparedQuery(PLAYER_LOGIN_QUERY_LOAD_GROUP, stmt);
stmt = CharacterDatabase.GetPreparedStatement(CHAR_SEL_CHARACTER_INSTANCE);
@@ -154,7 +154,7 @@ bool LoginQueryHolder::Initialize()
}
stmt = CharacterDatabase.GetPreparedStatement(CHAR_SEL_GUILD_MEMBER);
stmt->setUInt32(0, lowGuid);
stmt->setUInt64(0, lowGuid);
res &= SetPreparedQuery(PLAYER_LOGIN_QUERY_LOAD_GUILD, stmt);
stmt = CharacterDatabase.GetPreparedStatement(CHAR_SEL_CHARACTER_ARENAINFO);
@@ -922,7 +922,7 @@ void WorldSession::HandlePlayerLogin(LoginQueryHolder* holder)
if (PreparedQueryResult resultGuild = holder->GetPreparedResult(PLAYER_LOGIN_QUERY_LOAD_GUILD))
{
Field* fields = resultGuild->Fetch();
pCurrChar->SetInGuild(fields[0].GetUInt32());
pCurrChar->SetInGuild(fields[0].GetUInt64());
pCurrChar->SetRank(fields[1].GetUInt8());
if (Guild* guild = sGuildMgr->GetGuildById(pCurrChar->GetGuildId()))
pCurrChar->SetGuildLevel(guild->GetLevel());
@@ -1913,11 +1913,11 @@ void WorldSession::HandleCharFactionOrRaceChange(WorldPacket& recvData)
// Reset guild
stmt = CharacterDatabase.GetPreparedStatement(CHAR_SEL_GUILD_MEMBER);
stmt->setUInt32(0, lowGuid);
stmt->setUInt64(0, lowGuid);
PreparedQueryResult result = CharacterDatabase.Query(stmt);
if (result)
if (Guild* guild = sGuildMgr->GetGuildById((result->Fetch()[0]).GetUInt32()))
if (Guild* guild = sGuildMgr->GetGuildById((result->Fetch()[0]).GetUInt64()))
guild->DeleteMember(factionChangeInfo.Guid, false, false, true);
Player::LeaveAllArenaTeams(factionChangeInfo.Guid);
src/server/game/Maps/Map.h
+1 -1
View File
@@ -475,7 +475,7 @@ class Map : public GridRefManager<NGridType>
bool ContainsGameObjectModel(const GameObjectModel& model) const { return _dynamicTree.contains(model);}
bool getObjectHitPos(uint32 phasemask, float x1, float y1, float z1, float x2, float y2, float z2, float& rx, float &ry, float& rz, float modifyDist);
virtual uint32 GetOwnerGuildId(uint32 /*team*/ = TEAM_OTHER) const { return 0; }
virtual ObjectGuid::LowType GetOwnerGuildId(uint32 /*team*/ = TEAM_OTHER) const { return UI64LIT(0); }
/*
RESPAWN TIMES
*/
src/server/game/Scripting/ScriptMgr.cpp
+2 -2
View File
@@ -1364,12 +1364,12 @@ void ScriptMgr::OnGuildItemMove(Guild* guild, Player* player, Item* pItem, bool
FOREACH_SCRIPT(GuildScript)->OnItemMove(guild, player, pItem, isSrcBank, srcContainer, srcSlotId, isDestBank, destContainer, destSlotId);
}
void ScriptMgr::OnGuildEvent(Guild* guild, uint8 eventType, uint32 playerGuid1, uint32 playerGuid2, uint8 newRank)
void ScriptMgr::OnGuildEvent(Guild* guild, uint8 eventType, ObjectGuid::LowType playerGuid1, ObjectGuid::LowType playerGuid2, uint8 newRank)
{
FOREACH_SCRIPT(GuildScript)->OnEvent(guild, eventType, playerGuid1, playerGuid2, newRank);
}
void ScriptMgr::OnGuildBankEvent(Guild* guild, uint8 eventType, uint8 tabId, uint32 playerGuid, uint32 itemOrMoney, uint16 itemStackCount, uint8 destTabId)
void ScriptMgr::OnGuildBankEvent(Guild* guild, uint8 eventType, uint8 tabId, ObjectGuid::LowType playerGuid, uint64 itemOrMoney, uint16 itemStackCount, uint8 destTabId)
{
FOREACH_SCRIPT(GuildScript)->OnBankEvent(guild, eventType, tabId, playerGuid, itemOrMoney, itemStackCount, destTabId);
}
src/server/game/Scripting/ScriptMgr.h
+4 -4
View File
@@ -838,9 +838,9 @@ class GuildScript : public ScriptObject
virtual void OnItemMove(Guild* /*guild*/, Player* /*player*/, Item* /*pItem*/, bool /*isSrcBank*/, uint8 /*srcContainer*/, uint8 /*srcSlotId*/,
bool /*isDestBank*/, uint8 /*destContainer*/, uint8 /*destSlotId*/) { }
virtual void OnEvent(Guild* /*guild*/, uint8 /*eventType*/, uint32 /*playerGuid1*/, uint32 /*playerGuid2*/, uint8 /*newRank*/) { }
virtual void OnEvent(Guild* /*guild*/, uint8 /*eventType*/, ObjectGuid::LowType /*playerGuid1*/, ObjectGuid::LowType /*playerGuid2*/, uint8 /*newRank*/) { }
virtual void OnBankEvent(Guild* /*guild*/, uint8 /*eventType*/, uint8 /*tabId*/, uint32 /*playerGuid*/, uint32 /*itemOrMoney*/, uint16 /*itemStackCount*/, uint8 /*destTabId*/) { }
virtual void OnBankEvent(Guild* /*guild*/, uint8 /*eventType*/, uint8 /*tabId*/, ObjectGuid::LowType /*playerGuid*/, uint64 /*itemOrMoney*/, uint16 /*itemStackCount*/, uint8 /*destTabId*/) { }
};
class GroupScript : public ScriptObject
@@ -1100,8 +1100,8 @@ class ScriptMgr
void OnGuildMemberDepositMoney(Guild* guild, Player* player, uint64 &amount);
void OnGuildItemMove(Guild* guild, Player* player, Item* pItem, bool isSrcBank, uint8 srcContainer, uint8 srcSlotId,
bool isDestBank, uint8 destContainer, uint8 destSlotId);
void OnGuildEvent(Guild* guild, uint8 eventType, uint32 playerGuid1, uint32 playerGuid2, uint8 newRank);
void OnGuildBankEvent(Guild* guild, uint8 eventType, uint8 tabId, uint32 playerGuid, uint32 itemOrMoney, uint16 itemStackCount, uint8 destTabId);
void OnGuildEvent(Guild* guild, uint8 eventType, ObjectGuid::LowType playerGuid1, ObjectGuid::LowType playerGuid2, uint8 newRank);
void OnGuildBankEvent(Guild* guild, uint8 eventType, uint8 tabId, ObjectGuid::LowType playerGuid, uint64 itemOrMoney, uint16 itemStackCount, uint8 destTabId);
public: /* GroupScript */
src/server/scripts/Commands/cs_group.cpp
+1 -1
View File
@@ -292,7 +292,7 @@ public:
if (!groupTarget)
{
PreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_SEL_GROUP_MEMBER);
stmt->setUInt32(0, guidTarget.GetCounter());
stmt->setUInt64(0, guidTarget.GetCounter());
PreparedQueryResult resultGroup = CharacterDatabase.Query(stmt);
if (resultGroup)
groupTarget = sGroupMgr->GetGroupByDbStoreId((*resultGroup)[0].GetUInt32());
src/server/scripts/Commands/cs_list.cpp
+3 -3
View File
@@ -314,13 +314,13 @@ public:
do
{
Field* fields = result->Fetch();
uint32 itemGuid = fields[0].GetUInt32();
uint32 guildGuid = fields[1].GetUInt32();
ObjectGuid itemGuid(HIGHGUID_ITEM, fields[0].GetUInt64());
ObjectGuid guildGuid(HIGHGUID_GUILD, fields[1].GetUInt64());
std::string guildName = fields[2].GetString();
char const* itemPos = "[in guild bank]";
handler->PSendSysMessage(LANG_ITEMLIST_GUILD, itemGuid, guildName.c_str(), guildGuid, itemPos);
handler->PSendSysMessage(LANG_ITEMLIST_GUILD, itemGuid.ToString().c_str(), guildName.c_str(), guildGuid.ToString().c_str(), itemPos);
}
while (result->NextRow());
src/server/scripts/Commands/cs_misc.cpp
+5 -5
View File
@@ -1479,7 +1479,7 @@ public:
std::string zoneName = handler->GetTrinityString(LANG_UNKNOWN);
// Guild data print variables defined so that they exist, but are not necessarily used
uint32 guildId = 0;
ObjectGuid::LowType guildId = 0;
uint8 guildRankId = 0;
std::string guildName;
std::string guildRank;
@@ -1624,19 +1624,19 @@ public:
{
Field* fields = result4->Fetch();
xp = fields[0].GetUInt32(); // Used for "current xp" output and "%u XP Left" calculation
uint32 gguid = fields[1].GetUInt32(); // We check if have a guild for the person, so we might not require to query it at all
ObjectGuid::LowType gguid = fields[1].GetUInt64(); // We check if have a guild for the person, so we might not require to query it at all
xptotal = sObjectMgr->GetXPForLevel(level);
if (gguid != 0)
if (gguid)
{
// Guild Data - an own query, because it may not happen.
PreparedStatement* stmt3 = CharacterDatabase.GetPreparedStatement(CHAR_SEL_GUILD_MEMBER_EXTENDED);
stmt3->setUInt32(0, lowguid);
stmt3->setUInt64(0, lowguid);
PreparedQueryResult result5 = CharacterDatabase.Query(stmt3);
if (result5)
{
Field* fields5 = result5->Fetch();
guildId = fields5[0].GetUInt32();
guildId = fields5[0].GetUInt64();
guildName = fields5[1].GetString();
guildRank = fields5[2].GetString();
guildRankId = fields5[3].GetUInt8();
src/server/shared/Database/Implementation/CharacterDatabase.cpp
-1
View File
@@ -217,7 +217,6 @@ void CharacterDatabaseConnection::DoPrepareStatements()
PrepareStatement(CHAR_UPD_GUILD_BANK_TAB_INFO, "UPDATE guild_bank_tab SET TabName = ?, TabIcon = ? WHERE guildid = ? AND TabId = ?", CONNECTION_ASYNC);
PrepareStatement(CHAR_UPD_GUILD_BANK_MONEY, "UPDATE guild SET BankMoney = ? WHERE guildid = ?", CONNECTION_ASYNC); // 0: uint64, 1: uint32
// 0: uint8, 1: uint32, 2: uint8, 3: uint32
PrepareStatement(CHAR_UPD_GUILD_BANK_EVENTLOG_TAB, "UPDATE guild_bank_eventlog SET TabId = ? WHERE guildid = ? AND TabId = ? AND LogGuid = ?", CONNECTION_ASYNC);
PrepareStatement(CHAR_UPD_GUILD_RANK_BANK_MONEY, "UPDATE guild_rank SET BankMoneyPerDay = ? WHERE rid = ? AND guildid = ?", CONNECTION_ASYNC); // 0: uint32, 1: uint8, 2: uint32
PrepareStatement(CHAR_UPD_GUILD_BANK_TAB_TEXT, "UPDATE guild_bank_tab SET TabText = ? WHERE guildid = ? AND TabId = ?", CONNECTION_ASYNC); // 0: string, 1: uint32, 2: uint8
src/server/shared/Database/Implementation/CharacterDatabase.h
-1
View File
@@ -203,7 +203,6 @@ enum CharacterDatabaseStatements
CHAR_UPD_GUILD_EMBLEM_INFO,
CHAR_UPD_GUILD_BANK_TAB_INFO,
CHAR_UPD_GUILD_BANK_MONEY,
CHAR_UPD_GUILD_BANK_EVENTLOG_TAB,
CHAR_UPD_GUILD_RANK_BANK_MONEY,
CHAR_UPD_GUILD_BANK_TAB_TEXT,
CHAR_INS_GUILD_MEMBER_WITHDRAW,