summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Changelog-Trunk.txt4
-rw-r--r--src/map/skill.c4
-rw-r--r--vcproj-8/map-server_sql.vcproj4
-rw-r--r--vcproj-8/map-server_txt.vcproj4
4 files changed, 16 insertions, 0 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 032105267..914589111 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -4,6 +4,10 @@ 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. EVERYTHING ELSE
GOES INTO TRUNK AND WILL BE MERGED INTO STABLE BY VALARIS AND WIZPUTER. -- VALARIS
+2006/03/24
+ * Added unit.c to the VC8 project files. Thanks to Joshuaali [Skotlex]
+ * Fixed Magnum-break/GrandCross displaying multiple times the skill effect
+ (once per target) [Skotlex]
2006/03/23
* Fixed a crash in unit_useskill_pos2 [Skotlex]
* Updated mob_db.sql and item_db.sql to current txt versions. [Skotlex]
diff --git a/src/map/skill.c b/src/map/skill.c
index 9aee1a01a..5ae210054 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -1868,7 +1868,11 @@ int skill_attack( int attack_type, struct block_list* src, struct block_list *ds
//武器スキル?ここまで
switch(skillid){
+ //Skills who's damage should't show any skill-animation.
+ case SM_MAGNUM:
case AS_SPLASHER:
+ case CR_GRANDCROSS:
+ case NPC_GRANDDARKNESS:
case ASC_METEORASSAULT:
case SG_SUN_WARM:
case SG_MOON_WARM:
diff --git a/vcproj-8/map-server_sql.vcproj b/vcproj-8/map-server_sql.vcproj
index 6e671f3f3..b0611cb2a 100644
--- a/vcproj-8/map-server_sql.vcproj
+++ b/vcproj-8/map-server_sql.vcproj
@@ -367,6 +367,10 @@
>
</File>
<File
+ RelativePath="..\src\map\unit.c"
+ >
+ </File>
+ <File
RelativePath="..\src\zlib\unzip.c"
>
</File>
diff --git a/vcproj-8/map-server_txt.vcproj b/vcproj-8/map-server_txt.vcproj
index 2d15d3754..a4b517b55 100644
--- a/vcproj-8/map-server_txt.vcproj
+++ b/vcproj-8/map-server_txt.vcproj
@@ -369,6 +369,10 @@
>
</File>
<File
+ RelativePath="..\src\map\unit.c"
+ >
+ </File>
+ <File
RelativePath="..\src\zlib\unzip.c"
>
</File>