diff options
| author | momacabu <momacabu@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-11-23 03:28:54 +0000 |
|---|---|---|
| committer | momacabu <momacabu@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-11-23 03:28:54 +0000 |
| commit | fa0e7ac66029cda08041f6ed9410bbafbe7a58b7 (patch) | |
| tree | 0619f522069213662959253e02d4aba7d0613091 /src/map/status.c | |
| parent | bd4e344a476439af984995540cb3d037752981c8 (diff) | |
| download | hercules-fa0e7ac66029cda08041f6ed9410bbafbe7a58b7.tar.gz hercules-fa0e7ac66029cda08041f6ed9410bbafbe7a58b7.tar.bz2 hercules-fa0e7ac66029cda08041f6ed9410bbafbe7a58b7.tar.xz hercules-fa0e7ac66029cda08041f6ed9410bbafbe7a58b7.zip | |
- Temporary fix for bugreport:1023, where various 'next' buttons would pop --for now let's display everything in one single "page";
- Fixed something related to bugreport:1900 (but not only); added a new flag to status_change_clear to include some status as SC_WEIGHT50, SC_PUSH_CART, which shouldn't be removed by sc_end script command.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16948 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/status.c')
| -rw-r--r-- | src/map/status.c | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/src/map/status.c b/src/map/status.c index 9e3b642d6..10431bace 100644 --- a/src/map/status.c +++ b/src/map/status.c @@ -8841,6 +8841,7 @@ int status_change_start(struct block_list* bl,enum sc_type type,int rate,int val * 0 - PC killed -> Place here statuses that do not dispel on death. * 1 - If for some reason status_change_end decides to still keep the status when quitting. * 2 - Do clif + * 3 - Do not remove some permanent/time-independent effects *------------------------------------------*/ int status_change_clear(struct block_list* bl, int type) { @@ -8910,6 +8911,18 @@ int status_change_clear(struct block_list* bl, int type) continue; } + + if( type == 3 ) + { + switch (i) + {// TODO: This list may be incomplete + case SC_WEIGHT50: + case SC_WEIGHT90: + case SC_NOCHAT: + case SC_PUSH_CART: + continue; + } + } status_change_end(bl, (sc_type)i, INVALID_TIMER); |