diff options
| author | L0ne_W0lf <L0ne_W0lf@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2008-07-04 20:44:33 +0000 |
|---|---|---|
| committer | L0ne_W0lf <L0ne_W0lf@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2008-07-04 20:44:33 +0000 |
| commit | 2c41833b08912e7f05f8b6671809b106dcf5f72c (patch) | |
| tree | 89b4839173b077843a0828cc0aa7787eba2fdbbd /src/map | |
| parent | 6c2c7c5cda67bf6a6484f3fcc2c97c35e86bab3e (diff) | |
| download | hercules-2c41833b08912e7f05f8b6671809b106dcf5f72c.tar.gz hercules-2c41833b08912e7f05f8b6671809b106dcf5f72c.tar.bz2 hercules-2c41833b08912e7f05f8b6671809b106dcf5f72c.tar.xz hercules-2c41833b08912e7f05f8b6671809b106dcf5f72c.zip | |
* Homunculus will no longer auto-vaporize on master death.
- Added config option to allow for this to be turned on or off.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@12912 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map')
| -rw-r--r-- | src/map/battle.c | 1 | ||||
| -rw-r--r-- | src/map/battle.h | 1 | ||||
| -rw-r--r-- | src/map/pc.c | 2 |
3 files changed, 3 insertions, 1 deletions
diff --git a/src/map/battle.c b/src/map/battle.c index 9db8d2647..07bc5379a 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -3702,6 +3702,7 @@ static const struct _battle_data { { "auction_feeperhour", &battle_config.auction_feeperhour, 12000, 0, INT_MAX, }, { "auction_maximumprice", &battle_config.auction_maximumprice, 500000000, 0, MAX_ZENY, }, { "gm_viewequip_min_lv", &battle_config.gm_viewequip_min_lv, 0, 0, 99, }, + { "homunculus_auto_vapor", &battle_config.homunculus_auto_vapor, 0, 0, 1, }, }; diff --git a/src/map/battle.h b/src/map/battle.h index 93ead772d..bb7e53278 100644 --- a/src/map/battle.h +++ b/src/map/battle.h @@ -452,6 +452,7 @@ extern struct Battle_Config int auction_feeperhour; int auction_maximumprice; int gm_viewequip_min_lv; + int homunculus_auto_vapor; //Keep Homunculus from Vaporizing when master dies. [L0ne_W0lf] } battle_config; void do_init_battle(void); diff --git a/src/map/pc.c b/src/map/pc.c index 2b2ef3a83..08d91c24b 100644 --- a/src/map/pc.c +++ b/src/map/pc.c @@ -4958,7 +4958,7 @@ int pc_dead(struct map_session_data *sd,struct block_list *src) pet_unlocktarget(sd->pd); } - if(sd->status.hom_id > 0) //orn + if(sd->status.hom_id > 0 && battle_config.homunculus_auto_vapor) //orn merc_hom_vaporize(sd, 0); // Leave duel if you die [LuzZza] |