22f0714c07
- Updated VS9/10 project files. - Updated `configure` & `Makefile`s. - New GM, Commands & Permissions system: - '''This is a backwards compatibility breaking update''', please read tid:58877 - Replaced GM levels with Player Groups. - Commands permissions & other privileges now depend on group, not GM level. - `@help` command improvements: requires "commandname" param and shows more detailed info about commands. - Modified GM whisper system to deliver messages basing on permissions, not GM level. - Remote trade request is now possible only if player is allowed to use `@trade` command as well. - Added a proper permission to use `/changemaptype` command. - `clif_displaymessage` is now capable of displaying multiline messages. - All `ACMD_FUNC`s are static now, and the only way to invoke them is with `is_atcommand()`; all client commands (starting with `/`) are now translated into corresponding atcommands (with exception of `/kick` used on monster, as there is no atcommand to kill single monster). - Removed nonsense "bot check" triggering when player blocked (`/ex`) Server. - Merged `@monster`, `@monsterbig` and `@monstersmall`. - Improved flow of atcommand execution to avoid revealing info about online players or existing commands to non-privileged players. - Merged `atcommand` and `charcommand` script functions (`charcommand` is aliased to `atcommand`). - Fixed `atcommand` script function reading unknown memory area (possible access violation). git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15572 54d463be-8e91-2dee-dedb-b68131a5f0ec
110 lines
3.8 KiB
C
110 lines
3.8 KiB
C
// Copyright (c) Athena Dev Teams - Licensed under GNU GPL
|
|
// For more information, see LICENCE in the main folder
|
|
|
|
#include "conf.h"
|
|
#include <libconfig.h>
|
|
|
|
#include "../common/showmsg.h" // ShowError
|
|
|
|
int conf_read_file(config_t *config, const char *config_filename)
|
|
{
|
|
config_init(config);
|
|
if (!config_read_file(config, config_filename)) {
|
|
ShowError("%s:%d - %s\n", config_error_file(config),
|
|
config_error_line(config), config_error_text(config));
|
|
config_destroy(config);
|
|
return 1;
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
//
|
|
// Functions to copy settings from libconfig/contrib
|
|
//
|
|
static void config_setting_copy_simple(config_setting_t *parent, const config_setting_t *src);
|
|
static void config_setting_copy_elem(config_setting_t *parent, const config_setting_t *src);
|
|
static void config_setting_copy_aggregate(config_setting_t *parent, const config_setting_t *src);
|
|
int config_setting_copy(config_setting_t *parent, const config_setting_t *src);
|
|
|
|
void config_setting_copy_simple(config_setting_t *parent, const config_setting_t *src)
|
|
{
|
|
if (config_setting_is_aggregate(src)) {
|
|
config_setting_copy_aggregate(parent, src);
|
|
}
|
|
else {
|
|
config_setting_t *set = config_setting_add(parent, config_setting_name(src), config_setting_type(src));
|
|
|
|
if (set == NULL)
|
|
return;
|
|
|
|
if (CONFIG_TYPE_INT == config_setting_type(src)) {
|
|
config_setting_set_int(set, config_setting_get_int(src));
|
|
config_setting_set_format(set, src->format);
|
|
} else if (CONFIG_TYPE_INT64 == config_setting_type(src)) {
|
|
config_setting_set_int64(set, config_setting_get_int64(src));
|
|
config_setting_set_format(set, src->format);
|
|
} else if (CONFIG_TYPE_FLOAT == config_setting_type(src)) {
|
|
config_setting_set_float(set, config_setting_get_float(src));
|
|
} else if (CONFIG_TYPE_STRING == config_setting_type(src)) {
|
|
config_setting_set_string(set, config_setting_get_string(src));
|
|
} else if (CONFIG_TYPE_BOOL == config_setting_type(src)) {
|
|
config_setting_set_bool(set, config_setting_get_bool(src));
|
|
}
|
|
}
|
|
}
|
|
|
|
void config_setting_copy_elem(config_setting_t *parent, const config_setting_t *src)
|
|
{
|
|
config_setting_t *set = NULL;
|
|
|
|
if (config_setting_is_aggregate(src))
|
|
config_setting_copy_aggregate(parent, src);
|
|
else if (CONFIG_TYPE_INT == config_setting_type(src)) {
|
|
set = config_setting_set_int_elem(parent, -1, config_setting_get_int(src));
|
|
config_setting_set_format(set, src->format);
|
|
} else if (CONFIG_TYPE_INT64 == config_setting_type(src)) {
|
|
set = config_setting_set_int64_elem(parent, -1, config_setting_get_int64(src));
|
|
config_setting_set_format(set, src->format);
|
|
} else if (CONFIG_TYPE_FLOAT == config_setting_type(src)) {
|
|
set = config_setting_set_float_elem(parent, -1, config_setting_get_float(src));
|
|
} else if (CONFIG_TYPE_STRING == config_setting_type(src)) {
|
|
set = config_setting_set_string_elem(parent, -1, config_setting_get_string(src));
|
|
} else if (CONFIG_TYPE_BOOL == config_setting_type(src)) {
|
|
set = config_setting_set_bool_elem(parent, -1, config_setting_get_bool(src));
|
|
}
|
|
}
|
|
|
|
void config_setting_copy_aggregate(config_setting_t *parent, const config_setting_t *src)
|
|
{
|
|
config_setting_t *newAgg;
|
|
int i, n;
|
|
|
|
newAgg = config_setting_add(parent, config_setting_name(src), config_setting_type(src));
|
|
|
|
if (newAgg == NULL)
|
|
return;
|
|
|
|
n = config_setting_length(src);
|
|
|
|
for (i = 0; i < n; i++) {
|
|
if (config_setting_is_group(src)) {
|
|
config_setting_copy_simple(newAgg, config_setting_get_elem(src, i));
|
|
} else {
|
|
config_setting_copy_elem(newAgg, config_setting_get_elem(src, i));
|
|
}
|
|
}
|
|
}
|
|
|
|
int config_setting_copy(config_setting_t *parent, const config_setting_t *src)
|
|
{
|
|
if (!config_setting_is_group(parent) && !config_setting_is_list(parent))
|
|
return CONFIG_FALSE;
|
|
|
|
if (config_setting_is_aggregate(src)) {
|
|
config_setting_copy_aggregate(parent, src);
|
|
} else {
|
|
config_setting_copy_simple(parent, src);
|
|
}
|
|
return CONFIG_TRUE;
|
|
}
|