diff options
| author | markzd <markzd@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-11-29 15:19:56 +0000 |
|---|---|---|
| committer | markzd <markzd@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-11-29 15:19:56 +0000 |
| commit | 696d2aea3b88758811b275f28a9ea555747e3d6b (patch) | |
| tree | 0646e8ce9ba58756bdd40f7ed88693e368c06373 | |
| parent | 25db581cb0a540c7264f28ad086d0963cc8f4f40 (diff) | |
| download | hercules-696d2aea3b88758811b275f28a9ea555747e3d6b.tar.gz hercules-696d2aea3b88758811b275f28a9ea555747e3d6b.tar.bz2 hercules-696d2aea3b88758811b275f28a9ea555747e3d6b.tar.xz hercules-696d2aea3b88758811b275f28a9ea555747e3d6b.zip | |
* Minor fix and description when removing debuffs by status_change_clear_buffs.
Follow up: r16979
* Reverted r16930. (bugreport: 6939)
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16980 54d463be-8e91-2dee-dedb-b68131a5f0ec
| -rw-r--r-- | src/char/char.c | 2 | ||||
| -rw-r--r-- | src/map/status.c | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/src/char/char.c b/src/char/char.c index 0db64bf07..4ef50375f 100644 --- a/src/char/char.c +++ b/src/char/char.c @@ -1448,8 +1448,6 @@ int make_new_char_sql(struct char_session_data *sd, char *name_, int str, int ag #endif return -2; // invalid input - if (hair_style > 17 || hair_color > 8) - return -2; // check the number of already existing chars in this account if (char_per_account != 0) { diff --git a/src/map/status.c b/src/map/status.c index 7a8f576da..f01bce10c 100644 --- a/src/map/status.c +++ b/src/map/status.c @@ -10557,6 +10557,7 @@ int status_change_timer_sub(struct block_list *bl, va_list ap) /*========================================== * Clears buffs/debuffs of a character. * type&1 -> buffs, type&2 -> debuffs + * type&4 -> especific debuffs(implemented with refresh) *------------------------------------------*/ int status_change_clear_buffs(struct block_list *bl, int type) { @@ -10571,7 +10572,7 @@ int status_change_clear_buffs(struct block_list *bl, int type) if(sc->data[i]) status_change_end(bl, (sc_type)i, INVALID_TIMER); } - if(type&6) //Toxins + if(type&4) //Toxins for (i = SC_TOXIN; i <= SC_LEECHESEND; ++i) { if (sc->data[i]) status_change_end(bl, (sc_type)i, INVALID_TIMER); @@ -10641,7 +10642,7 @@ int status_change_clear_buffs(struct block_list *bl, int type) case SC_DEEPSLEEP: case SC_MANDRAGORA: case SC_MARSHOFABYSS: - if(!(type&6)) + if(!(type&4)) continue; break; case SC_QUAGMIRE: |