Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Minor fix and description when removing debuffs by status_change_clear_buffs.

Browse Source 
Follow up: r16979
* Reverted r16930. (bugreport: 6939)

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16980 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
markzd 2012-11-29 15:19:56 +00:00
parent d20b06eeec
commit 02613ae097
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/char/char.c
View File

@ -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) {

5
src/map/status.c
View File

@ -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: