diff options
author | zephyrus <zephyrus@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2008-02-04 18:23:57 +0000 |
---|---|---|
committer | zephyrus <zephyrus@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2008-02-04 18:23:57 +0000 |
commit | 8214af442ea63919d69d368221ae2d61456488b9 (patch) | |
tree | 9efad3f11ace58a29ad05c0c3c9e9fa31964def8 /src/map/status.c | |
parent | 46ca642c09468dbc52ca390c8f1d368e7ffa2966 (diff) | |
download | hercules-8214af442ea63919d69d368221ae2d61456488b9.tar.gz hercules-8214af442ea63919d69d368221ae2d61456488b9.tar.bz2 hercules-8214af442ea63919d69d368221ae2d61456488b9.tar.xz hercules-8214af442ea63919d69d368221ae2d61456488b9.zip |
- 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
Diffstat (limited to 'src/map/status.c')
-rw-r--r-- | src/map/status.c | 21 |
1 files changed, 11 insertions, 10 deletions
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; |