diff options
| author | shennetsind <ind@henn.et> | 2013-07-04 16:12:38 -0300 |
|---|---|---|
| committer | shennetsind <ind@henn.et> | 2013-07-04 16:12:38 -0300 |
| commit | fb945b7b7eb17f707215ef2b4f1e775ed430b012 (patch) | |
| tree | 907838da968f711033da17f26c6f55191e1c2ac3 /src/map/battleground.c | |
| parent | 6570776ff8b52b141b9f0b581d6fd6fa06117db5 (diff) | |
| parent | b9889903e89bd4127c7503a512cfe215b9ccc740 (diff) | |
| download | hercules-fb945b7b7eb17f707215ef2b4f1e775ed430b012.tar.gz hercules-fb945b7b7eb17f707215ef2b4f1e775ed430b012.tar.bz2 hercules-fb945b7b7eb17f707215ef2b4f1e775ed430b012.tar.xz hercules-fb945b7b7eb17f707215ef2b4f1e775ed430b012.zip | |
Merge branch 'master' of github.com:Earisu/Hercules into Earisu-master
Adjusting for merge.
Signed-off-by: shennetsind <ind@henn.et>
Conflicts:
src/map/battle.c
src/map/status.c
src/map/status.h
Diffstat (limited to 'src/map/battleground.c')
| -rw-r--r-- | src/map/battleground.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/map/battleground.c b/src/map/battleground.c index 4bf0843d5..b557bee8e 100644 --- a/src/map/battleground.c +++ b/src/map/battleground.c @@ -148,7 +148,7 @@ int bg_member_respawn(struct map_session_data *sd) if( bg->mapindex == 0 ) return 0; // Respawn not handled by Core pc->setpos(sd, bg->mapindex, bg->x, bg->y, CLR_OUTSIGHT); - status_revive(&sd->bl, 1, 100); + iStatus->revive(&sd->bl, 1, 100); return 1; // Warped } |