diff options
Diffstat (limited to 'src/map')
| -rw-r--r-- | src/map/atcommand.c | 2 | ||||
| -rw-r--r-- | src/map/battle.c | 2 | ||||
| -rw-r--r-- | src/map/clif.c | 1 | ||||
| -rw-r--r-- | src/map/script.c | 6 |
4 files changed, 7 insertions, 4 deletions
diff --git a/src/map/atcommand.c b/src/map/atcommand.c index 8423467c6..2aaf89107 100644 --- a/src/map/atcommand.c +++ b/src/map/atcommand.c @@ -407,7 +407,7 @@ ACMD(mapmove) if (mapindex) m = iMap->mapindex2mapid(mapindex); - if (!mapindex) { // m < 0 means on different server! [Kevin] + if (!mapindex || m < 0) { // m < 0 means on different server or that map is disabled! [Kevin] clif->message(fd, msg_txt(1)); // Map not found. return false; } diff --git a/src/map/battle.c b/src/map/battle.c index 06e9c01bd..3268128ac 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -6461,7 +6461,7 @@ static const struct _battle_data { { "item_enabled_npc", &battle_config.item_enabled_npc, 1, 0, 1, }, { "gm_ignore_warpable_area", &battle_config.gm_ignore_warpable_area, 0, 2, 100, }, { "packet_obfuscation", &battle_config.packet_obfuscation, 1, 0, 3, }, - { "client_accept_chatdori", &battle_config.client_accept_chatdori, 0, 0, 1, }, + { "client_accept_chatdori", &battle_config.client_accept_chatdori, 0, 0, INT_MAX, }, }; #ifndef STATS_OPT_OUT /** diff --git a/src/map/clif.c b/src/map/clif.c index 1cdb59966..c62791f31 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -13419,6 +13419,7 @@ void clif_parse_GMReqNoChat(int fd,struct map_session_data *sd) if (pc->get_group_level(sd) > 0 || sd->bl.id != id) return; + value = battle_config.client_accept_chatdori; dstsd = sd; } else diff --git a/src/map/script.c b/src/map/script.c index 3ba8ea9fc..19e6457bd 100644 --- a/src/map/script.c +++ b/src/map/script.c @@ -4344,8 +4344,10 @@ BUILDIN(callfunc) { const char* name = reference_getname(data); if( name[0] == '.' ) { - ref = (struct DBMap**)aCalloc(sizeof(struct DBMap*), 1); - ref[0] = (name[1] == '@' ? st->stack->var_function : st->script->script_vars); + if( !ref ) { + ref = (struct DBMap**)aCalloc(sizeof(struct DBMap*), 1); + ref[0] = (name[1] == '@' ? st->stack->var_function : st->script->script_vars); + } data->ref = ref; } } |