summaryrefslogtreecommitdiff
path: root/src/map/unit.h
diff options
context:
space:
mode:
authorskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-09-07 17:40:46 +0000
committerskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-09-07 17:40:46 +0000
commit8cf58f2846e8a701fe61a149c5bf532732572780 (patch)
tree6492a544f57cffc01af8cd22a0e96dfbc1fe020a /src/map/unit.h
parent79f357bf323dbd91529bafe78160149851902377 (diff)
downloadhercules-8cf58f2846e8a701fe61a149c5bf532732572780.tar.gz
hercules-8cf58f2846e8a701fe61a149c5bf532732572780.tar.bz2
hercules-8cf58f2846e8a701fe61a149c5bf532732572780.tar.xz
hercules-8cf58f2846e8a701fe61a149c5bf532732572780.zip
- Removed the Warmth "stacking" code.
- Added back the effect of /doridori to skill-SP regen - Implemented a rough version of Angel of the Sun/Moon/Stars, it has a low chance of triggering on doridori-boosted SP-regen events. - Added sg_angel_skill_ratio to specify rate at which the Angel skill triggers. - Added unit_cancel_combo which takes care of ending a combo time and resuming normal attack 'inmediately' - Cleaned up some the SG_HATE code, you can't change hate targets anymore. - Increased duration of Miracle of the Sun/Moon/Stars to one hour. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8664 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/unit.h')
-rw-r--r--src/map/unit.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/map/unit.h b/src/map/unit.h
index 1e4ff3956..7331f4ca5 100644
--- a/src/map/unit.h
+++ b/src/map/unit.h
@@ -37,8 +37,7 @@ int unit_can_reach_bl(struct block_list *bl,struct block_list *tbl, int range, i
// 攻撃関連
int unit_stop_attack(struct block_list *bl);
int unit_attack(struct block_list *src,int target_id,int type);
-
-// int unit_setpos( struct block_list *bl, const char* map, int x, int y);
+int unit_cancel_combo(struct block_list *bl);
// スキル使用
int unit_skilluse_id(struct block_list *src, int target_id, int skill_num, int skill_lv);