Core: header cleanup, split realmlist, boost compatibility, cotire, remove stormlib/zlib and stormlib/bzip2 and instead use dep sources

This commit is contained in:
ariel- committed 2018-03-28 04:41:59 -03:00
1 parent 7fff6c424f
commit 5ff847159c
1243 files changed
+29780 -36517

No files matched your search

+26 -22
View File
@@ -22,15 +22,19 @@ Comment: All ticket related commands
Category: commandscripts
EndScriptData */
#include "ScriptMgr.h"
#include "AccountMgr.h"
#include "CharacterCache.h"
#include "Chat.h"
#include "Language.h"
#include "ObjectAccessor.h"
#include "ObjectMgr.h"
#include "Opcodes.h"
#include "Player.h"
#include "Realm.h"
#include "TicketMgr.h"
#include "ScriptMgr.h"
#include "World.h"
#include "WorldSession.h"
class ticket_commandscript : public CommandScript
{
@@ -67,7 +71,7 @@ public:
static std::vector<ChatCommand> commandTable =
{
{ "ticket", rbac::RBAC_PERM_COMMAND_TICKET, false, NULL, "", ticketCommandTable },
{ "ticket", rbac::RBAC_PERM_COMMAND_TICKET, false, nullptr, "", ticketCommandTable },
};
return commandTable;
@@ -81,7 +85,7 @@ public:
char* ticketIdStr = strtok((char*)args, " ");
uint32 ticketId = atoi(ticketIdStr);
char* targetStr = strtok(NULL, " ");
char* targetStr = strtok(nullptr, " ");
if (!targetStr)
return false;
@@ -122,12 +126,12 @@ public:
}
// Assign ticket
SQLTransaction trans = SQLTransaction(NULL);
SQLTransaction trans = SQLTransaction(nullptr);
ticket->SetAssignedTo(targetGuid, AccountMgr::IsAdminAccount(AccountMgr::GetSecurity(accountId, realm.Id.Realm)));
ticket->SaveToDB(trans);
sTicketMgr->UpdateLastChange();
std::string msg = ticket->FormatMessageString(*handler, NULL, target.c_str(), NULL, NULL, NULL);
std::string msg = ticket->FormatMessageString(*handler, nullptr, target.c_str(), nullptr, nullptr, nullptr);
handler->SendGlobalGMSysMessage(msg.c_str());
return true;
}
@@ -157,7 +161,7 @@ public:
sTicketMgr->ResolveAndCloseTicket(ticket->GetId(), player ? player->GetGUID() : ObjectGuid(uint64(0)));
sTicketMgr->UpdateLastChange();
std::string msg = ticket->FormatMessageString(*handler, player ? player->GetName().c_str() : "Console", NULL, NULL, NULL, NULL);
std::string msg = ticket->FormatMessageString(*handler, player ? player->GetName().c_str() : "Console", nullptr, nullptr, nullptr, nullptr);
handler->SendGlobalGMSysMessage(msg.c_str());
// Inform player, who submitted this ticket, that it is closed
@@ -165,7 +169,7 @@ public:
{
WorldPacket data(SMSG_GMTICKET_DELETETICKET, 4);
data << uint32(GMTICKET_RESPONSE_TICKET_DELETED);
submitter->GetSession()->SendPacket(&data);
submitter->SendDirectMessage(&data);
}
return true;
}
@@ -178,7 +182,7 @@ public:
char* ticketIdStr = strtok((char*)args, " ");
uint32 ticketId = atoi(ticketIdStr);
char* comment = strtok(NULL, "\n");
char* comment = strtok(nullptr, "\n");
if (!comment)
return false;
@@ -198,7 +202,7 @@ public:
return true;
}
SQLTransaction trans = SQLTransaction(NULL);
SQLTransaction trans = SQLTransaction(nullptr);
ticket->SetComment(comment);
ticket->SaveToDB(trans);
sTicketMgr->UpdateLastChange();
@@ -236,7 +240,7 @@ public:
return true;
}
char* response = strtok(NULL, "\n");
char* response = strtok(nullptr, "\n");
if (response)
{
// Cannot add response to ticket, assigned to someone else
@@ -256,13 +260,13 @@ public:
Player* gm = handler->GetSession() ? handler->GetSession()->GetPlayer() : nullptr;
SQLTransaction trans = SQLTransaction(NULL);
SQLTransaction trans = SQLTransaction(nullptr);
ticket->SetResolvedBy(gm ? gm->GetGUID() : ObjectGuid(uint64(0)));
ticket->SetCompleted();
ticket->SaveToDB(trans);
std::string msg = ticket->FormatMessageString(*handler, NULL, NULL,
NULL, NULL, handler->GetSession() ? handler->GetSession()->GetPlayer()->GetName().c_str() : "Console");
std::string msg = ticket->FormatMessageString(*handler, nullptr, nullptr,
nullptr, nullptr, handler->GetSession() ? handler->GetSession()->GetPlayer()->GetName().c_str() : "Console");
handler->SendGlobalGMSysMessage(msg.c_str());
sTicketMgr->UpdateLastChange();
return true;
@@ -287,7 +291,7 @@ public:
return true;
}
std::string msg = ticket->FormatMessageString(*handler, NULL, NULL, NULL, handler->GetSession() ? handler->GetSession()->GetPlayer()->GetName().c_str() : "Console", NULL);
std::string msg = ticket->FormatMessageString(*handler, nullptr, nullptr, nullptr, handler->GetSession() ? handler->GetSession()->GetPlayer()->GetName().c_str() : "Console", nullptr);
handler->SendGlobalGMSysMessage(msg.c_str());
sTicketMgr->RemoveTicket(ticket->GetId());
@@ -298,7 +302,7 @@ public:
// Force abandon ticket
WorldPacket data(SMSG_GMTICKET_DELETETICKET, 4);
data << uint32(GMTICKET_RESPONSE_TICKET_DELETED);
player->GetSession()->SendPacket(&data);
player->SendDirectMessage(&data);
}
return true;
@@ -409,13 +413,13 @@ public:
}
std::string assignedTo = ticket->GetAssignedToName(); // copy assignedto name because we need it after the ticket has been unnassigned
SQLTransaction trans = SQLTransaction(NULL);
SQLTransaction trans = SQLTransaction(nullptr);
ticket->SetUnassigned();
ticket->SaveToDB(trans);
sTicketMgr->UpdateLastChange();
std::string msg = ticket->FormatMessageString(*handler, NULL, assignedTo.c_str(),
handler->GetSession() ? handler->GetSession()->GetPlayer()->GetName().c_str() : "Console", NULL, NULL);
std::string msg = ticket->FormatMessageString(*handler, nullptr, assignedTo.c_str(),
handler->GetSession() ? handler->GetSession()->GetPlayer()->GetName().c_str() : "Console", nullptr, nullptr);
handler->SendGlobalGMSysMessage(msg.c_str());
return true;
@@ -434,7 +438,7 @@ public:
return true;
}
SQLTransaction trans = SQLTransaction(NULL);
SQLTransaction trans = SQLTransaction(nullptr);
ticket->SetViewed();
ticket->SaveToDB(trans);
@@ -473,7 +477,7 @@ public:
return true;
}
SQLTransaction trans = SQLTransaction(NULL);
SQLTransaction trans = SQLTransaction(nullptr);
ticket->SetViewed();
ticket->SaveToDB(trans);
@@ -489,7 +493,7 @@ public:
char* ticketIdStr = strtok((char*)args, " ");
uint32 ticketId = atoi(ticketIdStr);
char* response = strtok(NULL, "\n");
char* response = strtok(nullptr, "\n");
if (!response)
return false;
@@ -509,7 +513,7 @@ public:
return true;
}
SQLTransaction trans = SQLTransaction(NULL);
SQLTransaction trans = SQLTransaction(nullptr);
ticket->AppendResponse(response);
if (newLine)
ticket->AppendResponse("\n");