summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Changelog-Trunk.txt2
-rw-r--r--src/map/unit.c2
-rw-r--r--vcproj-7.1/map-server_sql.vcproj3
-rw-r--r--vcproj-7.1/map-server_txt.vcproj3
4 files changed, 9 insertions, 1 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 169576f00..3d7fe3df1 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 78e403aea..879a73beb 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 32fa2e42a..ba6888a18 100644
--- a/vcproj-7.1/map-server_sql.vcproj
+++ b/vcproj-7.1/map-server_sql.vcproj
@@ -216,6 +216,9 @@
RelativePath="..\src\common\mapindex.c">
</File>
<File
+ RelativePath="..\src\map\mercenary.c">
+ </File>
+ <File
RelativePath="..\src\map\mob.c">
</File>
<File
diff --git a/vcproj-7.1/map-server_txt.vcproj b/vcproj-7.1/map-server_txt.vcproj
index f2422f6ef..076502746 100644
--- a/vcproj-7.1/map-server_txt.vcproj
+++ b/vcproj-7.1/map-server_txt.vcproj
@@ -217,6 +217,9 @@
RelativePath="..\src\common\mapindex.c">
</File>
<File
+ RelativePath="..\src\map\mercenary.c">
+ </File>
+ <File
RelativePath="..\src\map\mob.c">
</File>
<File