From d6cd24a757c7254914ef048f71aa7e9d4f493fda Mon Sep 17 00:00:00 2001 From: panikon Date: Wed, 19 Feb 2014 20:24:56 -0300 Subject: Readding last merge as last revert was unintended. Sorry for the trouble. --- 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 87e7d2f3c..495621014 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(&md->bl, scs[index], 100, rnd() % 5, 600000); + sc_start(NULL,&md->bl, scs[index], 100, rnd() % 5, 600000); return 0; } -- cgit v1.2.3-60-g2f50