diff options
| author | Kenpachi Developer <Kenpachi.Developer@gmx.de> | 2020-06-22 03:06:00 +0200 |
|---|---|---|
| committer | Kenpachi Developer <Kenpachi.Developer@gmx.de> | 2020-06-22 03:06:00 +0200 |
| commit | 3dd482367675292233bf034bc8a38b2ab46b0aa3 (patch) | |
| tree | 4698347fac8d0cce50697baee43d2912bd6b97e8 /src | |
| parent | 0f8a2df4dd40d522a69260b4d110d0ea2c14ba2a (diff) | |
| download | hercules-3dd482367675292233bf034bc8a38b2ab46b0aa3.tar.gz hercules-3dd482367675292233bf034bc8a38b2ab46b0aa3.tar.bz2 hercules-3dd482367675292233bf034bc8a38b2ab46b0aa3.tar.xz hercules-3dd482367675292233bf034bc8a38b2ab46b0aa3.zip | |
Extend guild_notice_changemap battle flag with option for login
Diffstat (limited to 'src')
| -rw-r--r-- | src/map/battle.c | 2 | ||||
| -rw-r--r-- | src/map/clif.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/map/battle.c b/src/map/battle.c index dc2535052..ed5aa4cb9 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -7383,7 +7383,7 @@ static const struct battle_data { { "packet_obfuscation", &battle_config.packet_obfuscation, 1, 0, 3, }, { "client_accept_chatdori", &battle_config.client_accept_chatdori, 0, 0, INT_MAX, }, { "snovice_call_type", &battle_config.snovice_call_type, 0, 0, 1, }, - { "guild_notice_changemap", &battle_config.guild_notice_changemap, 2, 0, 2, }, + { "guild_notice_changemap", &battle_config.guild_notice_changemap, 7, 0, 7, }, { "features/banking", &battle_config.feature_banking, 1, 0, 1, }, { "features/auction", &battle_config.feature_auction, 0, 0, 2, }, { "idletime_criteria", &battle_config.idletime_criteria, 0x25, 1, INT_MAX, }, diff --git a/src/map/clif.c b/src/map/clif.c index a580d6464..9eba9f4b4 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -11030,9 +11030,9 @@ static void clif_parse_LoadEndAck(int fd, struct map_session_data *sd) if (sd->guild != NULL) { // Show guild notice. - if ((battle_config.guild_notice_changemap == 1 && change_map) - || battle_config.guild_notice_changemap == 2 - || first_time) { + if (((battle_config.guild_notice_changemap & 0x1) != 0 && first_time) + || ((battle_config.guild_notice_changemap & 0x2) != 0 && !first_time && change_map) + || (battle_config.guild_notice_changemap & 0x4) != 0) { clif->guild_notice(sd, sd->guild); } |