diff options
| author | Emistry Haoyan <equinox1991@gmail.com> | 2020-03-08 05:18:26 +0800 |
|---|---|---|
| committer | Emistry Haoyan <equinox1991@gmail.com> | 2020-07-06 00:50:48 +0800 |
| commit | d3c24f7d9ae64354e446a85ba0dad21daca589c1 (patch) | |
| tree | 194c6e85100d516fe73425f6aed1c72ea05d61fe /src/map/clif.c | |
| parent | 1dfebbd4966310387357cbddae600418a56df658 (diff) | |
| download | hercules-d3c24f7d9ae64354e446a85ba0dad21daca589c1.tar.gz hercules-d3c24f7d9ae64354e446a85ba0dad21daca589c1.tar.bz2 hercules-d3c24f7d9ae64354e446a85ba0dad21daca589c1.tar.xz hercules-d3c24f7d9ae64354e446a85ba0dad21daca589c1.zip | |
Add NoPet mapflag
- allow to set nopet mapflag at any maps.
- mapflag to disable pet, and force return to egg.
Diffstat (limited to 'src/map/clif.c')
| -rw-r--r-- | src/map/clif.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/map/clif.c b/src/map/clif.c index fd84961d9..f44d9a716 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -7661,8 +7661,8 @@ static void clif_sendegg(struct map_session_data *sd) nullpo_retv(sd); fd = sd->fd; - if (battle_config.pet_no_gvg && map_flag_gvg2(sd->bl.m)) { //Disable pet hatching in GvG grounds during Guild Wars [Skotlex] - clif->message(fd, msg_sd(sd, 866)); // "Pets are not allowed in Guild Wars." + if (map->list[sd->bl.m].flag.nopet != 0) { + clif->message(fd, msg_sd(sd, 866)); // "Pets are disabled in this map." return; } @@ -10982,8 +10982,8 @@ static void clif_parse_LoadEndAck(int fd, struct map_session_data *sd) // Spawn pet. if (sd->pd != NULL) { - if (battle_config.pet_no_gvg != 0 && map_flag_gvg2(sd->bl.m)) { // Return the pet to egg. [Skotlex] - clif->message(sd->fd, msg_sd(sd, 866)); // "Pets are not allowed in Guild Wars." + if (map->list[sd->bl.m].flag.nopet != 0) { // Return the pet to egg. [Skotlex] + clif->message(sd->fd, msg_sd(sd, 866)); // Pets are not allowed in Guild Wars. pet->menu(sd, 3); // Option 3 is return to egg. } else { pet->spawn(sd, false); |