From 70102f32fe38ae7d49acbd5ddee0239602d3cb94 Mon Sep 17 00:00:00 2001 From: Shauren Date: Mon, 25 Apr 2016 22:03:34 +0200 Subject: Core/DataStores: Updated opcodes and db2 to 7.0.3.21414 --- src/server/game/Tools/CharacterDatabaseCleaner.cpp | 1 - 1 file changed, 1 deletion(-) (limited to 'src/server/game/Tools/CharacterDatabaseCleaner.cpp') diff --git a/src/server/game/Tools/CharacterDatabaseCleaner.cpp b/src/server/game/Tools/CharacterDatabaseCleaner.cpp index 255900b5414..04614d65ded 100644 --- a/src/server/game/Tools/CharacterDatabaseCleaner.cpp +++ b/src/server/game/Tools/CharacterDatabaseCleaner.cpp @@ -23,7 +23,6 @@ #include "Database/DatabaseEnv.h" #include "SpellMgr.h" #include "SpellInfo.h" -#include "DBCStores.h" void CharacterDatabaseCleaner::CleanDatabase() { -- cgit v1.2.3 From b415f0a04a38123eee00c95fc1f8f483c480526a Mon Sep 17 00:00:00 2001 From: Shauren Date: Tue, 14 Jun 2016 22:13:27 +0200 Subject: Core/Players: Fixed saving talents for all specs --- src/server/game/Entities/Player/Player.cpp | 8 +++++--- src/server/game/Miscellaneous/SharedDefines.h | 4 ---- src/server/game/Tools/CharacterDatabaseCleaner.cpp | 2 +- 3 files changed, 6 insertions(+), 8 deletions(-) (limited to 'src/server/game/Tools/CharacterDatabaseCleaner.cpp') diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index b3f23d79221..083ab3c2465 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -24761,11 +24761,13 @@ void Player::SendTalentsInfoData() if (!spec) continue; + PlayerTalentMap* talents = GetTalentMap(i); + WorldPackets::Talent::TalentGroupInfo groupInfoPkt; groupInfoPkt.SpecID = spec->ID; - groupInfoPkt.TalentIDs.reserve(GetTalentMap(i)->size()); + groupInfoPkt.TalentIDs.reserve(talents->size()); - for (PlayerTalentMap::const_iterator itr = GetTalentMap(i)->begin(); itr != GetTalentMap(i)->end(); ++itr) + for (PlayerTalentMap::const_iterator itr = talents->begin(); itr != talents->end(); ++itr) { if (itr->second == PLAYERSPELL_REMOVED) continue; @@ -24989,7 +24991,7 @@ void Player::_SaveTalents(SQLTransaction& trans) trans->Append(stmt); PlayerTalentMap* talents; - for (uint8 group = 0; group < MAX_TALENT_GROUPS; ++group) + for (uint8 group = 0; group < MAX_SPECIALIZATIONS; ++group) { talents = GetTalentMap(group); for (PlayerTalentMap::iterator itr = talents->begin(); itr != talents->end();) diff --git a/src/server/game/Miscellaneous/SharedDefines.h b/src/server/game/Miscellaneous/SharedDefines.h index 7320119f739..9b6680b7358 100644 --- a/src/server/game/Miscellaneous/SharedDefines.h +++ b/src/server/game/Miscellaneous/SharedDefines.h @@ -851,10 +851,6 @@ enum SpellAttr13 SPELL_ATTR13_UNK23 = 0x00800000 // 23 }; -#define MIN_TALENT_GROUP 0 -#define MAX_TALENT_GROUP 1 -#define MIN_TALENT_GROUPS 1 -#define MAX_TALENT_GROUPS 2 #define MIN_SPECIALIZATION_LEVEL 10 #define MAX_SPECIALIZATIONS 4 #define PET_SPEC_OVERRIDE_CLASS_INDEX MAX_CLASSES diff --git a/src/server/game/Tools/CharacterDatabaseCleaner.cpp b/src/server/game/Tools/CharacterDatabaseCleaner.cpp index 04614d65ded..a4d34f6088a 100644 --- a/src/server/game/Tools/CharacterDatabaseCleaner.cpp +++ b/src/server/game/Tools/CharacterDatabaseCleaner.cpp @@ -148,7 +148,7 @@ bool CharacterDatabaseCleaner::TalentCheck(uint32 talent_id) void CharacterDatabaseCleaner::CleanCharacterTalent() { - CharacterDatabase.DirectPExecute("DELETE FROM character_talent WHERE spec > %u", MAX_TALENT_GROUPS); + CharacterDatabase.DirectPExecute("DELETE FROM character_talent WHERE spec > %u", MAX_SPECIALIZATIONS); CheckUnique("spell", "character_talent", &TalentCheck); } -- cgit v1.2.3