diff --git a/utils/pfs_list/CMakeLists.txt b/utils/pfs_list/CMakeLists.txt index 063cf5079..2bac1ac69 100644 --- a/utils/pfs_list/CMakeLists.txt +++ b/utils/pfs_list/CMakeLists.txt @@ -8,7 +8,6 @@ ENDIF(NOT CMAKE_BUILD_TYPE) IF(WIN32) ADD_DEFINITIONS(/D _CRT_SECURE_NO_WARNINGS) - ADD_DEFINITIONS(/WX) ENDIF(WIN32) SET(ZLIB_ROOT, "${CMAKE_CURRENT_SOURCE_DIR}/zlib") diff --git a/utils/sql/git/required/2013_07_11_NPC_Special_Abilities.sql b/utils/sql/git/required/2013_07_11_NPC_Special_Abilities.sql index 772303d29..dfcdfd552 100644 --- a/utils/sql/git/required/2013_07_11_NPC_Special_Abilities.sql +++ b/utils/sql/git/required/2013_07_11_NPC_Special_Abilities.sql @@ -34,6 +34,7 @@ UPDATE npc_types SET special_abilities = CONCAT(special_abilities, "31,1^") WHER UPDATE npc_types SET special_abilities = CONCAT(special_abilities, "32,1^") WHERE npcspecialattks LIKE BINARY '%J%'; UPDATE npc_types SET special_abilities = CONCAT(special_abilities, "33,1^") WHERE npcspecialattks LIKE BINARY '%j%'; UPDATE npc_types SET special_abilities = CONCAT(special_abilities, "34,1^") WHERE npcspecialattks LIKE BINARY '%o%'; +UPDATE npc_types SET special_abilities = CONCAT(special_abilities, "35,1^") WHERE npcspecialattks LIKE BINARY '%Z%'; UPDATE npc_types SET special_abilities = TRIM(TRAILING '^' FROM special_abilities); ALTER TABLE `npc_types` DROP COLUMN `npcspecialattks`; \ No newline at end of file diff --git a/zone/questmgr.cpp b/zone/questmgr.cpp index ad08593ae..06cd6b2cf 100644 --- a/zone/questmgr.cpp +++ b/zone/questmgr.cpp @@ -1631,7 +1631,7 @@ void QuestManager::disable_proximity_say() { void QuestManager::setanim(int npc_type, int animnum) { //adds appearance changes Mob* thenpc = entity_list.GetMobByNpcTypeID(npc_type); - if(animnum < 0 || animnum >= _eaMaxAppearance) + if(!thenpc || animnum < 0 || animnum >= _eaMaxAppearance) return; thenpc->SetAppearance(EmuAppearance(animnum)); }