From 8214af442ea63919d69d368221ae2d61456488b9 Mon Sep 17 00:00:00 2001 From: zephyrus Date: Mon, 4 Feb 2008 18:23:57 +0000 Subject: - Some code cleanups. - Added new Cell types (NoChat and NoDamage) - Added JobChangeLevel and FreeSKPoints to #stats - Added a Crash protection in clif_send with invalid fd values. - Merged a missing update in TK Mission. - Added script command 'getmapflag' - Merged some new Status Change to Stable. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@12175 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/map/status.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) (limited to 'src/map/status.c') diff --git a/src/map/status.c b/src/map/status.c index 6ea757d2b..4b1144d49 100644 --- a/src/map/status.c +++ b/src/map/status.c @@ -6825,6 +6825,17 @@ int status_change_timer(int tid, unsigned int tick, int id, int data) } break; + case SC_KNOWLEDGE: + if (!sd) break; + if(bl->m == sd->feel_map[0].m || + bl->m == sd->feel_map[1].m || + bl->m == sd->feel_map[2].m) + { //Timeout will be handled by pc_setpos + sce->timer = INVALID_TIMER; + return 0; + } + break; + case SC_HPREGEN: if( sd && --(sce->val4) >= 0 ) { @@ -6837,16 +6848,6 @@ int status_change_timer(int tid, unsigned int tick, int id, int data) } break; - case SC_KNOWLEDGE: - if (!sd) break; - if(bl->m == sd->feel_map[0].m || - bl->m == sd->feel_map[1].m || - bl->m == sd->feel_map[2].m) - { //Timeout will be handled by pc_setpos - sce->timer = INVALID_TIMER; - return 0; - } - break; case SC_DANCING: //ダンススキルの時間SP消費 { int s = 0; -- cgit v1.2.3-60-g2f50