From 02f56d5b8db7ac51ac2ffbf90621d94aa02ef5cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C5=82awomir=20Lach?= <slawek@lach.art.pl>
Date: Tue, 19 Jan 2021 17:49:09 +0100
Subject: [PATCH] - Added missing pieces for counters implementation

- Change counter_by_index declaration, so it takes counter type as parameter - Counter_index reads index field from given counter - Counter_by_index's behavior are now counter type dependent - Added counter target type and field to counter struct

- Added correct function definition

- Repair code style to match freeciv style conduct

diff --git a/common/counters.c b/common/counters.c
index df3f4fbaa4..b988e14345 100644
--- a/common/counters.c
+++ b/common/counters.c
@@ -15,6 +15,8 @@
 #include <fc_config.h>
 #endif
 
+#include "fcintl.h"
+
 #include "counters.h"
 
 
@@ -51,3 +53,71 @@ void counters_init(void)
 void counters_free(void)
 {
 }
+
+/************************************************************************//**
+  Return counter by given id
+****************************************************************************/
+struct counter *counter_by_id(int id)
+{
+  return &counters[id];
+}
+
+/************************************************************************//**
+   Return id of a given counter
+****************************************************************************/
+int counter_id(struct counter *pcount)
+{
+  fc_assert_ret_val(NULL != pcount, -1);
+  return pcount->id;
+}
+
+/************************************************************************//**
+   Search for counter by rule name
+   (return matched counter if found or NULL)
+****************************************************************************/
+struct counter *counter_by_rule_name(const char *name)
+{
+  int i;
+  fc_assert_ret_val(NULL == name, NULL);
+  fc_assert_ret_val('\0' == name[0], NULL);
+
+  for (i = 0; i < MAX_COUNTERS; i++) {
+    if (0 == fc_strcasecmp(name, counters[i].rule_name)) {
+      return &counters[i];
+    }
+  }
+
+  return NULL;
+}
+
+/************************************************************************//**
+   Return rule name of a given counter
+****************************************************************************/
+const char *counter_rule_name(struct counter *pcount)
+{
+  return pcount->rule_name;
+}
+
+/************************************************************************//**
+  Return index in global counter's array
+****************************************************************************/
+int counter_index(struct counter *pcount)
+{
+  fc_assert_ret_val(NULL != pcount, -1);
+  return pcount - counters;
+}
+
+/************************************************************************//**
+  Return counter by given index
+****************************************************************************/
+struct counter *counter_by_index(int index, enum counter_target target)
+{
+  switch (target) {
+    case CTGT_CITY:
+      return counters_city[index];
+      break;
+
+    default:
+      fc_assert_exit_msg(false, "Bad counter type inside counter_by_index. Exiting");
+  }
+}
diff --git a/common/counters.h b/common/counters.h
index e4a160751a..6b2f94b8dc 100644
--- a/common/counters.h
+++ b/common/counters.h
@@ -36,6 +36,15 @@ struct counter
 void counters_init(void);
 void counters_free(void);
 
+struct counter *counter_by_id(int id);
+int counter_id(struct counter *pcount);
+
+struct counter *counter_by_rule_name(const char *name);
+const char *counter_rule_name(struct counter *pcount);
+
+int counter_index(struct counter *pcount);
+struct counter *counter_by_index(int index, enum counter_target target);
+
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */
-- 
2.31.1