aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/server/game/Battlefield/Battlefield.h3
-rwxr-xr-xsrc/server/game/DataStores/DBCEnums.h2
-rwxr-xr-xsrc/server/game/Entities/Player/Player.h3
-rwxr-xr-xsrc/server/game/Entities/Unit/Unit.cpp2
-rw-r--r--src/server/game/Guilds/Guild.cpp2
-rw-r--r--src/server/game/Guilds/GuildFinderMgr.cpp18
-rw-r--r--src/server/game/Guilds/GuildFinderMgr.h6
-rw-r--r--src/server/game/Handlers/GuildFinderHandler.cpp12
-rwxr-xr-xsrc/server/game/Handlers/LootHandler.cpp4
-rwxr-xr-xsrc/server/game/Miscellaneous/SharedDefines.h4
-rwxr-xr-xsrc/server/game/Spells/Spell.cpp2
11 files changed, 30 insertions, 28 deletions
diff --git a/src/server/game/Battlefield/Battlefield.h b/src/server/game/Battlefield/Battlefield.h
index 8dc598d1b10..520f6a8c2a7 100644
--- a/src/server/game/Battlefield/Battlefield.h
+++ b/src/server/game/Battlefield/Battlefield.h
@@ -29,7 +29,8 @@
enum BattlefieldTypes
{
- BATTLEFIELD_WG // Wintergrasp
+ BATTLEFIELD_WG, // Wintergrasp
+ BATTLEFIELD_TB // Tol Barad (cataclysm)
};
enum BattlefieldIDs
diff --git a/src/server/game/DataStores/DBCEnums.h b/src/server/game/DataStores/DBCEnums.h
index c1d445a93e2..b6ae93f9bb8 100755
--- a/src/server/game/DataStores/DBCEnums.h
+++ b/src/server/game/DataStores/DBCEnums.h
@@ -490,7 +490,7 @@ enum SummonPropFlags
SUMMON_PROP_FLAG_UNK13 = 0x00001000, // Lightwell, Jeeves, Gnomish Alarm-o-bot, Build vehicles(wintergrasp)
SUMMON_PROP_FLAG_UNK14 = 0x00002000, // Guides, player follows
SUMMON_PROP_FLAG_UNK15 = 0x00004000, // Force of Nature, Shadowfiend, Feral Spirit, Summon Water Elemental
- SUMMON_PROP_FLAG_UNK16 = 0x00008000 // Light/Dark Bullet, Soul/Fiery Consumption, Twisted Visage, Twilight Whelp. Phase related?
+ SUMMON_PROP_FLAG_UNK16 = 0x00008000, // Light/Dark Bullet, Soul/Fiery Consumption, Twisted Visage, Twilight Whelp. Phase related?
SUMMON_PROP_FLAG_UNK17 = 0x00010000,
SUMMON_PROP_FLAG_UNK18 = 0x00020000,
SUMMON_PROP_FLAG_UNK19 = 0x00040000,
diff --git a/src/server/game/Entities/Player/Player.h b/src/server/game/Entities/Player/Player.h
index 74fe8b9181f..89c82736335 100755
--- a/src/server/game/Entities/Player/Player.h
+++ b/src/server/game/Entities/Player/Player.h
@@ -887,7 +887,8 @@ enum PlayerLoginQueryIndex
PLAYER_LOGIN_QUERY_LOADSEASONALQUESTSTATUS = 31,
PLAYER_LOGIN_QUERY_LOADVOIDSTORAGE = 32,
PLAYER_LOGIN_QUERY_LOADCURRENCY = 33,
- PLAYER_LOGIN_QUERY_LOAD_CUF_PROFILES = 34
+ PLAYER_LOGIN_QUERY_LOAD_CUF_PROFILES = 34,
+ MAX_PLAYER_LOGIN_QUERY
};
enum PlayerDelayedOperations
diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp
index b2953011e6c..5407cbd274e 100755
--- a/src/server/game/Entities/Unit/Unit.cpp
+++ b/src/server/game/Entities/Unit/Unit.cpp
@@ -2714,7 +2714,7 @@ void Unit::_UpdateAutoRepeatSpell()
{
// check "realtime" interrupts
// don't cancel spells which are affected by a SPELL_AURA_CAST_WHILE_WALKING effect
- if (((GetTypeId() == TYPEID_PLAYER && ToPlayer()->isMoving()) || IsNonMeleeSpellCasted(false, false, true, m_currentSpells[CURRENT_AUTOREPEAT_SPELL]->m_spellInfo->Id == 75)) &&
+ if (((GetTypeId() == TYPEID_PLAYER && ToPlayer()->isMoving()) || IsNonMeleeSpellCasted(false, false, true, m_currentSpells[CURRENT_AUTOREPEAT_SPELL]->m_spellInfo->Id == 75)) &&
!HasAuraTypeWithAffectMask(SPELL_AURA_CAST_WHILE_WALKING, m_currentSpells[CURRENT_AUTOREPEAT_SPELL]->m_spellInfo))
{
// cancel wand shoot
diff --git a/src/server/game/Guilds/Guild.cpp b/src/server/game/Guilds/Guild.cpp
index 13c85cc954f..23003fdf367 100644
--- a/src/server/game/Guilds/Guild.cpp
+++ b/src/server/game/Guilds/Guild.cpp
@@ -1875,7 +1875,7 @@ void Guild::HandleMemberDepositMoney(WorldSession* session, uint32 amount, bool
_LogBankEvent(trans, cashFlow ? GUILD_BANK_LOG_CASH_FLOW_DEPOSIT : GUILD_BANK_LOG_DEPOSIT_MONEY, uint8(0), player->GetGUIDLow(), amount);
CharacterDatabase.CommitTransaction(trans);
-
+
if (!cashFlow)
SendBankList(session, 0, false, false);
}
diff --git a/src/server/game/Guilds/GuildFinderMgr.cpp b/src/server/game/Guilds/GuildFinderMgr.cpp
index c81abeec47a..461c3093cd4 100644
--- a/src/server/game/Guilds/GuildFinderMgr.cpp
+++ b/src/server/game/Guilds/GuildFinderMgr.cpp
@@ -42,13 +42,13 @@ void GuildFinderMgr::LoadGuildSettings()
"FROM guild_finder_guild_settings gfgs "
"LEFT JOIN guild_member gm ON gm.guildid=gfgs.guildId "
"LEFT JOIN characters c ON c.guid = gm.guid LIMIT 1");
-
+
if (!result)
{
sLog->outInfo(LOG_FILTER_SERVER_LOADING, ">> Loaded 0 guild finder guild-related settings. Table `guild_finder_guild_settings` is empty.");
return;
}
-
+
uint32 count = 0;
uint32 oldMSTime = getMSTime();
do
@@ -69,7 +69,7 @@ void GuildFinderMgr::LoadGuildSettings()
LFGuildSettings settings(listed, guildTeam, guildId, classRoles, availability, interests, level, comment);
_guildSettings[guildId] = settings;
-
+
++count;
} while (result->NextRow());
@@ -82,13 +82,13 @@ void GuildFinderMgr::LoadMembershipRequests()
// 0 1 2 3 4 5 6
QueryResult result = CharacterDatabase.Query("SELECT guildId, playerGuid, availability, classRole, interests, comment, submitTime "
"FROM guild_finder_applicant");
-
+
if (!result)
{
sLog->outInfo(LOG_FILTER_SERVER_LOADING, ">> Loaded 0 guild finder membership requests. Table `guild_finder_applicant` is empty.");
return;
}
-
+
uint32 count = 0;
uint32 oldMSTime = getMSTime();
do
@@ -101,11 +101,11 @@ void GuildFinderMgr::LoadMembershipRequests()
uint8 interests = fields[4].GetUInt8();
std::string comment = fields[5].GetString();
uint32 submitTime = fields[6].GetUInt32();
-
+
MembershipRequest request(playerId, guildId, availability, classRoles, interests, comment, time_t(submitTime));
_membershipRequests[guildId].push_back(request);
-
+
++count;
} while (result->NextRow());
@@ -115,7 +115,7 @@ void GuildFinderMgr::LoadMembershipRequests()
void GuildFinderMgr::AddMembershipRequest(uint32 guildGuid, MembershipRequest const& request)
{
_membershipRequests[guildGuid].push_back(request);
-
+
SQLTransaction trans = CharacterDatabase.BeginTransaction();
PreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_REP_GUILD_FINDER_APPLICANT);
stmt->setUInt32(0, request.GetGuildId());
@@ -301,7 +301,7 @@ void GuildFinderMgr::DeleteGuild(uint32 guildId)
stmt = CharacterDatabase.GetPreparedStatement(CHAR_DEL_GUILD_FINDER_GUILD_SETTINGS);
stmt->setUInt32(0, itr->GetGuildId());
trans->Append(stmt);
-
+
CharacterDatabase.CommitTransaction(trans);
_membershipRequests[guildId].erase(itr);
diff --git a/src/server/game/Guilds/GuildFinderMgr.h b/src/server/game/Guilds/GuildFinderMgr.h
index 169b42740aa..54faa83a002 100644
--- a/src/server/game/Guilds/GuildFinderMgr.h
+++ b/src/server/game/Guilds/GuildFinderMgr.h
@@ -72,7 +72,7 @@ struct MembershipRequest
MembershipRequest(uint32 playerGUID, uint32 guildId, uint32 availability, uint32 classRoles, uint32 interests, std::string& comment, time_t submitTime) :
_playerGUID(playerGUID), _guildId(guildId), _availability(availability), _classRoles(classRoles),
_interests(interests), _time(submitTime), _comment(comment) {}
-
+
MembershipRequest() : _playerGUID(0), _guildId(0), _availability(0), _classRoles(0),
_interests(0), _time(time(NULL)) {}
@@ -239,7 +239,7 @@ class GuildFinderMgr
/// wipes everything related to a guild. Used when that guild is disbanded
void DeleteGuild(uint32 guildId);
-
+
/**
* @brief Returns a set of membership requests for a guild
* @param guildGuid The guild's database guid.
@@ -264,7 +264,7 @@ class GuildFinderMgr
/// Counts the amount of pending membership requests, given the player's db guid.
uint8 CountRequestsFromPlayer(uint32 playerId);
-
+
void SendApplicantListUpdate(Guild& guild);
void SendMembershipRequestListUpdate(Player& player);
};
diff --git a/src/server/game/Handlers/GuildFinderHandler.cpp b/src/server/game/Handlers/GuildFinderHandler.cpp
index facbd98ffac..c017a10ca1a 100644
--- a/src/server/game/Handlers/GuildFinderHandler.cpp
+++ b/src/server/game/Handlers/GuildFinderHandler.cpp
@@ -82,7 +82,7 @@ void WorldSession::HandleGuildFinderBrowse(WorldPacket& recvPacket)
uint32 playerLevel = 0; // Raw player level (1-85), do they use MAX_FINDER_LEVEL when on level 85 ?
recvPacket >> classRoles >> availability >> guildInterests >> playerLevel;
-
+
if (!(classRoles & GUILDFINDER_ALL_ROLES) || classRoles > GUILDFINDER_ALL_ROLES)
return;
if (!(availability & ALL_WEEK) || availability > ALL_WEEK)
@@ -180,7 +180,7 @@ void WorldSession::HandleGuildFinderDeclineRecruit(WorldPacket& recvPacket)
ObjectGuid playerGuid;
- playerGuid[1] = recvPacket.ReadBit();
+ playerGuid[1] = recvPacket.ReadBit();
playerGuid[4] = recvPacket.ReadBit();
playerGuid[5] = recvPacket.ReadBit();
playerGuid[2] = recvPacket.ReadBit();
@@ -252,7 +252,7 @@ void WorldSession::HandleGuildFinderGetApplications(WorldPacket& /*recvPacket*/)
bufferData.WriteByteSeq(guildGuid[4]);
bufferData.WriteByteSeq(guildGuid[1]);
-
+
bufferData << uint32(time(NULL) - request.GetSubmitTime()); // Time since application (seconds)
bufferData << uint32(guildSettings.GetInterests());
}
@@ -301,9 +301,9 @@ void WorldSession::HandleGuildFinderGetRecruits(WorldPacket& recvPacket)
data.WriteBit(playerGuid[6]);
dataBuffer.WriteByteSeq(playerGuid[4]);
-
+
dataBuffer << int32(time(NULL) <= request.GetExpiryTime());
-
+
dataBuffer.WriteByteSeq(playerGuid[3]);
dataBuffer.WriteByteSeq(playerGuid[0]);
dataBuffer.WriteByteSeq(playerGuid[1]);
@@ -376,7 +376,7 @@ void WorldSession::HandleGuildFinderRemoveRecruit(WorldPacket& recvPacket)
ObjectGuid guildGuid;
- guildGuid[0] = recvPacket.ReadBit();
+ guildGuid[0] = recvPacket.ReadBit();
guildGuid[4] = recvPacket.ReadBit();
guildGuid[3] = recvPacket.ReadBit();
guildGuid[5] = recvPacket.ReadBit();
diff --git a/src/server/game/Handlers/LootHandler.cpp b/src/server/game/Handlers/LootHandler.cpp
index 897f03d0850..a243ef29c5c 100755
--- a/src/server/game/Handlers/LootHandler.cpp
+++ b/src/server/game/Handlers/LootHandler.cpp
@@ -182,7 +182,7 @@ void WorldSession::HandleLootMoneyOpcode(WorldPacket& /*recvData*/)
(*i)->UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_LOOT_MONEY, goldPerPlayer);
uint32 guildGold = 0;
-
+
if (Guild* guild = sGuildMgr->GetGuildById((*i)->GetGuildId()))
{
guildGold = CalculatePctN(goldPerPlayer, (*i)->GetTotalAuraModifier(SPELL_AURA_DEPOSIT_BONUS_MONEY_IN_GUILD_BANK_ON_LOOT));
@@ -203,7 +203,7 @@ void WorldSession::HandleLootMoneyOpcode(WorldPacket& /*recvData*/)
player->UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_LOOT_MONEY, loot->gold);
uint32 guildGold = 0;
-
+
if (Guild* guild = sGuildMgr->GetGuildById(player->GetGuildId()))
{
guildGold = CalculatePctN(loot->gold, player->GetTotalAuraModifier(SPELL_AURA_DEPOSIT_BONUS_MONEY_IN_GUILD_BANK_ON_LOOT));
diff --git a/src/server/game/Miscellaneous/SharedDefines.h b/src/server/game/Miscellaneous/SharedDefines.h
index 89e66ccdb05..01d02939bb3 100755
--- a/src/server/game/Miscellaneous/SharedDefines.h
+++ b/src/server/game/Miscellaneous/SharedDefines.h
@@ -1276,7 +1276,7 @@ enum SpellCustomErrors
SPELL_CUSTOM_ERROR_MAX_NUMBER_OF_RECRUITS = 96, // You already have the max number of recruits.
SPELL_CUSTOM_ERROR_MAX_NUMBER_OF_VOLUNTEERS = 97, // You already have the max number of volunteers.
SPELL_CUSTOM_ERROR_FROSTMOURNE_RENDERED_RESSURECT = 98, // Frostmourne has rendered you unable to ressurect.
- SPELL_CUSTOM_ERROR_CANT_MOUNT_WITH_SHAPESHIFT = 99 // You can't mount while affected by that shapeshift.
+ SPELL_CUSTOM_ERROR_CANT_MOUNT_WITH_SHAPESHIFT = 99, // You can't mount while affected by that shapeshift.
SPELL_CUSTOM_ERROR_FAWNS_ALREADY_FOLLOWING = 100, // Three fawns are already following you!
SPELL_CUSTOM_ERROR_ALREADY_HAVE_RIVER_BOAT = 101, // You already have a River Boat.
SPELL_CUSTOM_ERROR_NO_ACTIVE_ENCHANTMENT = 102, // You have no active enchantment to unleash.
@@ -1298,7 +1298,7 @@ enum SpellCustomErrors
SPELL_CUSTOM_ERROR_CANNOT_SUPERVISE_MORE_CULTISTS = 118, // You cannot supervise more than 5 Arrested Cultists at a time.
SPELL_CUSTOM_ERROR_REQUIRES_LEVEL_85 = 119, // You must reach level 85 to use this portal.
SPELL_CUSTOM_ERROR_MUST_BE_BELOW_35_HEALTH = 120, // Your target must be below 35% health.
- SPELL_CUSTOM_ERROR_MUST_SELECT_TALENT_SPECIAL = 121, // You must select a talent specialization first.
+ SPELL_CUSTOM_ERROR_MUST_SELECT_TALENT_SPECIAL = 121 // You must select a talent specialization first.
};
enum StealthType
diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp
index f9b7dca2393..ea13b4a4bcc 100755
--- a/src/server/game/Spells/Spell.cpp
+++ b/src/server/game/Spells/Spell.cpp
@@ -3012,7 +3012,7 @@ void Spell::prepare(SpellCastTargets const* targets, AuraEffect const* triggered
// don't allow channeled spells / spells with cast time to be casted while moving
// (even if they are interrupted on moving, spells with almost immediate effect get to have their effect processed before movement interrupter kicks in)
// don't cancel spells which are affected by a SPELL_AURA_CAST_WHILE_WALKING effect
- if (((m_spellInfo->IsChanneled() || m_casttime) && m_caster->GetTypeId() == TYPEID_PLAYER && m_caster->isMoving() &&
+ if (((m_spellInfo->IsChanneled() || m_casttime) && m_caster->GetTypeId() == TYPEID_PLAYER && m_caster->isMoving() &&
m_spellInfo->InterruptFlags & SPELL_INTERRUPT_FLAG_MOVEMENT) && !HasAuraTypeWithAffectMask(SPELL_AURA_CAST_WHILE_WALKING, m_spellInfo))
{
SendCastResult(SPELL_FAILED_MOVING);