From e9544985608e551d3765dea525d63b30d2c03b17 Mon Sep 17 00:00:00 2001 From: Spp Date: Tue, 27 Nov 2012 13:02:04 +0100 Subject: Core/Misc: Random changes here and there to minimize differences with 4.3.4 branch --- src/server/game/Tools/CharacterDatabaseCleaner.cpp | 3 ++- 1 file changed, 2 insertions(+), 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 f87b81c8be8..a342388f583 100644 --- a/src/server/game/Tools/CharacterDatabaseCleaner.cpp +++ b/src/server/game/Tools/CharacterDatabaseCleaner.cpp @@ -17,6 +17,7 @@ */ #include "Common.h" +#include "AchievementMgr.h" #include "CharacterDatabaseCleaner.h" #include "World.h" #include "Database/DatabaseEnv.h" @@ -108,7 +109,7 @@ void CharacterDatabaseCleaner::CheckUnique(const char* column, const char* table bool CharacterDatabaseCleaner::AchievementProgressCheck(uint32 criteria) { - return sAchievementCriteriaStore.LookupEntry(criteria); + return sAchievementMgr->GetAchievementCriteria(criteria); } void CharacterDatabaseCleaner::CleanCharacterAchievementProgress() -- cgit v1.2.3 From bb93eb0f7e2dccafb2dd0510d1326828f94ce5ef Mon Sep 17 00:00:00 2001 From: Vincent_Michael Date: Tue, 18 Dec 2012 14:13:09 +0100 Subject: Core/Character: Fix logic fail with world state in b2928e59fa8334e91dfa1a5951fade5b574b5842 --- sql/updates/characters/2012_12_18_00_character_worldstates.sql | 4 ++++ src/server/game/Tools/CharacterDatabaseCleaner.cpp | 4 ++-- src/server/game/World/World.h | 3 ++- 3 files changed, 8 insertions(+), 3 deletions(-) create mode 100644 sql/updates/characters/2012_12_18_00_character_worldstates.sql (limited to 'src/server/game/Tools/CharacterDatabaseCleaner.cpp') diff --git a/sql/updates/characters/2012_12_18_00_character_worldstates.sql b/sql/updates/characters/2012_12_18_00_character_worldstates.sql new file mode 100644 index 00000000000..98fabde6776 --- /dev/null +++ b/sql/updates/characters/2012_12_18_00_character_worldstates.sql @@ -0,0 +1,4 @@ +DELETE FROM `worldstates` WHERE `entry` IN (20004,20007); +INSERT INTO `worldstates` (`entry`, `value`, `comment`) VALUES +(20004,0,'CleaningFlags'), +(20007,0,'NextMonthlyQuestResetTime'); diff --git a/src/server/game/Tools/CharacterDatabaseCleaner.cpp b/src/server/game/Tools/CharacterDatabaseCleaner.cpp index a342388f583..eaa5f814867 100644 --- a/src/server/game/Tools/CharacterDatabaseCleaner.cpp +++ b/src/server/game/Tools/CharacterDatabaseCleaner.cpp @@ -35,7 +35,7 @@ void CharacterDatabaseCleaner::CleanDatabase() uint32 oldMSTime = getMSTime(); // check flags which clean ups are necessary - QueryResult result = CharacterDatabase.Query("SELECT value FROM worldstates WHERE entry = 20004"); + QueryResult result = CharacterDatabase.PQuery("SELECT value FROM worldstates WHERE entry = %u", WS_CLEANING_FLAGS); if (!result) return; @@ -60,7 +60,7 @@ void CharacterDatabaseCleaner::CleanDatabase() // NOTE: In order to have persistentFlags be set in worldstates for the next cleanup, // you need to define them at least once in worldstates. flags &= sWorld->getIntConfig(CONFIG_PERSISTENT_CHARACTER_CLEAN_FLAGS); - CharacterDatabase.DirectPExecute("UPDATE worldstates SET value = %u WHERE entry = 20004", flags); + CharacterDatabase.DirectPExecute("UPDATE worldstates SET value = %u WHERE entry = %u", flags, WS_CLEANING_FLAGS); sWorld->SetCleaningFlags(flags); diff --git a/src/server/game/World/World.h b/src/server/game/World/World.h index 1ac9b153dfd..c541945a1e4 100644 --- a/src/server/game/World/World.h +++ b/src/server/game/World/World.h @@ -471,8 +471,9 @@ enum WorldStates { WS_WEEKLY_QUEST_RESET_TIME = 20002, // Next weekly reset time WS_BG_DAILY_RESET_TIME = 20003, // Next daily BG reset time - WS_MONTHLY_QUEST_RESET_TIME = 20004, // Next monthly reset time + WS_CLEANING_FLAGS = 20004, // Cleaning Flags WS_GUILD_DAILY_RESET_TIME = 20006, // Next guild cap reset time + WS_MONTHLY_QUEST_RESET_TIME = 20007, // Next monthly reset time }; /// Storage class for commands issued for delayed execution -- cgit v1.2.3 From 3e318686b0e954c44c5625fdc2bbda3fb6f82aec Mon Sep 17 00:00:00 2001 From: Vincent_Michael Date: Tue, 18 Dec 2012 15:33:15 +0100 Subject: Core: Fix non pch build --- src/server/game/Tools/CharacterDatabaseCleaner.cpp | 5 ++--- src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_viscidus.cpp | 1 + 2 files changed, 3 insertions(+), 3 deletions(-) (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 eaa5f814867..0ec56dd17fd 100644 --- a/src/server/game/Tools/CharacterDatabaseCleaner.cpp +++ b/src/server/game/Tools/CharacterDatabaseCleaner.cpp @@ -35,7 +35,7 @@ void CharacterDatabaseCleaner::CleanDatabase() uint32 oldMSTime = getMSTime(); // check flags which clean ups are necessary - QueryResult result = CharacterDatabase.PQuery("SELECT value FROM worldstates WHERE entry = %u", WS_CLEANING_FLAGS); + QueryResult result = CharacterDatabase.PQuery("SELECT value FROM worldstates WHERE entry = %d", WS_CLEANING_FLAGS); if (!result) return; @@ -60,12 +60,11 @@ void CharacterDatabaseCleaner::CleanDatabase() // NOTE: In order to have persistentFlags be set in worldstates for the next cleanup, // you need to define them at least once in worldstates. flags &= sWorld->getIntConfig(CONFIG_PERSISTENT_CHARACTER_CLEAN_FLAGS); - CharacterDatabase.DirectPExecute("UPDATE worldstates SET value = %u WHERE entry = %u", flags, WS_CLEANING_FLAGS); + CharacterDatabase.DirectPExecute("UPDATE worldstates SET value = %u WHERE entry = %d", flags, WS_CLEANING_FLAGS); sWorld->SetCleaningFlags(flags); sLog->outInfo(LOG_FILTER_SERVER_LOADING, ">> Cleaned character database in %u ms", GetMSTimeDiffToNow(oldMSTime)); - } void CharacterDatabaseCleaner::CheckUnique(const char* column, const char* table, bool (*check)(uint32)) diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_viscidus.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_viscidus.cpp index 4e6c1600ebd..e86ea8daaee 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_viscidus.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_viscidus.cpp @@ -17,6 +17,7 @@ #include "ScriptMgr.h" #include "ScriptedCreature.h" +#include "SpellInfo.h" #include "temple_of_ahnqiraj.h" enum Spells -- cgit v1.2.3