diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-12-14 02:57:54 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-12-14 02:57:54 +0000 |
| commit | aeabd9b6ae7cd6b59d6c8d85609559f132a464ee (patch) | |
| tree | 79ddc466e006c81588c42743fada8e8e6bcf9164 /src/map/status.c | |
| parent | 89097fc76e350f210c6e7ae7cd0fe26bf60ec026 (diff) | |
| download | hercules-aeabd9b6ae7cd6b59d6c8d85609559f132a464ee.tar.gz hercules-aeabd9b6ae7cd6b59d6c8d85609559f132a464ee.tar.bz2 hercules-aeabd9b6ae7cd6b59d6c8d85609559f132a464ee.tar.xz hercules-aeabd9b6ae7cd6b59d6c8d85609559f132a464ee.zip | |
- corrected Option_Xmas value in const.txt
- Wand of Hermode now dispells buffs only of allies.
- Fixed some null pointer checks in status_change_end.
- Corrected a crashy Warning message.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@11910 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/status.c')
| -rw-r--r-- | src/map/status.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/src/map/status.c b/src/map/status.c index f9237f565..91ae9eb06 100644 --- a/src/map/status.c +++ b/src/map/status.c @@ -5552,10 +5552,6 @@ int status_change_start(struct block_list* bl,enum sc_type type,int rate,int val val2 = 50*val1; //aspd reduction break; - case SC_HERMODE: - status_change_clear_buffs(bl,1); - break; - case SC_REGENERATION: if (val1 == 1) val2 = 2; @@ -6206,10 +6202,8 @@ int status_change_end(struct block_list* bl, enum sc_type type, int tid) sc = status_get_sc(bl); status = status_get_status_data(bl); - nullpo_retr(0,sc); - nullpo_retr(0,status); - if(type < 0 || type >= SC_MAX || !(sce = sc->data[type])) + if(type < 0 || type >= SC_MAX || !sc || !(sce = sc->data[type])) return 0; BL_CAST(BL_PC,bl,sd); |