From 2bc59ef9db7a86d0c483e3848ead57d6d691e6a3 Mon Sep 17 00:00:00 2001 From: ultramage Date: Thu, 18 Oct 2007 21:25:26 +0000 Subject: Fixed numerous /W4 warnings (and created more :) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@11514 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/map/battle.h | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'src/map/battle.h') diff --git a/src/map/battle.h b/src/map/battle.h index abd877785..e7d385b3c 100644 --- a/src/map/battle.h +++ b/src/map/battle.h @@ -11,7 +11,7 @@ struct Damage { int amotion,dmotion; int blewcount; int flag; - int dmg_lv; //ATK_LUCKY,ATK_FLEE,ATK_DEF + enum damage_lv dmg_lv; //ATK_LUCKY,ATK_FLEE,ATK_DEF }; // 属性表（読み込みはpc.c、battle_attr_fixで使用） @@ -48,11 +48,10 @@ 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, int dmg_lv, int ddelay); +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_weapon_attack( struct block_list *bl,struct block_list *target, - unsigned int tick,int flag); +enum damage_lv battle_weapon_attack( struct block_list *bl,struct block_list *target,unsigned int tick,int flag); // 各種パラメータを得る struct block_list* battle_get_master(struct block_list *src); -- cgit v1.2.3-70-g09d2