- Changed clif_damage/clif_skill_damage to return the walk-delay based on the passed on damage-delay.

- Changed battle_damage to accept the walk-delay as well.
- Removed the walk-delay timers from unit.c, merged them to battle_delay_damage.
- Traps will not be displayed when you walk within their range.
- Added HT_DETECTING revealing traps.


git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@5997 54d463be-8e91-2dee-dedb-b68131a5f0ec

1 files changed, 2 insertions, 3 deletions

diff --git a/src/map/battle.h b/src/map/battle.h
index c7b913b54..1cae169d6 100644
--- a/src/map/battle.h
+++ b/src/map/battle.h
@@ -46,9 +46,8 @@ enum {	// 最終計算のフラグ
 	BF_SKILLMASK= 0x0f00,

 };

 

-// 実際にHPを増減

-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, int dmg_lv, int flag);

-int battle_damage(struct block_list *bl,struct block_list *target,int damage,int flag);

+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, int dmg_lv, int ddelay, int flag);

+int battle_damage(struct block_list *bl,struct block_list *target,int damage,int walkdelay,int flag);

 int battle_heal(struct block_list *bl,struct block_list *target,int hp,int sp,int flag);