summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFate <fate-tmw@googlemail.com>2008-12-07 01:47:02 -0700
committerFate <fate-tmw@googlemail.com>2008-12-07 01:47:02 -0700
commitc9e5567e98cf7e26c549f4a512eeece24a0d9c81 (patch)
treeffbf7d720f96a25a1f25a72522d0863d6dfecac3
parent882a84b4d1ab5fb30265b5c9aa14abb20d515da9 (diff)
downloadtmwa-c9e5567e98cf7e26c549f4a512eeece24a0d9c81.tar.gz
tmwa-c9e5567e98cf7e26c549f4a512eeece24a0d9c81.tar.bz2
tmwa-c9e5567e98cf7e26c549f4a512eeece24a0d9c81.tar.xz
tmwa-c9e5567e98cf7e26c549f4a512eeece24a0d9c81.zip
Report all status changes
-rw-r--r--src/map/clif.c1
-rw-r--r--src/map/skill.c12
-rw-r--r--src/map/skill.h2
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: /* 増速ポーション */
+ *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の番号テーブル
// SC_SENDMAX未満はクライアントへの通知あり。
// 2-2次職の値はなんかめちゃくちゃっぽいので暫定。たぶん変更されます。
- SC_SENDMAX =128,
+ SC_SENDMAX = 256,
SC_PROVOKE = 0,
SC_ENDURE = 1,
SC_TWOHANDQUICKEN = 2,