Core: header cleanup, split realmlist, boost compatibility, cotire, remove stormlib/zlib and stormlib/bzip2 and instead use dep sources
This commit is contained in:
1 parent
7fff6c424f
commit
5ff847159c
1243 files changed
+29780
-36517
No files matched your search
@@ -16,15 +16,19 @@
|
||||
* with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#include "Common.h"
|
||||
#include "WorldPacket.h"
|
||||
#include "WorldSession.h"
|
||||
#include "World.h"
|
||||
#include "ObjectMgr.h"
|
||||
#include "AchievementMgr.h"
|
||||
#include "Common.h"
|
||||
#include "DatabaseEnv.h"
|
||||
#include "Guild.h"
|
||||
#include "GuildMgr.h"
|
||||
#include "Log.h"
|
||||
#include "Guild.h"
|
||||
#include "ObjectMgr.h"
|
||||
#include "Player.h"
|
||||
#include "QueryCallback.h"
|
||||
#include "SpellAuraDefines.h"
|
||||
#include "World.h"
|
||||
#include "WorldPacket.h"
|
||||
|
||||
void WorldSession::HandleGuildQueryOpcode(WorldPacket& recvPacket)
|
||||
{
|
||||
@@ -533,7 +537,7 @@ void WorldSession::HandleGuildBankSwapItems(WorldPacket& recvPacket)
|
||||
// Player <-> Bank
|
||||
// Allow to work with inventory only
|
||||
if (!Player::IsInventoryPos(playerBag, playerSlotId) && !(playerBag == NULL_BAG && playerSlotId == NULL_SLOT))
|
||||
GetPlayer()->SendEquipError(EQUIP_ERR_INTERNAL_BAG_ERROR, NULL);
|
||||
GetPlayer()->SendEquipError(EQUIP_ERR_INTERNAL_BAG_ERROR, nullptr);
|
||||
else
|
||||
guild->SwapItemsWithInventory(GetPlayer(), toChar != 0, tabId, slotId, playerBag, playerSlotId, splitedAmount);
|
||||
}
|
||||
@@ -773,7 +777,7 @@ void WorldSession::HandleGuildRewardsQueryOpcode(WorldPacket& recvPacket)
|
||||
data << uint32(0); // Unused
|
||||
data << uint32(rewards[i].AchievementId);
|
||||
}
|
||||
data << uint32(time(NULL));
|
||||
data << uint32(time(nullptr));
|
||||
SendPacket(&data);
|
||||
}
|
||||
}
|
||||
@@ -1031,7 +1035,7 @@ void WorldSession::HandleGuildChallengeRequest(WorldPacket& recvPacket)
|
||||
if (Guild::ChallengesMgr* challengesMgr = pGuild->GetChallengesMgr())
|
||||
{
|
||||
// First check if it's time to reset the challenges.
|
||||
time_t thisTime = time(NULL);
|
||||
time_t thisTime = time(nullptr);
|
||||
if (pGuild->GetChallengesMgr()->CompletedFirstChallenge(pGuild->GetId()) && pGuild->GetChallengesMgr()->GetFirstCompletedChallengeTime(pGuild->GetId()) + WEEK <= thisTime)
|
||||
pGuild->GetChallengesMgr()->ResetWeeklyChallenges();
|
||||
|
||||
|
||||
Reference in new issue
Block a user