diff options
| author | Jared Adams <jaxad0127@gmail.com> | 2009-07-06 14:33:18 -0600 |
|---|---|---|
| committer | Jared Adams <jaxad0127@gmail.com> | 2009-07-06 14:33:18 -0600 |
| commit | 2855e018b8e177878ca0d83c61e4442ddf3e505c (patch) | |
| tree | 8521b323327952857072214e5a5cbb9195601cb5 /src/map/battle.h | |
| parent | 2e87e5b65a02d8d9f867a0510f039cc319b3ffcb (diff) | |
| download | tmwa-2855e018b8e177878ca0d83c61e4442ddf3e505c.tar.gz tmwa-2855e018b8e177878ca0d83c61e4442ddf3e505c.tar.bz2 tmwa-2855e018b8e177878ca0d83c61e4442ddf3e505c.tar.xz tmwa-2855e018b8e177878ca0d83c61e4442ddf3e505c.zip | |
Revert "Add a new trade spam system"
This reverts commit 2e87e5b65a02d8d9f867a0510f039cc319b3ffcb.
Diffstat (limited to 'src/map/battle.h')
| -rw-r--r-- | src/map/battle.h | 31 |
1 files changed, 13 insertions, 18 deletions
diff --git a/src/map/battle.h b/src/map/battle.h index 3a0c380..3c46586 100644 --- a/src/map/battle.h +++ b/src/map/battle.h @@ -2,24 +2,24 @@ #ifndef _BATTLE_H_ #define _BATTLE_H_ -// �_���[�W +// _[W struct Damage { int damage,damage2; int type,div_; int amotion,dmotion; int blewcount; int flag; - int dmg_lv; //�͂܂ꌸ�Z�v�Z�p�@0:�X�L���U�� ATK_LUCKY,ATK_FLEE,ATK_DEF + int dmg_lv; //͂܂ꌸZvZp@0:XLU ATK_LUCKY,ATK_FLEE,ATK_DEF }; -// �����\�i�ǂݍ��݂�pc.c�Abattle_attr_fix�Ŏg�p�j +// \iǂݍ݂pc.cAbattle_attr_fixŎgpj extern int attr_fix_table[4][10][10]; struct map_session_data; struct mob_data; struct block_list; -// �_���[�W�v�Z +// _[WvZ struct Damage battle_calc_attack( int attack_type, struct block_list *bl,struct block_list *target,int skill_num,int skill_lv,int flag); @@ -30,12 +30,12 @@ struct Damage battle_calc_magic_attack( struct Damage battle_calc_misc_attack( struct block_list *bl,struct block_list *target,int skill_num,int skill_lv,int flag); -// �����C���v�Z +// CvZ int battle_attr_fix(int damage,int atk_elem,int def_elem); -// �_���[�W�ŏI�v�Z +// _[WŏIvZ int battle_calc_damage(struct block_list *src,struct block_list *bl,int damage,int div_,int skill_num,int skill_lv,int flag); -enum { // �ŏI�v�Z�̃t���O +enum { // ŏIvZ̃tO BF_WEAPON = 0x0001, BF_MAGIC = 0x0002, BF_MISC = 0x0004, @@ -48,20 +48,20 @@ enum { // �ŏI�v�Z�̃t���O BF_SKILLMASK= 0x0f00, }; -// ��ۂ�HP�� +// ۂHP int battle_delay_damage(unsigned int tick,struct block_list *src,struct block_list *target,int damage,int flag); int battle_damage(struct block_list *bl,struct block_list *target,int damage,int flag); int battle_heal(struct block_list *bl,struct block_list *target,int hp,int sp,int flag); -// �U�����ړ����~�߂� +// Uړ~߂ int battle_stopattack(struct block_list *bl); int battle_stopwalking(struct block_list *bl,int type); -// �ʏ��U�������܂Ƃ� +// ʏU܂Ƃ int battle_weapon_attack( struct block_list *bl,struct block_list *target, unsigned int tick,int flag); -// �e���p�����[�^�� +// ep[^ int battle_counttargeted(struct block_list *bl,struct block_list *src,int target_lv); int battle_get_class(struct block_list *bl); int battle_get_dir(struct block_list *bl); @@ -91,7 +91,7 @@ int battle_get_amotion(struct block_list *bl); int battle_get_dmotion(struct block_list *bl); int battle_get_element(struct block_list *bl); int battle_get_attack_element(struct block_list *bl); -int battle_get_attack_element2(struct block_list *bl); //���蕐�푮���擾 +int battle_get_attack_element2(struct block_list *bl); //蕐푮擾 #define battle_get_elem_type(bl) (battle_get_element(bl)%10) #define battle_get_elem_level(bl) (battle_get_element(bl)/10/2) int battle_get_party_id(struct block_list *bl); @@ -122,7 +122,7 @@ int battle_check_target( struct block_list *src, struct block_list *target,int f int battle_check_range(struct block_list *src,struct block_list *bl,int range); -// �ݒ� +// ݒ int battle_config_switch(const char *str); // [Valaris] @@ -318,11 +318,6 @@ extern struct Battle_Config { int chat_spam_ban; int chat_spam_warn; int chat_maxline; - - int trade_spam_threshold; - int trade_spam_flood; - int trade_spam_ban; - int trade_spam_warn; int drop_pickup_safety_zone; // [Fate] Max. distance to an object dropped by a kill by self in which dropsteal protection works |