From 8bd77496daa015e11bf11b5941752e23c5f08f40 Mon Sep 17 00:00:00 2001 From: Aleos Date: Tue, 3 May 2022 23:13:28 -0400 Subject: [PATCH] Fixes atcommand reloadatcommand (#6891) * Fixes #6874. * Removes an extra config file check that is no longer needed. Thanks to @reunite-ro! --- conf/msg_conf/map_msg.conf | 3 +-- conf/msg_conf/map_msg_chn.conf | 3 +-- conf/msg_conf/map_msg_frn.conf | 3 +-- conf/msg_conf/map_msg_idn.conf | 3 +-- conf/msg_conf/map_msg_por.conf | 3 +-- conf/msg_conf/map_msg_rus.conf | 3 +-- conf/msg_conf/map_msg_spn.conf | 3 +-- conf/msg_conf/map_msg_tha.conf | 3 +-- src/map/atcommand.cpp | 10 ---------- 9 files changed, 8 insertions(+), 26 deletions(-) diff --git a/conf/msg_conf/map_msg.conf b/conf/msg_conf/map_msg.conf index d28483cf0f..0a857f8ee3 100644 --- a/conf/msg_conf/map_msg.conf +++ b/conf/msg_conf/map_msg.conf @@ -1106,8 +1106,7 @@ // @partyrecall 1035: Please enter a party name/ID (usage: @partyrecall ). -// @reloadatcommand -1036: Error reading groups.conf, reload failed. +//1036 free //1037 free // @mapinfo diff --git a/conf/msg_conf/map_msg_chn.conf b/conf/msg_conf/map_msg_chn.conf index dcb801277d..eacaeaac13 100644 --- a/conf/msg_conf/map_msg_chn.conf +++ b/conf/msg_conf/map_msg_chn.conf @@ -865,8 +865,7 @@ // @partyrecall 1035: 請輸入隊伍名稱/ID (用法: @partyrecall ). -// @reloadatcommand -1036: Error reading groups.conf, reload failed. +//1036 free //1037 free // @mapinfo diff --git a/conf/msg_conf/map_msg_frn.conf b/conf/msg_conf/map_msg_frn.conf index 62b85bfbc4..9dedb6bffd 100644 --- a/conf/msg_conf/map_msg_frn.conf +++ b/conf/msg_conf/map_msg_frn.conf @@ -877,8 +877,7 @@ // @partyrecall 1035: Entrez un nom/ID d'Equipe (usage: @partyrecall ). -// @reloadatcommand -1036: Erreur la lecture de groups.conf, reload chou. +//1036 free //1037 free // @mapinfo diff --git a/conf/msg_conf/map_msg_idn.conf b/conf/msg_conf/map_msg_idn.conf index c12efa1a3d..c9b8d2d1e5 100644 --- a/conf/msg_conf/map_msg_idn.conf +++ b/conf/msg_conf/map_msg_idn.conf @@ -964,8 +964,7 @@ // @partyrecall 1035: Harap masukkan nama party/ID. (Penggunaan: @partyrecall ). -// @reloadatcommand -1036: Terjadi kesalahan saat membaca groups.conf, tidak berhasil dimuat ulang. +//1036 free //1037 free // @mapinfo diff --git a/conf/msg_conf/map_msg_por.conf b/conf/msg_conf/map_msg_por.conf index bab2209ac8..3a01b4038e 100644 --- a/conf/msg_conf/map_msg_por.conf +++ b/conf/msg_conf/map_msg_por.conf @@ -1046,8 +1046,7 @@ // @partyrecall 1035: Digite o nome/ID de um grupo (uso: @partyrecall ). -// @reloadatcommand -1036: Erro na leitura do grups.conf, recarregamento falhou. +//1036 free //1037 free // @mapinfo diff --git a/conf/msg_conf/map_msg_rus.conf b/conf/msg_conf/map_msg_rus.conf index c3b9853a65..fbeaa59255 100644 --- a/conf/msg_conf/map_msg_rus.conf +++ b/conf/msg_conf/map_msg_rus.conf @@ -878,8 +878,7 @@ // @partyrecall 1035: ID/ (: @partyrecall ). -// @reloadatcommand -1036: groups.conf, . +//1036 free //1037 free // @mapinfo diff --git a/conf/msg_conf/map_msg_spn.conf b/conf/msg_conf/map_msg_spn.conf index daa3536564..05c37dc6b4 100644 --- a/conf/msg_conf/map_msg_spn.conf +++ b/conf/msg_conf/map_msg_spn.conf @@ -1015,8 +1015,7 @@ // @partyrecall 1035: Introduce el nombre/ID de un grupo (instrucciones: @partyrecall ). -// @reloadatcommand -1036: Ha ocurrido un error al cargar el archivo groups.conf. +//1036 free //1037 free // @mapinfo diff --git a/conf/msg_conf/map_msg_tha.conf b/conf/msg_conf/map_msg_tha.conf index f8c101ad2f..12e89b838e 100644 --- a/conf/msg_conf/map_msg_tha.conf +++ b/conf/msg_conf/map_msg_tha.conf @@ -871,8 +871,7 @@ // @partyrecall 1035: ôкت/ID party (Ը: @partyrecall ). -// @reloadatcommand -1036: ԴͼԴҴ㹡üҹ groups.conf, Ŵ. +//1036 free //1037 free // @mapinfo diff --git a/src/map/atcommand.cpp b/src/map/atcommand.cpp index 645bfcb91b..fd1817e6eb 100644 --- a/src/map/atcommand.cpp +++ b/src/map/atcommand.cpp @@ -12,7 +12,6 @@ #include "../common/cbasetypes.hpp" #include "../common/database.hpp" #include "../common/cli.hpp" -#include "../common/conf.hpp" #include "../common/malloc.hpp" #include "../common/mmo.hpp" #include "../common/nullpo.hpp" @@ -4142,15 +4141,6 @@ ACMD_FUNC(reload) { hom_reload_skill(); clif_displaymessage(fd, msg_txt(sd,99)); // Skill database has been reloaded. } else if (strstr(command, "atcommand") || strncmp(message, "atcommand", 4) == 0) { - config_t run_test; - - if (conf_read_file(&run_test, "conf/groups.conf")) { - clif_displaymessage(fd, msg_txt(sd,1036)); // Error reading groups.conf, reload failed. - return -1; - } - - config_destroy(&run_test); - atcommand_doload(); pc_groups_reload(); clif_displaymessage(fd, msg_txt(sd,254)); // GM command configuration has been reloaded.