diff options
| author | Haru <haru@dotalux.com> | 2020-07-26 19:07:28 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-26 19:07:28 +0200 |
| commit | 43e4d537acac47dc923fac445f9a6f476db2d18c (patch) | |
| tree | 5bc392f9e1b6b928d7168ec6f024629423aabb4c /src/map/clif.c | |
| parent | 909054bf043ff51ccd476418075f8bf1dc55b27f (diff) | |
| parent | d3c24f7d9ae64354e446a85ba0dad21daca589c1 (diff) | |
| download | hercules-43e4d537acac47dc923fac445f9a6f476db2d18c.tar.gz hercules-43e4d537acac47dc923fac445f9a6f476db2d18c.tar.bz2 hercules-43e4d537acac47dc923fac445f9a6f476db2d18c.tar.xz hercules-43e4d537acac47dc923fac445f9a6f476db2d18c.zip | |
Merge pull request #2652 from Emistry/mf_nopet
Add NoPet mapflag
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); |