Fix for special atk sql missing a type.

Fix for a crash in quest manager setanim.
Fix for pfs_list not compiling on x64 windows.
This commit is contained in:
KimLS 2013-08-10 14:17:06 -07:00
parent 926e2f7939
commit 406e2f84eb
3 changed files with 2 additions and 2 deletions

View File

@ -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")

View File

@ -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`;

View File

@ -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));
}