Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes atcommand reloadatcommand (#6891)

Browse Source 
* Fixes #6874.
* Removes an extra config file check that is no longer needed.
Thanks to @reunite-ro!
This commit is contained in:
Aleos 2022-05-03 23:13:28 -04:00 committed by GitHub
parent 972ada7c4a
commit 8bd77496da
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 8 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
conf/msg_conf/map_msg.conf
View File

@ -1106,8 +1106,7 @@
// @partyrecall
1035: Please enter a party name/ID (usage: @partyrecall <party_name/ID>).
// @reloadatcommand
1036: Error reading groups.conf, reload failed.
//1036 free
//1037 free
// @mapinfo

3
conf/msg_conf/map_msg_chn.conf
View File

@ -865,8 +865,7 @@
// @partyrecall
1035: 請輸入隊伍名稱/ID (用法: @partyrecall <party_name/ID>).
// @reloadatcommand
1036: Error reading groups.conf, reload failed.
//1036 free
//1037 free
// @mapinfo

3
conf/msg_conf/map_msg_frn.conf
View File

@ -877,8 +877,7 @@
// @partyrecall
1035: Entrez un nom/ID d'Equipe (usage: @partyrecall <nom/ID_party>).
// @reloadatcommand
1036: Erreur à la lecture de groups.conf, reload échoué.
//1036 free
//1037 free
// @mapinfo

3
conf/msg_conf/map_msg_idn.conf
View File

@ -964,8 +964,7 @@
// @partyrecall
1035: Harap masukkan nama party/ID. (Penggunaan: @partyrecall <nama party/ID>).
// @reloadatcommand
1036: Terjadi kesalahan saat membaca groups.conf, tidak berhasil dimuat ulang.
//1036 free
//1037 free
// @mapinfo

3
conf/msg_conf/map_msg_por.conf
View File

@ -1046,8 +1046,7 @@
// @partyrecall
1035: Digite o nome/ID de um grupo (uso: @partyrecall <nome/ID_do_grupo>).
// @reloadatcommand
1036: Erro na leitura do grups.conf, recarregamento falhou.
//1036 free
//1037 free
// @mapinfo

3
conf/msg_conf/map_msg_rus.conf
View File

@ -878,8 +878,7 @@
// @partyrecall
1035: Введите ID/название группы (Использование: @partyrecall <ID/название группы>).
// @reloadatcommand
1036: Ошибка чтения файла groups.conf, перезагрузка не удалась.
//1036 free
//1037 free
// @mapinfo

3
conf/msg_conf/map_msg_spn.conf
View File

@ -1015,8 +1015,7 @@
// @partyrecall
1035: Introduce el nombre/ID de un grupo (instrucciones: @partyrecall <nombre/ID del grupo>).
// @reloadatcommand
1036: Ha ocurrido un error al cargar el archivo groups.conf.
//1036 free
//1037 free
// @mapinfo

3
conf/msg_conf/map_msg_tha.conf
View File

@ -871,8 +871,7 @@
// @partyrecall
1035: â»Ã´Ãкت×èÍ/ID party (ÇÔ¸Õãªé: @partyrecall <ª×èÍ/ID party>).
// @reloadatcommand
1036: à¡Ô´¢éͼԴ¾ÅҴ㹡ÒüèÒ¹ä¿Åì groups.conf, ¡ÒÃâËÅ´ãËÁèÅéÁàËÅÇ.
//1036 free
//1037 free
// @mapinfo

10
src/map/atcommand.cpp
View File

@ -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.