diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/game/TicketHandler.cpp | 9 | ||||
| -rw-r--r-- | src/game/TicketMgr.cpp | 10 | ||||
| -rw-r--r-- | src/game/TicketMgr.h | 1 |
3 files changed, 16 insertions, 4 deletions
diff --git a/src/game/TicketHandler.cpp b/src/game/TicketHandler.cpp index 1e1d97fd4ce..5f43fb9a384 100644 --- a/src/game/TicketHandler.cpp +++ b/src/game/TicketHandler.cpp @@ -36,6 +36,8 @@ void WorldSession::HandleGMTicketCreateOpcode( WorldPacket & recv_data ) // always do a packet check CHECK_PACKET_SIZE(recv_data, 4*4+1+2*4); + uint32 map; + float x, y, z; std::string ticketText = ""; std::string ticketText2 = ""; GM_Ticket *ticket = new GM_Ticket; @@ -43,7 +45,12 @@ void WorldSession::HandleGMTicketCreateOpcode( WorldPacket & recv_data ) WorldPacket data(SMSG_GMTICKET_CREATE, 4); // recv Data - recv_data >> ticketText; + //TODO: Add map coordinates to tickets. + recv_data >> map; + recv_data >> x; + recv_data >> y; + recv_data >> z; + recv_data >> ticketText; // get additional data, rarely used recv_data >> ticketText2; diff --git a/src/game/TicketMgr.cpp b/src/game/TicketMgr.cpp index ffa8c522672..7c86cde723b 100644 --- a/src/game/TicketMgr.cpp +++ b/src/game/TicketMgr.cpp @@ -108,11 +108,12 @@ void TicketMgr::DeleteGMTicketPermanently(uint64 ticketGuid) void TicketMgr::LoadGMTickets() { + InitTicketID(); // Delete all out of object holder GM_TicketList.clear(); QueryResult *result = CharacterDatabase.Query( "SELECT `guid`, `playerGuid`, `name`, `message`, `timestamp`, `closed`, `assignedto`, `comment` FROM `gm_tickets` WHERE `closed` = '0'" ); GM_Ticket *ticket; - + if(!result) return; @@ -190,7 +191,7 @@ void TicketMgr::UpdateGMTicket(GM_Ticket *ticket) SaveGMTicket(ticket); } -uint64 TicketMgr::GenerateTicketID() +void TicketMgr::InitTicketID() { QueryResult *result = CharacterDatabase.Query("SELECT MAX(guid) FROM gm_tickets"); if(result) @@ -198,6 +199,9 @@ uint64 TicketMgr::GenerateTicketID() m_ticketid = result->Fetch()[0].GetUInt64() + 1; delete result; } +} +uint64 TicketMgr::GenerateTicketID() +{ return ++m_ticketid; -}
\ No newline at end of file +} diff --git a/src/game/TicketMgr.h b/src/game/TicketMgr.h index 33a9598e7cf..cf050303e39 100644 --- a/src/game/TicketMgr.h +++ b/src/game/TicketMgr.h @@ -61,6 +61,7 @@ class TicketMgr void SaveGMTicket(GM_Ticket* ticket); uint64 GenerateTicketID(); + void InitTicketID(); GM_Ticket* GetGMTicket(uint64 ticketGuid); GM_Ticket* GetGMTicketByPlayer(uint64 playerGuid); GM_Ticket* GetGMTicketByName(const char *name); |