aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--dep/StormLib/CMakeLists.txt6
-rw-r--r--src/server/game/Achievements/AchievementMgr.cpp21
-rwxr-xr-xsrc/server/game/DataStores/DBCEnums.h32
-rwxr-xr-xsrc/server/game/Spells/Auras/SpellAuraDefines.h4
-rw-r--r--src/server/game/Spells/SpellMgr.cpp4
-rw-r--r--src/server/game/World/World.cpp5
-rw-r--r--src/server/scripts/Events/event.cpp2
-rw-r--r--src/server/worldserver/CMakeLists.txt1
-rw-r--r--src/tools/vmap4_assembler/CMakeLists.txt4
9 files changed, 16 insertions, 63 deletions
diff --git a/dep/StormLib/CMakeLists.txt b/dep/StormLib/CMakeLists.txt
index a6735e0a6a0..7096c8f8729 100644
--- a/dep/StormLib/CMakeLists.txt
+++ b/dep/StormLib/CMakeLists.txt
@@ -262,12 +262,6 @@ endif()
add_library(storm STATIC ${SRC_FILES} ${SRC_ADDITIONAL_FILES})
target_link_libraries(storm ${LINK_LIBS})
-if(APPLE)
- set_target_properties(storm PROPERTIES FRAMEWORK true)
- set_target_properties(storm PROPERTIES PUBLIC_HEADER "src/StormLib.h src/StormPort.h")
- set_target_properties(storm PROPERTIES LINK_FLAGS "-framework Carbon")
-endif()
-
if(UNIX)
set_target_properties(storm PROPERTIES SOVERSION 0)
endif()
diff --git a/src/server/game/Achievements/AchievementMgr.cpp b/src/server/game/Achievements/AchievementMgr.cpp
index 0c46cee8470..436d3851d43 100644
--- a/src/server/game/Achievements/AchievementMgr.cpp
+++ b/src/server/game/Achievements/AchievementMgr.cpp
@@ -1404,25 +1404,8 @@ void AchievementMgr<T>::UpdateAchievementCriteria(AchievementCriteriaTypes type,
case ACHIEVEMENT_CRITERIA_TYPE_HONORABLE_KILLS_GUILD:
case ACHIEVEMENT_CRITERIA_TYPE_KILL_CREATURE_TYPE_GUILD:
case ACHIEVEMENT_CRITERIA_TYPE_COMPLETE_ARCHAEOLOGY_PROJECTS:
- case ACHIEVEMENT_CRITERIA_TYPE_UNK118:
- case ACHIEVEMENT_CRITERIA_TYPE_UNK120:
- case ACHIEVEMENT_CRITERIA_TYPE_UNK121:
- case ACHIEVEMENT_CRITERIA_TYPE_UNK122:
- case ACHIEVEMENT_CRITERIA_TYPE_UNK123:
- case ACHIEVEMENT_CRITERIA_TYPE_UNK137:
- case ACHIEVEMENT_CRITERIA_TYPE_UNK138:
- case ACHIEVEMENT_CRITERIA_TYPE_UNK139:
- case ACHIEVEMENT_CRITERIA_TYPE_UNK140:
- case ACHIEVEMENT_CRITERIA_TYPE_UNK141:
- case ACHIEVEMENT_CRITERIA_TYPE_UNK142:
- case ACHIEVEMENT_CRITERIA_TYPE_UNK143:
- case ACHIEVEMENT_CRITERIA_TYPE_UNK144:
- case ACHIEVEMENT_CRITERIA_TYPE_UNK145:
- case ACHIEVEMENT_CRITERIA_TYPE_UNK146:
- case ACHIEVEMENT_CRITERIA_TYPE_UNK147:
- case ACHIEVEMENT_CRITERIA_TYPE_UNK148:
- case ACHIEVEMENT_CRITERIA_TYPE_UNK149:
- case ACHIEVEMENT_CRITERIA_TYPE_UNK150:
+ case ACHIEVEMENT_CRITERIA_TYPE_COMPLETE_GUILD_CHALLENGE_TYPE:
+ case ACHIEVEMENT_CRITERIA_TYPE_COMPLETE_GUILD_CHALLENGE:
break; // Not implemented yet :(
}
diff --git a/src/server/game/DataStores/DBCEnums.h b/src/server/game/DataStores/DBCEnums.h
index 8f4415631b4..5217fa0d979 100755
--- a/src/server/game/DataStores/DBCEnums.h
+++ b/src/server/game/DataStores/DBCEnums.h
@@ -77,7 +77,7 @@ enum AchievementFlags
ACHIEVEMENT_FLAG_SHOW_IN_GUILD_HEADER = 0x00002000, // Shows in guild news header
ACHIEVEMENT_FLAG_GUILD = 0x00004000, //
ACHIEVEMENT_FLAG_SHOW_GUILD_MEMBERS = 0x00008000, //
- ACHIEVEMENT_FLAG_SHOW_CRITERIA_MEMBERS = 0x00010000, //
+ ACHIEVEMENT_FLAG_SHOW_CRITERIA_MEMBERS = 0x00010000 //
};
enum
@@ -90,12 +90,14 @@ enum AchievementCriteriaCondition
{
ACHIEVEMENT_CRITERIA_CONDITION_NONE = 0,
ACHIEVEMENT_CRITERIA_CONDITION_NO_DEATH = 1, // reset progress on death
- ACHIEVEMENT_CRITERIA_CONDITION_UNK1 = 2, // only used in "Complete a daily quest every day for five consecutive days"
+ ACHIEVEMENT_CRITERIA_CONDITION_UNK2 = 2, // only used in "Complete a daily quest every day for five consecutive days"
ACHIEVEMENT_CRITERIA_CONDITION_BG_MAP = 3, // requires you to be on specific map, reset at change
ACHIEVEMENT_CRITERIA_CONDITION_NO_LOSE = 4, // only used in "Win 10 arenas without losing"
+ ACHIEVEMENT_CRITERIA_CONDITION_UNK5 = 5, // Have spell?
+ ACHIEVEMENT_CRITERIA_CONDITION_UNK8 = 8,
ACHIEVEMENT_CRITERIA_CONDITION_NO_SPELL_HIT = 9, // requires the player not to be hit by specific spell
ACHIEVEMENT_CRITERIA_CONDITION_NOT_IN_GROUP = 10, // requires the player not to be in group
- ACHIEVEMENT_CRITERIA_CONDITION_UNK3 = 13 // unk
+ ACHIEVEMENT_CRITERIA_CONDITION_UNK13 = 13 // unk
};
enum AchievementCriteriaAdditionalCondition
@@ -234,6 +236,7 @@ enum AchievementCriteriaTypes
ACHIEVEMENT_CRITERIA_TYPE_BE_SPELL_TARGET2 = 69,
ACHIEVEMENT_CRITERIA_TYPE_SPECIAL_PVP_KILL = 70,
ACHIEVEMENT_CRITERIA_TYPE_FISH_IN_GAMEOBJECT = 72,
+ // TODO 73: Achievements 1515, 1241, 1103 (Name: Mal'Ganis)
ACHIEVEMENT_CRITERIA_TYPE_EARNED_PVP_TITLE = 74, // TODO: title id is not mentioned in dbc
ACHIEVEMENT_CRITERIA_TYPE_LEARN_SKILLLINE_SPELLS = 75,
ACHIEVEMENT_CRITERIA_TYPE_WIN_DUEL = 76,
@@ -266,12 +269,7 @@ enum AchievementCriteriaTypes
ACHIEVEMENT_CRITERIA_TYPE_EARN_HONORABLE_KILL = 113,
ACHIEVEMENT_CRITERIA_TYPE_ACCEPTED_SUMMONINGS = 114,
ACHIEVEMENT_CRITERIA_TYPE_EARN_ACHIEVEMENT_POINTS = 115,
- ACHIEVEMENT_CRITERIA_TYPE_UNK118 = 118,
ACHIEVEMENT_CRITERIA_TYPE_USE_LFD_TO_GROUP_WITH_PLAYERS = 119,
- ACHIEVEMENT_CRITERIA_TYPE_UNK120 = 120,
- ACHIEVEMENT_CRITERIA_TYPE_UNK121 = 121,
- ACHIEVEMENT_CRITERIA_TYPE_UNK122 = 122,
- ACHIEVEMENT_CRITERIA_TYPE_UNK123 = 123,
ACHIEVEMENT_CRITERIA_TYPE_SPENT_GOLD_GUILD_REPAIRS = 124,
ACHIEVEMENT_CRITERIA_TYPE_REACH_GUILD_LEVEL = 125,
ACHIEVEMENT_CRITERIA_TYPE_CRAFT_ITEMS_GUILD = 126,
@@ -284,23 +282,11 @@ enum AchievementCriteriaTypes
ACHIEVEMENT_CRITERIA_TYPE_COMPLETE_QUESTS_GUILD = 134,
ACHIEVEMENT_CRITERIA_TYPE_HONORABLE_KILLS_GUILD = 135,
ACHIEVEMENT_CRITERIA_TYPE_KILL_CREATURE_TYPE_GUILD = 136,
- ACHIEVEMENT_CRITERIA_TYPE_UNK137 = 137,
- ACHIEVEMENT_CRITERIA_TYPE_UNK138 = 138, //struct { Flag flag; uint32 count; } 1: Guild Dungeon, 2:Guild Challenge, 3:Guild battlefield
- ACHIEVEMENT_CRITERIA_TYPE_UNK139 = 139, //struct { uint32 count; } Guild Challenge
- ACHIEVEMENT_CRITERIA_TYPE_UNK140 = 140,
- ACHIEVEMENT_CRITERIA_TYPE_UNK141 = 141,
- ACHIEVEMENT_CRITERIA_TYPE_UNK142 = 142,
- ACHIEVEMENT_CRITERIA_TYPE_UNK143 = 143,
- ACHIEVEMENT_CRITERIA_TYPE_UNK144 = 144,
- ACHIEVEMENT_CRITERIA_TYPE_UNK145 = 145,
- ACHIEVEMENT_CRITERIA_TYPE_UNK146 = 146,
- ACHIEVEMENT_CRITERIA_TYPE_UNK147 = 147,
- ACHIEVEMENT_CRITERIA_TYPE_UNK148 = 148,
- ACHIEVEMENT_CRITERIA_TYPE_UNK149 = 149,
- ACHIEVEMENT_CRITERIA_TYPE_UNK150 = 150,
+ ACHIEVEMENT_CRITERIA_TYPE_COMPLETE_GUILD_CHALLENGE_TYPE = 138, //struct { Flag flag; uint32 count; } 1: Guild Dungeon, 2:Guild Challenge, 3:Guild battlefield
+ ACHIEVEMENT_CRITERIA_TYPE_COMPLETE_GUILD_CHALLENGE = 139 //struct { uint32 count; } Guild Challenge
};
-#define ACHIEVEMENT_CRITERIA_TYPE_TOTAL 151
+#define ACHIEVEMENT_CRITERIA_TYPE_TOTAL 140
enum AreaFlags
{
diff --git a/src/server/game/Spells/Auras/SpellAuraDefines.h b/src/server/game/Spells/Auras/SpellAuraDefines.h
index c198f4c178b..84a25158e8a 100755
--- a/src/server/game/Spells/Auras/SpellAuraDefines.h
+++ b/src/server/game/Spells/Auras/SpellAuraDefines.h
@@ -289,7 +289,7 @@ enum AuraType
SPELL_AURA_PERIODIC_TRIGGER_SPELL_WITH_VALUE = 227,
SPELL_AURA_DETECT_STEALTH = 228,
SPELL_AURA_MOD_AOE_DAMAGE_AVOIDANCE = 229,
- SPELL_AURA_230 = 230,
+ SPELL_AURA_MOD_MAX_HEALTH = 230,
SPELL_AURA_PROC_TRIGGER_SPELL_WITH_VALUE = 231,
SPELL_AURA_MECHANIC_DURATION_MOD = 232,
SPELL_AURA_CHANGE_MODEL_FOR_ALL_HUMANOIDS = 233, // client-side only
@@ -417,7 +417,7 @@ enum AuraType
SPELL_AURA_355 = 355,
SPELL_AURA_356 = 356, // Arcane Mage mastery - mod damage based on current mana
SPELL_AURA_ENABLE_BOSS1_UNIT_FRAME = 357,
- SPELL_AURA_358 = 358,
+ SPELL_AURA_WORGEN_ALTERED_FORM = 358,
SPELL_AURA_359 = 359,
SPELL_AURA_PROC_TRIGGER_SPELL_COPY = 360, // Procs the same spell that caused this proc (Dragonwrath, Tarecgosa's Rest)
SPELL_AURA_PROC_TRIGGER_SPELL_2 = 361,
diff --git a/src/server/game/Spells/SpellMgr.cpp b/src/server/game/Spells/SpellMgr.cpp
index 337f7293cec..a596d4bf076 100644
--- a/src/server/game/Spells/SpellMgr.cpp
+++ b/src/server/game/Spells/SpellMgr.cpp
@@ -1424,10 +1424,10 @@ void SpellMgr::LoadSpellLearnSpells()
{
Field* fields = result->Fetch();
- uint32 spell_id = fields[0].GetUInt16();
+ uint32 spell_id = fields[0].GetUInt32();
SpellLearnSpellNode node;
- node.spell = fields[1].GetUInt16();
+ node.spell = fields[1].GetUInt32();
node.active = fields[2].GetBool();
node.autoLearned = false;
diff --git a/src/server/game/World/World.cpp b/src/server/game/World/World.cpp
index 39512aa155e..dc64c607c62 100644
--- a/src/server/game/World/World.cpp
+++ b/src/server/game/World/World.cpp
@@ -1888,7 +1888,6 @@ void World::LoadAutobroadcasts()
if (!result)
{
sLog->outInfo(LOG_FILTER_SERVER_LOADING, ">> Loaded 0 autobroadcasts definitions. DB table `autobroadcast` is empty!");
-
return;
}
@@ -1896,7 +1895,6 @@ void World::LoadAutobroadcasts()
do
{
-
Field* fields = result->Fetch();
std::string message = fields[0].GetString();
@@ -1905,8 +1903,7 @@ void World::LoadAutobroadcasts()
++count;
} while (result->NextRow());
- sLog->outInfo(LOG_FILTER_SERVER_LOADING, ">> Loaded %u autobroadcasts definitions in %u ms", count, GetMSTimeDiffToNow(oldMSTime));
-
+ sLog->outInfo(LOG_FILTER_SERVER_LOADING, ">> Loaded %u autobroadcast definitions in %u ms", count, GetMSTimeDiffToNow(oldMSTime));
}
/// Update the World !
diff --git a/src/server/scripts/Events/event.cpp b/src/server/scripts/Events/event.cpp
index 22334f8d365..d77ef2b78c1 100644
--- a/src/server/scripts/Events/event.cpp
+++ b/src/server/scripts/Events/event.cpp
@@ -15,8 +15,6 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "ScriptPCH.h"
-
void AddSC_event_childrens_week();
void AddSC_event_scripts()
diff --git a/src/server/worldserver/CMakeLists.txt b/src/server/worldserver/CMakeLists.txt
index 0ea5a562732..0ab3d7715c7 100644
--- a/src/server/worldserver/CMakeLists.txt
+++ b/src/server/worldserver/CMakeLists.txt
@@ -149,7 +149,6 @@ endif()
add_dependencies(worldserver revision.h)
-
if( UNIX AND NOT NOJEM )
set(worldserver_LINK_FLAGS "-pthread -lncurses ${worldserver_LINK_FLAGS}")
endif()
diff --git a/src/tools/vmap4_assembler/CMakeLists.txt b/src/tools/vmap4_assembler/CMakeLists.txt
index f0f2e88c471..871624620ce 100644
--- a/src/tools/vmap4_assembler/CMakeLists.txt
+++ b/src/tools/vmap4_assembler/CMakeLists.txt
@@ -24,10 +24,6 @@ add_definitions(-DNO_CORE_FUNCS)
add_executable(vmap4assembler VMapAssembler.cpp)
add_dependencies(vmap4assembler storm)
-if(CMAKE_SYSTEM_NAME MATCHES "Darwin")
- set_target_properties(vmap4assembler PROPERTIES LINK_FLAGS "-framework Carbon")
-endif()
-
target_link_libraries(vmap4assembler
collision
g3dlib