*Update to Trinity 736.

--HG--
branch : trunk

9 files changed, 15 insertions, 13 deletions

diff --git a/sql/updates/733_characters.sql b/sql/updates/733_characters.sql
new file mode 100644
index 00000000000..d078529074e
--- /dev/null
+++ b/sql/updates/733_characters.sql
@@ -0,0 +1 @@
+ALTER TABLE gm_tickets ADD `name` varchar(15) NOT NULL AFTER `playerGuid`;
\ No newline at end of file
diff --git a/src/bindings/scripts/ScriptMgr.cpp b/src/bindings/scripts/ScriptMgr.cpp
index 0dc71482df8..8fb5bdb1021 100644
--- a/src/bindings/scripts/ScriptMgr.cpp
+++ b/src/bindings/scripts/ScriptMgr.cpp
@@ -720,7 +720,7 @@ void LoadDatabase()
     LoadTrinityStrings(TScriptDB,"script_texts",TEXT_SOURCE_RANGE,1+(TEXT_SOURCE_RANGE*2));
 
     // Gather Additional data from Script Texts
-    result = TScriptDB.PQuery("SELECT entry, sound, type, language FROM script_texts");
+    result = TScriptDB.PQuery("SELECT entry, sound, type, language, emote FROM script_texts");
 
     outstring_log("TSCR: Loading Script Texts additional data...");
     if (result)
diff --git a/src/game/CreatureGroups.cpp b/src/game/CreatureGroups.cpp
index 4c6f81cdd77..e008a3f9316 100644
--- a/src/game/CreatureGroups.cpp
+++ b/src/game/CreatureGroups.cpp
@@ -211,4 +211,4 @@ void CreatureGroup::SetMemberDestination(Creature *member)
 
 		member->GetMotionMaster()->MovePoint(0, x, y, z);
 	}
-}
\ No newline at end of file
+}
diff --git a/src/game/Player.cpp b/src/game/Player.cpp
index 457c0da6d46..f0b20f5d880 100644
--- a/src/game/Player.cpp
+++ b/src/game/Player.cpp
@@ -3742,7 +3742,7 @@ void Player::DeleteFromDB(uint64 playerguid, uint32 accountId, bool updateRealmC
     CharacterDatabase.PExecute("DELETE FROM character_reputation WHERE guid = '%u'",guid);
     CharacterDatabase.PExecute("DELETE FROM character_spell WHERE guid = '%u'",guid);
     CharacterDatabase.PExecute("DELETE FROM character_spell_cooldown WHERE guid = '%u'",guid);
-    CharacterDatabase.PExecute("DELETE FROM character_ticket WHERE guid = '%u'",guid);
+    CharacterDatabase.PExecute("DELETE FROM gm_ticket WHERE playerGuid = '%u'", guid);
     CharacterDatabase.PExecute("DELETE FROM item_instance WHERE owner_guid = '%u'",guid);
     CharacterDatabase.PExecute("DELETE FROM character_social WHERE guid = '%u' OR friend='%u'",guid,guid);
     CharacterDatabase.PExecute("DELETE FROM mail WHERE receiver = '%u'",guid);
diff --git a/src/game/PlayerDump.cpp b/src/game/PlayerDump.cpp
index 597c84de8f9..7c07e51769b 100644
--- a/src/game/PlayerDump.cpp
+++ b/src/game/PlayerDump.cpp
@@ -44,7 +44,6 @@ static DumpTable dumpTables[DUMP_TABLE_COUNT] =
     { "character_action",         DTT_CHAR_TABLE },
     { "character_aura",           DTT_CHAR_TABLE },
     { "character_homebind",       DTT_CHAR_TABLE },
-    { "character_ticket",         DTT_CHAR_TABLE },
     { "character_inventory",      DTT_INVENTORY  },
     { "mail",                     DTT_MAIL       },
     { "mail_items",               DTT_MAIL_ITEM  },
diff --git a/src/game/TicketMgr.cpp b/src/game/TicketMgr.cpp
index 9b5e320f443..212f9ff8059 100644
--- a/src/game/TicketMgr.cpp
+++ b/src/game/TicketMgr.cpp
@@ -114,7 +114,7 @@ void TicketMgr::LoadGMTickets()
 {
 	// 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 deleted = '0'" );
+	QueryResult *result = CharacterDatabase.Query( "SELECT `guid`, `playerGuid`, `name`, `message`, `timestamp`, `closed`, `assignedto`, `comment` FROM gm_tickets WHERE closed = '0'" );
 	GM_Ticket *ticket;
 	
 	//ticket = NULL;
diff --git a/src/game/TicketMgr.h b/src/game/TicketMgr.h
index 0c9f27e1044..150ca4d2eff 100644
--- a/src/game/TicketMgr.h
+++ b/src/game/TicketMgr.h
@@ -74,7 +74,7 @@ class TicketMgr
 		void UpdateGMTicket(GM_Ticket *ticket);
 		void SaveGMTicket(GM_Ticket* ticket);
 		
-		uint64 TicketMgr::GenerateTicketID();
+		uint64 GenerateTicketID();
 		GM_Ticket* GetGMTicket(uint64 ticketGuid);
 		GM_Ticket* GetGMTicketByPlayer(uint64 playerGuid);
 		GM_Ticket* GetGMTicketByName(const char *name);
diff --git a/src/game/WaypointMovementGenerator.cpp b/src/game/WaypointMovementGenerator.cpp
index c4025d9de5e..b44c44aaff7 100644
--- a/src/game/WaypointMovementGenerator.cpp
+++ b/src/game/WaypointMovementGenerator.cpp
@@ -95,21 +95,23 @@ void
 WaypointMovementGenerator<Creature>::Initialize(Creature &u)
 {
     u.StopMoving();
-    i_currentNode = -1; // uint32, become 0 in the first update
-    i_nextMoveTime.Reset(0);
+    //i_currentNode = -1; // uint32, become 0 in the first update
+    //i_nextMoveTime.Reset(0);
     StopedByPlayer = false;
     if(!path_id)
         path_id = u.GetWaypointPath();
     waypoints = WaypointMgr.GetPath(path_id);
-	/*i_currentNode = 0;
+	i_currentNode = 0;
     if(waypoints && waypoints->size())
     {
+        node = waypoints->front();
         Traveller<Creature> traveller(u);
-        node = *(waypoints->at(i_currentNode));
-	    InitTraveller(u,node);
+	    InitTraveller(u, *node);
 	    i_destinationHolder.SetDestination(traveller, node->x, node->y, node->z);
         i_nextMoveTime.Reset(i_destinationHolder.GetTotalTravelTime());
-    }*/
+    }
+    else
+        node = NULL;
 }
 
 template<>
diff --git a/src/game/WaypointMovementGenerator.h b/src/game/WaypointMovementGenerator.h
index 899c55a5925..e9c806a4f7d 100644
--- a/src/game/WaypointMovementGenerator.h
+++ b/src/game/WaypointMovementGenerator.h
@@ -67,7 +67,7 @@ class TRINITY_DLL_SPEC WaypointMovementGenerator
 {
 	public:
 		WaypointMovementGenerator(uint32 _path_id = 0, bool _repeating = true) : 
-		  i_nextMoveTime(0), path_id(_path_id), repeating(_repeating), StopedByPlayer(false){}
+		  i_nextMoveTime(0), path_id(_path_id), repeating(_repeating), StopedByPlayer(false), node(NULL) {}
         
 		void Initialize(T &);
         void Finalize(T &);