diff options
| author | panikon <panikon@zoho.com> | 2014-02-19 17:54:20 -0300 |
|---|---|---|
| committer | panikon <panikon@zoho.com> | 2014-02-19 17:54:20 -0300 |
| commit | e6b107b80355201fa958a74860d59a5034bb839d (patch) | |
| tree | 3733e209b68dfcc148053aef38f2f69c4f63a35b /src/map/mercenary.c | |
| parent | c4a9dd3f2804b75c1d49b5ab58a3ba80ea4303c2 (diff) | |
| download | hercules-e6b107b80355201fa958a74860d59a5034bb839d.tar.gz hercules-e6b107b80355201fa958a74860d59a5034bb839d.tar.bz2 hercules-e6b107b80355201fa958a74860d59a5034bb839d.tar.xz hercules-e6b107b80355201fa958a74860d59a5034bb839d.zip | |
Revert "Merge branch 'master' of https://github.com/HerculesWS/Hercules"
This reverts commit c4a9dd3f2804b75c1d49b5ab58a3ba80ea4303c2, reversing
changes made to 58544d7f610261a903b3e843a795efd7571b2d56.
Diffstat (limited to 'src/map/mercenary.c')
| -rw-r--r-- | src/map/mercenary.c | 2 |
1 files changed, 1 insertions, 1 deletions
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; } |