From a09ab61285f1d6b38c8f6246a66e36f6dc370e0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C5=82awomir=20Lach?= Date: Sun, 17 Apr 2022 10:34:26 +0200 Subject: [PATCH 2/3] =?UTF-8?q?OSDN!41121=20S=C5=82awomir=20Lach=20=20-=20Add=20routines=20to=20load=20counters=20fro?= =?UTF-8?q?m=20ruleset=20Basic=20routines=20to=20load=20counter=20definiti?= =?UTF-8?q?ons=20from=20ruleset=20are=20added=20by=20this=20patch?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/counters.c | 28 +++++++--------- common/counters.h | 1 + server/ruleset.c | 82 +++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 95 insertions(+), 16 deletions(-) diff --git a/common/counters.c b/common/counters.c index aa3f647c15..3ad331e482 100644 --- a/common/counters.c +++ b/common/counters.c @@ -25,7 +25,7 @@ static struct counter counters[MAX_COUNTERS] = { - { (struct name_translation) NAME_INIT, CB_CITY_OWNED_TURNS, CTGT_CITY, 5, 0 } + }; static struct counter *counters_city[MAX_COUNTERS]; @@ -36,22 +36,7 @@ static int number_city_counters; ****************************************************************************/ void counters_init(void) { - int i; - number_city_counters = 0; - - name_set(&counters[0].name, NULL, N_("?counter:Owned")); - - for (i = 0; i < MAX_COUNTERS; i++) { - - if (counters[i].type == CB_CITY_OWNED_TURNS) { - /* City counter type */ - counters_city[number_city_counters] = &counters[i]; - counters[i].index = number_city_counters; - counters[i].target = CTGT_CITY; - number_city_counters++; - } - } } @@ -81,6 +66,17 @@ struct counter *counter_by_id(int id) return &counters[id]; } +/************************************************************************//** + Attaching given counter type to array containing counter type + related to cities. Counter must be present in array for + each counter in game, but we do not check this. +****************************************************************************/ +void attach_city_counter(struct counter *counter) +{ + counters_city[number_city_counters] = counter; + number_city_counters++; +} + /************************************************************************//** Return id of a given counter ****************************************************************************/ diff --git a/common/counters.h b/common/counters.h index b2cfb4373a..15dc2f1445 100644 --- a/common/counters.h +++ b/common/counters.h @@ -59,6 +59,7 @@ struct counter *counter_by_translated_name(const char *name); int counter_index(struct counter *pcount); struct counter *counter_by_index(int index, enum counter_target target); int counters_get_city_counters_count(void); +void attach_city_counter(struct counter *counter); #define city_counters_iterate(pcount) { \ int _i_##pcount; \ diff --git a/server/ruleset.c b/server/ruleset.c index 4de97522a4..f5347cb81c 100644 --- a/server/ruleset.c +++ b/server/ruleset.c @@ -38,6 +38,7 @@ #include "base.h" #include "capability.h" #include "city.h" +#include "counters.h" #include "effects.h" #include "extras.h" #include "fc_types.h" @@ -108,6 +109,7 @@ #define ACHIEVEMENT_SECTION_PREFIX "achievement_" #define ACTION_ENABLER_SECTION_PREFIX "actionenabler_" #define MULTIPLIER_SECTION_PREFIX "multiplier_" +#define COUNTER_SECTION_PREFIX "counter_" #define check_name(name) (check_strlen(name, MAX_LEN_NAME, NULL)) #define check_cityname(name) (check_strlen(name, MAX_LEN_CITYNAME, NULL)) @@ -1410,6 +1412,41 @@ static bool load_game_names(struct section_file *file, section_list_destroy(sec); } + if (ok) { + + sec = secfile_sections_by_name_prefix(file, COUNTER_SECTION_PREFIX); + + nval = (NULL != sec ? section_list_size(sec) : 0); + if (nval > MAX_COUNTERS) { + int num = nval; /* No "size_t" to printf */ + + ruleset_error(LOG_ERROR, + "\"%s\": Too many counters (%d, max %d)", + filename, num, MAX_GOODS_TYPES); + section_list_destroy(sec); + ok = FALSE; + } else { + } + + if (ok) { + int count_idx; + + for (count_idx = 0; count_idx < nval; ++count_idx) { + struct counter *pcount = counter_by_id(count_idx); + const char *sec_name + = section_name(section_list_get(sec, counter_index(pcount))); + + if (!ruleset_load_names(&pcount->name, NULL, file, sec_name)) { + ruleset_error(LOG_ERROR, "\"%s\": Cannot load counters names", + filename); + ok = FALSE; + break; + } + } + } + section_list_destroy(sec); + } + return ok; } @@ -7548,6 +7585,51 @@ static bool load_ruleset_game(struct section_file *file, bool act, section_list_destroy(sec); } + if (ok) { + sec = secfile_sections_by_name_prefix(file, COUNTER_SECTION_PREFIX); + + if (sec != NULL) { + int num = section_list_size(sec); + int curr_; + + for (curr_ = 0; curr_ < num; ++curr_) { + + struct counter *pcount = counter_by_id(curr_); + const char *sec_name = section_name(section_list_get(sec, curr_)); + const char *counter_type = secfile_lookup_str_default(file, NULL, + "%s.type", + sec_name); + + enum counter_behaviour cb = counter_behaviour_by_name(counter_type, + fc_strcasecmp); + if (!counter_behaviour_is_valid(cb)) { + ruleset_error(LOG_ERROR, "\"%s\" unknown counter type \"%s\".", + filename, counter_type); + ok = FALSE; + break; + } + + if (!ruleset_load_names(&pcount->name, NULL, file, sec_name)) { + ruleset_error(LOG_ERROR, "\"%s\": Cannot load counter names", + filename); + ok = FALSE; + break; + } + + pcount->type = cb; + pcount->checkpoint = secfile_lookup_int_default(file, 1, + "%s.checkpoint", + sec_name); + pcount->target = CTGT_CITY; + pcount->index = curr_; + pcount->def = secfile_lookup_int_default(file, 0, + "%s.def", + sec_name); + attach_city_counter(pcount); + } + } + } + /* secfile_check_unused() is not here, but only after also settings section * has been loaded. */ -- 2.35.3