From 014178b0c43b150a5f722d24f3129f823877ca47 Mon Sep 17 00:00:00 2001
From: Marko Lindqvist <cazfi74@gmail.com>
Date: Wed, 4 Jan 2023 17:42:24 +0200
Subject: [PATCH 26/26] Drop unused tile parameter from is_build_activity()

See osdn #46446

Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
---
 common/clientutils.c |  8 ++++----
 common/unit.c        | 14 +++++++-------
 common/unit.h        |  2 +-
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/common/clientutils.c b/common/clientutils.c
index cceadf5cf4..71827491e5 100644
--- a/common/clientutils.c
+++ b/common/clientutils.c
@@ -74,7 +74,7 @@ static void calc_activity(struct actcalc *calc, const struct tile *ptile,
       continue;
     }
 
-    if (is_build_activity(act, ptile)) {
+    if (is_build_activity(act)) {
       int eidx = extra_index(punit->activity_target);
 
       t->extra_total[eidx][act] += punit->activity_count;
@@ -96,7 +96,7 @@ static void calc_activity(struct actcalc *calc, const struct tile *ptile,
   /* Hypothetical contribution from pmodunit, if it changed to specified
    * activity/target */
   if (pmodunit) {
-    if (is_build_activity(new_act, ptile)) {
+    if (is_build_activity(new_act)) {
       int eidx = extra_index(new_tgt);
 
       if (new_act == pmodunit->changed_from
@@ -198,7 +198,7 @@ int turns_to_activity_done(const struct tile *ptile,
   calc_activity(calc, ptile, pmodunit, act, tgt);
 
   /* ...and extract just the one we want. */
-  if (is_build_activity(act, ptile)) {
+  if (is_build_activity(act)) {
     int tgti = extra_index(tgt);
 
     turns = calc->extra_turns[tgti][act];
@@ -228,7 +228,7 @@ const char *concat_tile_activity_text(struct tile *ptile)
   calc_activity(calc, ptile, NULL, ACTIVITY_LAST, NULL);
 
   activity_type_iterate(i) {
-    if (is_build_activity(i, ptile)) {
+    if (is_build_activity(i)) {
       extra_type_iterate(ep) {
         int ei = extra_index(ep);
 
diff --git a/common/unit.c b/common/unit.c
index 773eb3af6f..b48f77e655 100644
--- a/common/unit.c
+++ b/common/unit.c
@@ -888,21 +888,21 @@ bool can_unit_do_activity_targeted(const struct unit *punit,
   location.
 **************************************************************************/
 bool can_unit_do_activity_targeted_at(const struct unit *punit,
-				      enum unit_activity activity,
+                                      enum unit_activity activity,
                                       struct extra_type *target,
-				      const struct tile *ptile)
+                                      const struct tile *ptile)
 {
   /* Check that no build activity conflicting with one already in progress
    * gets executed. */
   /* FIXME: Should check also the cases where one of the activities is terrain
    *        change that destroys the target of the other activity */
-  if (target != NULL && is_build_activity(activity, ptile)) {
+  if (target != NULL && is_build_activity(activity)) {
     if (tile_is_placing(ptile)) {
       return FALSE;
     }
 
     unit_list_iterate(ptile->units, tunit) {
-      if (is_build_activity(tunit->activity, ptile)
+      if (is_build_activity(tunit->activity)
           && !can_extras_coexist(target, tunit->activity_target)) {
         return FALSE;
       }
@@ -1477,9 +1477,9 @@ bool unit_being_aggressive(const struct unit *punit)
 }
 
 /**********************************************************************//**
-  Returns true if given activity is some kind of building.
+  Returns true if given activity builds an extra.
 **************************************************************************/
-bool is_build_activity(enum unit_activity activity, const struct tile *ptile)
+bool is_build_activity(enum unit_activity activity)
 {
   switch (activity) {
   case ACTIVITY_MINE:
@@ -1528,7 +1528,7 @@ bool is_terrain_change_activity(enum unit_activity activity)
 **************************************************************************/
 bool is_tile_activity(enum unit_activity activity)
 {
-  return is_build_activity(activity, NULL)
+  return is_build_activity(activity)
     || is_clean_activity(activity)
     || is_terrain_change_activity(activity);
 }
diff --git a/common/unit.h b/common/unit.h
index 5b358530f3..5b81987240 100644
--- a/common/unit.h
+++ b/common/unit.h
@@ -401,7 +401,7 @@ bool is_my_zoc(const struct player *unit_owner, const struct tile *ptile,
 bool unit_being_aggressive(const struct unit *punit);
 bool unit_type_really_ignores_zoc(const struct unit_type *punittype);
 
-bool is_build_activity(enum unit_activity activity, const struct tile *ptile);
+bool is_build_activity(enum unit_activity activity);
 bool is_clean_activity(enum unit_activity activity);
 bool is_terrain_change_activity(enum unit_activity activity);
 bool is_tile_activity(enum unit_activity activity);
-- 
2.39.0