1 files changed, 17 insertions, 13 deletions

diff --git a/src/game/TicketMgr.cpp b/src/game/TicketMgr.cpp
index e8b75c9f284..7335b3a3067 100644
--- a/src/game/TicketMgr.cpp
+++ b/src/game/TicketMgr.cpp
@@ -1,7 +1,7 @@
 /*
- * Copyright (C) 2005-2008 MaNGOS
+ * Copyright (C) 2005-2009 MaNGOS
  *
- * Copyright (C) 2008 Trinity
+ * Copyright (C) 2008-2009 Trinity
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -92,13 +92,9 @@ void TicketMgr::DeleteGMTicketPermanently(uint64 ticketGuid)
     for(GmTicketList::iterator i = GM_TicketList.begin(); i != GM_TicketList.end();)
     {
         if((*i)->guid == ticketGuid)
-        {
             i = GM_TicketList.erase(i);
-        }
         else
-        {
             ++i;
-        }
     }
 
     // delete database record
@@ -108,10 +104,9 @@ 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`" );
+    QueryResult *result = CharacterDatabase.Query( "SELECT `guid`, `playerGuid`, `name`, `message`, `createtime`, `map`, `posX`, `posY`, `posZ`, `timestamp`, `closed`, `assignedto`, `comment` FROM `gm_tickets`" );
     GM_Ticket *ticket;
 
     if(!result)
@@ -126,10 +121,14 @@ void TicketMgr::LoadGMTickets()
         ticket->playerGuid = fields[1].GetUInt64();
         ticket->name = fields[2].GetString();
         ticket->message = fields[3].GetString();
-        ticket->timestamp = fields[4].GetUInt32();
-        ticket->closed = fields[5].GetUInt16();
-        ticket->assignedToGM = fields[6].GetUInt64();
-        ticket->comment = fields[7].GetString();
+        ticket->createtime = fields[4].GetUInt64();
+        ticket->pos_x = fields[5].GetFloat();
+        ticket->pos_y = fields[6].GetFloat();
+        ticket->pos_z = fields[7].GetFloat();
+        ticket->timestamp = fields[8].GetUInt64();
+        ticket->closed = fields[9].GetUInt64();
+        ticket->assignedToGM = fields[10].GetUInt64();
+        ticket->comment = fields[11].GetString();
 
         AddGMTicket(ticket, true);
 
@@ -172,11 +171,16 @@ void TicketMgr::SaveGMTicket(GM_Ticket* ticket)
     std::string msg = ticket->message;
     CharacterDatabase.escape_string(msg);
     std::stringstream ss;
-    ss << "REPLACE INTO `gm_tickets` (`guid`, `playerGuid`, `name`, `message`, `timestamp`, `closed`, `assignedto`, `comment`) VALUES('";
+    ss << "REPLACE INTO `gm_tickets` (`guid`, `playerGuid`, `name`, `message`, `createtime`, `map`, `posX`, `posY`, `posZ`, `timestamp`, `closed`, `assignedto`, `comment`) VALUES('";
     ss << ticket->guid << "', '";
     ss << ticket->playerGuid << "', '";
     ss << ticket->name << "', '";
     ss << msg << "', '" ;
+    ss << ticket->createtime << "', '";
+    ss << ticket->map << "', '";
+    ss << ticket->pos_x << "', '";
+    ss << ticket->pos_y << "', '";
+    ss << ticket->pos_z << "', '";
     ss << ticket->timestamp << "', '";
     ss << ticket->closed << "', '";
     ss << ticket->assignedToGM << "', '";