diff options
| -rw-r--r-- | src/game/Level1.cpp | 18 | ||||
| -rw-r--r-- | src/game/TicketHandler.cpp | 2 | ||||
| -rw-r--r-- | src/game/TicketMgr.cpp | 10 | ||||
| -rw-r--r-- | src/game/TicketMgr.h | 2 |
4 files changed, 16 insertions, 16 deletions
diff --git a/src/game/Level1.cpp b/src/game/Level1.cpp index 740bb687690..71356afb86a 100644 --- a/src/game/Level1.cpp +++ b/src/game/Level1.cpp @@ -272,7 +272,7 @@ bool ChatHandler::HandleGMTicketListCommand(const char* args) SendSysMessage(LANG_COMMAND_TICKETSHOWLIST); for(GmTicketList::iterator itr = ticketmgr.GM_TicketList.begin(); itr != ticketmgr.GM_TicketList.end(); ++itr) { - if((*itr)->closed == 1) + if((*itr)->closed) continue; std::stringstream message; @@ -295,7 +295,7 @@ bool ChatHandler::HandleGMTicketListOnlineCommand(const char* args) SendSysMessage(LANG_COMMAND_TICKETSHOWONLINELIST); for(GmTicketList::iterator itr = ticketmgr.GM_TicketList.begin(); itr != ticketmgr.GM_TicketList.end(); ++itr) { - if((*itr)->closed == 1 || !objmgr.GetPlayer((*itr)->playerGuid)) + if((*itr)->closed || !objmgr.GetPlayer((*itr)->playerGuid)) continue; std::stringstream message; @@ -380,7 +380,7 @@ bool ChatHandler::HandleGMTicketCloseByIdCommand(const char* args) uint64 tguid = atoi(args); GM_Ticket *ticket = ticketmgr.GetGMTicket(tguid); - if(!ticket || ticket->closed == 1) + if(!ticket || ticket->closed) { SendSysMessage(LANG_COMMAND_TICKETNOTEXIST); return true; @@ -388,9 +388,9 @@ bool ChatHandler::HandleGMTicketCloseByIdCommand(const char* args) if(ticket && ticket->assignedToGM != m_session->GetPlayer()->GetGUID()) { PSendSysMessage(LANG_COMMAND_TICKETCANNOTCLOSE, ticket->guid); - return true; + } - sWorld.SendGMText(LANG_COMMAND_TICKETCLOSED, ticket->name.c_str(), ticket->guid); + sWorld.SendGMText(LANG_COMMAND_TICKETCLOSED, ticket->name, ticket->guid); ticketmgr.RemoveGMTicket(ticket->guid); Player *plr = objmgr.GetPlayer(ticket->playerGuid); @@ -425,7 +425,7 @@ bool ChatHandler::HandleGMTicketAssignToCommand(const char* args) std::string gmname; GM_Ticket *ticket = ticketmgr.GetGMTicket(ticketGuid); - if(!ticket || ticket->closed == 1) + if(!ticket || ticket->closed) { SendSysMessage(LANG_COMMAND_TICKETNOTEXIST); return true; @@ -517,12 +517,12 @@ bool ChatHandler::HandleGMTicketCommentCommand(const char* args) Player *cplr = m_session->GetPlayer(); GM_Ticket *ticket = ticketmgr.GetGMTicket(ticketGuid); - if(!ticket || ticket->closed == 1) + if(!ticket || ticket->closed) { PSendSysMessage(LANG_COMMAND_TICKETNOTEXIST); return true; } - if(ticket->assignedToGM == 0 && ticket->assignedToGM != cplr->GetGUID()) + if(ticket->assignedToGM = 0 && ticket->assignedToGM != cplr->GetGUID()) { gmname = objmgr.GetPlayer(ticket->assignedToGM)->GetName(); PSendSysMessage(LANG_COMMAND_TICKETALREADYASSIGNED, ticket->guid, gmname.c_str()); @@ -552,7 +552,7 @@ bool ChatHandler::HandleGMTicketDeleteByIdCommand(const char* args) PSendSysMessage(LANG_COMMAND_TICKETNOTEXIST, ticketGuid); return true; } - if(!ticket->closed == 1) + if(!ticket->closed) { SendSysMessage(LANG_COMMAND_TICKETCLOSEFIRST); return true; diff --git a/src/game/TicketHandler.cpp b/src/game/TicketHandler.cpp index f3374332f79..ab00aa5f7f6 100644 --- a/src/game/TicketHandler.cpp +++ b/src/game/TicketHandler.cpp @@ -60,7 +60,7 @@ void WorldSession::HandleGMTicketCreateOpcode( WorldPacket & recv_data ) ticket->playerGuid = GetPlayer()->GetGUID(); ticket->message = ticketText; ticket->timestamp = time(NULL); - ticket->closed = 0; + ticket->closed = false; ticket->assignedToGM = 0; ticket->comment = ""; diff --git a/src/game/TicketMgr.cpp b/src/game/TicketMgr.cpp index 0f1f7501e67..212f9ff8059 100644 --- a/src/game/TicketMgr.cpp +++ b/src/game/TicketMgr.cpp @@ -49,7 +49,7 @@ GM_Ticket* TicketMgr::GetGMTicketByPlayer(uint64 playerGuid) { for(GmTicketList::iterator i = GM_TicketList.begin(); i != GM_TicketList.end();) { - if((*i)->playerGuid == playerGuid && (*i)->closed == 0) + if((*i)->playerGuid == playerGuid && !(*i)->closed) { return (*i); } @@ -72,7 +72,7 @@ GM_Ticket* TicketMgr::GetGMTicketByName(const char* name) for(GmTicketList::iterator i = GM_TicketList.begin(); i != GM_TicketList.end();) { - if((*i)->playerGuid == playerGuid && (*i)->closed == 0) + if((*i)->playerGuid == playerGuid && !(*i)->closed) { return (*i); } @@ -147,9 +147,9 @@ void TicketMgr::RemoveGMTicket(uint64 ticketGuid) { for(GmTicketList::iterator i = GM_TicketList.begin(); i != GM_TicketList.end();) { - if((*i)->guid == ticketGuid && (*i)->closed == 0) + if((*i)->guid == ticketGuid && !(*i)->closed) { - (*i)->closed = 1; + (*i)->closed = true; SaveGMTicket((*i)); } ++i; @@ -161,7 +161,7 @@ void TicketMgr::RemoveGMTicketByPlayer(uint64 playerGuid) { for(GmTicketList::iterator i = GM_TicketList.begin(); i != GM_TicketList.end();) { - if((*i)->playerGuid == playerGuid && (*i)->closed == 0) + if((*i)->playerGuid == playerGuid && !(*i)->closed) { (*i)->closed = true; SaveGMTicket((*i)); diff --git a/src/game/TicketMgr.h b/src/game/TicketMgr.h index e41be9db5c3..150ca4d2eff 100644 --- a/src/game/TicketMgr.h +++ b/src/game/TicketMgr.h @@ -34,7 +34,7 @@ struct GM_Ticket std::string name; std::string message; uint64 timestamp; - uint16 closed; + bool closed; uint64 assignedToGM; std::string comment; }; |