diff options
author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2008-03-09 20:11:14 +0000 |
---|---|---|
committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2008-03-09 20:11:14 +0000 |
commit | 203b881a3f76e822a0052e58c67bf46ba6ad0596 (patch) | |
tree | 9f918bdf4a68aa659f3c5c45186e198cbe2388b5 /src/map/battle.h | |
parent | a3e718b798e8b7c5848b58a7646a783ac0163364 (diff) | |
download | hercules-203b881a3f76e822a0052e58c67bf46ba6ad0596.tar.gz hercules-203b881a3f76e822a0052e58c67bf46ba6ad0596.tar.bz2 hercules-203b881a3f76e822a0052e58c67bf46ba6ad0596.tar.xz hercules-203b881a3f76e822a0052e58c67bf46ba6ad0596.zip |
- Modified attack_walk_delay so it behaves on a 'per-object' basis, and changed the default to 15 (all types).
- Modified battle_delay_damage so damage is not delayed more than one second for non-player attacks.
- Modified party_member_added with a hack so that the clif functions will send the info of the new member since party_recv_info has not yet arrived.
- Updated clif_calc_delay so the type sent to the client is based on the number of hits of the skill (as Aegis packets reveal)
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@12332 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/battle.h')
-rw-r--r-- | src/map/battle.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/map/battle.h b/src/map/battle.h index 9c7bd2fb0..287b4ed61 100644 --- a/src/map/battle.h +++ b/src/map/battle.h @@ -55,7 +55,7 @@ enum { // 最終計算のフラグ BF_SKILLMASK= 0x0f00, }; -int battle_delay_damage (unsigned int tick, struct block_list *src, struct block_list *target, int attack_type, int skill_id, int skill_lv, int damage, enum damage_lv dmg_lv, int ddelay); +int battle_delay_damage (unsigned int tick, int amotion, struct block_list *src, struct block_list *target, int attack_type, int skill_id, int skill_lv, int damage, enum damage_lv dmg_lv, int ddelay); // 通常攻撃処理まとめ enum damage_lv battle_weapon_attack( struct block_list *bl,struct block_list *target,unsigned int tick,int flag); |