From 8a9a9f88cc67f22a4f06463df01d7681fd9c81ff Mon Sep 17 00:00:00 2001 From: megamage Date: Wed, 31 Dec 2008 10:46:43 -0600 Subject: *Fix the crash bug of waypoint movement. --HG-- branch : trunk --- src/game/WaypointMovementGenerator.cpp | 14 ++++++++------ src/game/WaypointMovementGenerator.h | 2 +- 2 files changed, 9 insertions(+), 7 deletions(-) (limited to 'src') 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::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 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 &); -- cgit v1.2.3 From ffa9cda87b43a43357afb8348b151fe939d6d85d Mon Sep 17 00:00:00 2001 From: megamage Date: Wed, 31 Dec 2008 11:01:08 -0600 Subject: *Fix build in Linux. --HG-- branch : trunk --- src/game/TicketMgr.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') 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); -- cgit v1.2.3 From f56e3beb43eaf92c53af78473d87f2ee8d0554b8 Mon Sep 17 00:00:00 2001 From: megamage Date: Wed, 31 Dec 2008 11:33:25 -0600 Subject: *Add a missing sql in 725. By Machiavelli. --HG-- branch : trunk --- sql/updates/733_characters.sql | 1 + src/game/CreatureGroups.cpp | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 sql/updates/733_characters.sql (limited to 'src') 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/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 +} -- cgit v1.2.3 From c1217bce3e6dbda1e6e265f3e513da9885c8aacb Mon Sep 17 00:00:00 2001 From: Machiavelli Date: Wed, 31 Dec 2008 18:19:21 +0100 Subject: * Commit update --HG-- branch : trunk --- src/game/Player.cpp | 2 +- src/game/PlayerDump.cpp | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) (limited to 'src') diff --git a/src/game/Player.cpp b/src/game/Player.cpp index abe1c9d186f..c553d767c6b 100644 --- a/src/game/Player.cpp +++ b/src/game/Player.cpp @@ -3726,7 +3726,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 }, -- cgit v1.2.3 From a6804ec3831540e8c0e20286484ee4d3c334a0e2 Mon Sep 17 00:00:00 2001 From: Machiavelli Date: Wed, 31 Dec 2008 18:52:28 +0100 Subject: Fix startup query TicketSystem --HG-- branch : trunk --- src/game/TicketMgr.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') 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; -- cgit v1.2.3 From 5290cae60c3ed3d387216dd77374358a56d8fcf3 Mon Sep 17 00:00:00 2001 From: megamage Date: Wed, 31 Dec 2008 12:22:16 -0600 Subject: *Fix startup crash. --HG-- branch : trunk --- src/bindings/scripts/ScriptMgr.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') 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) -- cgit v1.2.3