* Merge

--HG-- branch : trunk
2009-02-05 00:45:34 +01:00
parent b3eb5d34d1 d69198732e
commit 83b8909098
2 changed files with 4 additions and 4 deletions
@@ -63,7 +63,7 @@ GM_Ticket* TicketMgr::GetGMTicketByName(const char* name)
 	Player *plr = objmgr.GetPlayer(pname.c_str());
 	if(!plr)
 		return NULL;
-	
+
 	uint64 playerGuid = plr->GetGUID();

 	for(GmTicketList::iterator i = GM_TicketList.begin(); i != GM_TicketList.end();)
@@ -184,7 +184,7 @@ void TicketMgr::SaveGMTicket(GM_Ticket* ticket)
    CharacterDatabase.BeginTransaction();
 	CharacterDatabase.Execute(ss.str().c_str());
 	CharacterDatabase.CommitTransaction();
-		
+
 }

 void TicketMgr::UpdateGMTicket(GM_Ticket *ticket)
@@ -59,13 +59,13 @@ class TicketMgr
 		void RemoveGMTicket(uint64 ticketGuid, uint64 GMguid);
 		void UpdateGMTicket(GM_Ticket *ticket);
 		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);
-		
+

 	protected:
 		uint64 m_ticketid;