diff options
| author | shennetsind <ind@henn.et> | 2013-07-29 15:09:31 -0300 |
|---|---|---|
| committer | shennetsind <ind@henn.et> | 2013-07-29 15:09:31 -0300 |
| commit | 640c66779d8da4baa8af6bd0fee2583ec2b6143c (patch) | |
| tree | e9df09e06fd350b36b57e4fc8751db9432d0fdc9 /src/map/status.c | |
| parent | 30cce75c040c211fccb0cf53f2ff572509b5a0aa (diff) | |
| download | hercules-640c66779d8da4baa8af6bd0fee2583ec2b6143c.tar.gz hercules-640c66779d8da4baa8af6bd0fee2583ec2b6143c.tar.bz2 hercules-640c66779d8da4baa8af6bd0fee2583ec2b6143c.tar.xz hercules-640c66779d8da4baa8af6bd0fee2583ec2b6143c.zip | |
Fixed Bug #7597 / Follow up b7171479a47490ff80bf04849f763158d6d96fac
http://hercules.ws/board/tracker/issue-7597-server-crash/
Signed-off-by: shennetsind <ind@henn.et>
Diffstat (limited to 'src/map/status.c')
| -rw-r--r-- | src/map/status.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/map/status.c b/src/map/status.c index 1ea86e163..c253bb74f 100644 --- a/src/map/status.c +++ b/src/map/status.c @@ -6055,8 +6055,8 @@ void status_set_viewdata(struct block_list *bl, int class_) vd = npc_get_viewdata(class_); else if (homdb_checkid(class_)) vd = homun->get_viewdata(class_); - else if (mercenary->merc_class(class_)) - vd = mercenary->merc_get_viewdata(class_); + else if (mercenary->class(class_)) + vd = mercenary->get_viewdata(class_); else if (elemental->class(class_)) vd = elemental->get_viewdata(class_); else @@ -8331,7 +8331,7 @@ int status_change_start(struct block_list* bl,enum sc_type type,int rate,int val if( pc_isfalcon(sd) ) pc->setoption(sd, sd->sc.option&~OPTION_FALCON); if( sd->status.pet_id > 0 ) pet_menu(sd, 3); if( homun_alive(sd->hd) ) homun->vaporize(sd,1); - if( sd->md ) mercenary->merc_delete(sd->md,3); + if( sd->md ) mercenary->delete(sd->md,3); } break; case SC__LAZINESS: @@ -8350,7 +8350,6 @@ int status_change_start(struct block_list* bl,enum sc_type type,int rate,int val sc_start(bl,SC_NOEQUIPWEAPON,100,val1,tick); sc_start(bl,SC_NOEQUIPSHIELD,100,val1,tick); break; - break; case SC_GN_CARTBOOST: if( val1 < 3 ) val2 = 50; |