From c9e5567e98cf7e26c549f4a512eeece24a0d9c81 Mon Sep 17 00:00:00 2001 From: Fate <fate-tmw@googlemail.com> Date: Sun, 7 Dec 2008 01:47:02 -0700 Subject: Report all status changes --- src/map/clif.c | 1 - src/map/skill.c | 12 ++++++++++++ src/map/skill.h | 2 +- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/src/map/clif.c b/src/map/clif.c index ab64c2d..653865b 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -799,7 +799,6 @@ static int clif_set0078(struct map_session_data *sd, unsigned char *buf) { */ static int clif_set007b(struct map_session_data *sd,unsigned char *buf) { int level=0; - nullpo_retr(0, sd); if (sd->disguise > 23 && sd->disguise < 4001) { // mob disguises [Valaris] diff --git a/src/map/skill.c b/src/map/skill.c index 460a328..29e084c 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -7820,6 +7820,16 @@ int skill_status_change_end(struct block_list* bl, int type, int tid) opt_flag = 1; break; + case SC_SPEEDPOTION0: + *opt2 &= ~0x20; + opt_flag = 1; + break; + + case SC_ATKPOT: + *opt2 &= ~0x80; + opt_flag = 1; + break; + case SC_HIDING: case SC_CLOAKING: *option &= ~((type == SC_HIDING) ? 2 : 4); @@ -8677,6 +8687,7 @@ int skill_status_effect(struct block_list *bl, int type, int val1, int val2, int break; case SC_SPEEDPOTION0: /* �����|�[�V���� */ + *opt2 |= 0x20; case SC_SPEEDPOTION1: case SC_SPEEDPOTION2: calc_flag = 1; @@ -8686,6 +8697,7 @@ int skill_status_effect(struct block_list *bl, int type, int val1, int val2, int /* atk & matk potions [Valaris] */ case SC_ATKPOT: + *opt2 |= 0x80; case SC_MATKPOT: calc_flag = 1; tick = 1000 * tick; diff --git a/src/map/skill.h b/src/map/skill.h index 03db31a..3dbf107 100644 --- a/src/map/skill.h +++ b/src/map/skill.h @@ -183,7 +183,7 @@ enum { enum { // struct map_session_data �� status_change�̔ԍ��e�[�u�� // SC_SENDMAX�����̓N���C�A���g�ւ̒ʒm����B // 2-2���E�̒l�͂Ȃ߂��Ⴍ������ۂ��̂Ŏb��B���Ԃ�ύX����܂��B - SC_SENDMAX =128, + SC_SENDMAX = 256, SC_PROVOKE = 0, SC_ENDURE = 1, SC_TWOHANDQUICKEN = 2, -- cgit v1.2.3-70-g09d2