From 40f2aa9cc5a42bdb2cecb1993d8e4702f54f5129 Mon Sep 17 00:00:00 2001 From: Lance Date: Tue, 30 May 2006 17:11:55 +0000 Subject: [PATCH] * [Added] - Visual Studio .NET 2003 includes for mercenary.c * [Fixed] - Logic error in NPC custom AI in unit.c git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@6853 54d463be-8e91-2dee-dedb-b68131a5f0ec --- Changelog-Trunk.txt | 2 ++ src/map/unit.c | 2 +- vcproj-7.1/map-server_sql.vcproj | 3 +++ vcproj-7.1/map-server_txt.vcproj | 3 +++ 4 files changed, 9 insertions(+), 1 deletion(-) diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index 169576f000..3d7fe3df15 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -4,6 +4,8 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK. 2006/05/30 + * [Added]: + - Visual Studio .NET 2003 includes for mercenary.c [Lance] * Removed the on-die specific code from unit_remove_map and placed it on the corresponding *_dead functions. unit_remove_map should never assume the char died, it is just a "remove from map" function. [Skotlex] diff --git a/src/map/unit.c b/src/map/unit.c index 78e403aeaa..879a73beb3 100644 --- a/src/map/unit.c +++ b/src/map/unit.c @@ -1079,7 +1079,7 @@ int unit_attack(struct block_list *src,int target_id,int type) return 0; } - if(!(src->type == BL_MOB && !((TBL_MOB *)src)->state.killer) && (battle_check_target(src,target,BCT_ENEMY)<=0 || + if(!(src->type == BL_MOB && ((TBL_MOB *)src)->state.killer) && (battle_check_target(src,target,BCT_ENEMY)<=0 || !status_check_skilluse(src, target, 0, 0)) ) { unit_unattackable(src); diff --git a/vcproj-7.1/map-server_sql.vcproj b/vcproj-7.1/map-server_sql.vcproj index 32fa2e42a1..ba6888a188 100644 --- a/vcproj-7.1/map-server_sql.vcproj +++ b/vcproj-7.1/map-server_sql.vcproj @@ -215,6 +215,9 @@ + + diff --git a/vcproj-7.1/map-server_txt.vcproj b/vcproj-7.1/map-server_txt.vcproj index f2422f6ef4..0765027463 100644 --- a/vcproj-7.1/map-server_txt.vcproj +++ b/vcproj-7.1/map-server_txt.vcproj @@ -216,6 +216,9 @@ + +