From e6b107b80355201fa958a74860d59a5034bb839d Mon Sep 17 00:00:00 2001 From: panikon Date: Wed, 19 Feb 2014 17:54:20 -0300 Subject: Revert "Merge branch 'master' of https://github.com/HerculesWS/Hercules" This reverts commit c4a9dd3f2804b75c1d49b5ab58a3ba80ea4303c2, reversing changes made to 58544d7f610261a903b3e843a795efd7571b2d56. --- src/map/mercenary.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/map/mercenary.c') diff --git a/src/map/mercenary.c b/src/map/mercenary.c index 495621014..87e7d2f3c 100644 --- a/src/map/mercenary.c +++ b/src/map/mercenary.c @@ -360,7 +360,7 @@ int mercenary_killbonus(struct mercenary_data *md) const enum sc_type scs[] = { SC_MER_FLEE, SC_MER_ATK, SC_MER_HP, SC_MER_SP, SC_MER_HIT }; int index = rnd() % ARRAYLENGTH(scs); - sc_start(NULL,&md->bl, scs[index], 100, rnd() % 5, 600000); + sc_start(&md->bl, scs[index], 100, rnd() % 5, 600000); return 0; } -- cgit v1.2.3-70-g09d2