* [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

@@ -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]

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

vcproj-7.1/map-server_sql.vcproj

@@ -215,6 +215,9 @@
 			<File
 				RelativePath="..\src\common\mapindex.c">
 			</File>
+			<File
+				RelativePath="..\src\map\mercenary.c">
+			</File>
 			<File
 				RelativePath="..\src\map\mob.c">
 			</File>

vcproj-7.1/map-server_txt.vcproj

@@ -216,6 +216,9 @@
 			<File
 				RelativePath="..\src\common\mapindex.c">
 			</File>
+			<File
+				RelativePath="..\src\map\mercenary.c">
+			</File>
 			<File
 				RelativePath="..\src\map\mob.c">
 			</File>