diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-08-21 16:07:50 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-08-21 16:07:50 +0000 |
| commit | 41f1a34c8593a40b4c5dc4178d7138e7e166eea0 (patch) | |
| tree | f033ae8a8fe52be55838a5050ae01cbec32d5ba0 /src/map/mercenary.c | |
| parent | 74aac1368dae2d2a8ed5e3897a3cafb0fc5a8984 (diff) | |
| download | hercules-41f1a34c8593a40b4c5dc4178d7138e7e166eea0.tar.gz hercules-41f1a34c8593a40b4c5dc4178d7138e7e166eea0.tar.bz2 hercules-41f1a34c8593a40b4c5dc4178d7138e7e166eea0.tar.xz hercules-41f1a34c8593a40b4c5dc4178d7138e7e166eea0.zip | |
- Removed config setting "muting_players", and expanded the manner_system config to specify how having negative manner (mute) affects a player (see battle/misc.conf).
- Expanded the pk_mode setting from no/yes to 0/1/2. 1 is normal pk_mode, if 2 is used, it makes killing players give you a loss of 5 manner points.
- Fixed WS_WEAPONREFINE always failing when at less than job 50.
- Fixed a compilation warning in char-txt/int_homun.c
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8402 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/mercenary.c')
| -rw-r--r-- | src/map/mercenary.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/map/mercenary.c b/src/map/mercenary.c index 7cc58dc7d..6b508429f 100644 --- a/src/map/mercenary.c +++ b/src/map/mercenary.c @@ -113,8 +113,8 @@ int merc_hom_dead(struct homun_data *hd, struct block_list *src) struct map_session_data *sd = hd->master;
clif_emotion(&hd->bl, 16) ; //wah
- if (!sd)
- return 7;
+ if (!sd) //unit remove map will invoke unit free
+ return 3;
//Delete timers when dead.
merc_hom_hungry_timer_delete(hd);
|