From 5b8f60d8e691e6a8b426554990a1b417852e4e4d Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Sat, 19 Feb 2022 03:09:55 +0200 Subject: [PATCH 42/43] Correct "payed" typos -> "paid" See osdn #43709 Signed-off-by: Marko Lindqvist --- common/unit.c | 4 ++-- common/unit.h | 4 ++-- common/unittype.c | 2 +- data/sandbox/units.ruleset | 2 +- server/cityturn.c | 22 +++++++++++----------- 5 files changed, 17 insertions(+), 17 deletions(-) diff --git a/common/unit.c b/common/unit.c index be6edebfcc..eb53f5dd94 100644 --- a/common/unit.c +++ b/common/unit.c @@ -1617,8 +1617,8 @@ struct unit *unit_virtual_create(struct player *pplayer, struct city *pcity, punit->server.removal_callback = NULL; - memset(punit->server.upkeep_payed, 0, - O_LAST * sizeof(*punit->server.upkeep_payed)); + memset(punit->server.upkeep_paid, 0, + O_LAST * sizeof(*punit->server.upkeep_paid)); punit->server.ord_map = 0; punit->server.ord_city = 0; diff --git a/common/unit.h b/common/unit.h index e9862aa8c5..74c851d893 100644 --- a/common/unit.h +++ b/common/unit.h @@ -248,8 +248,8 @@ struct unit { /* Call back to run on unit removal. */ void (*removal_callback)(struct unit *punit); - /* The upkeep that actually was payed. */ - int upkeep_payed[O_LAST]; + /* The upkeep that actually was paid. */ + int upkeep_paid[O_LAST]; } server; }; }; diff --git a/common/unittype.c b/common/unittype.c index 38ffc4e3c2..624a0a4dd8 100644 --- a/common/unittype.c +++ b/common/unittype.c @@ -1786,7 +1786,7 @@ int unit_upgrade_price(const struct player *pplayer, const struct unit_type *from, const struct unit_type *to) { - /* Upgrade price is only payed for "Upgrade Unit" so it is safe to hard + /* Upgrade price is only paid for "Upgrade Unit" so it is safe to hard * code the action ID for now. paction will have to become a parameter * before generalized actions appears. */ const struct action *paction = action_by_number(ACTION_UPGRADE_UNIT); diff --git a/data/sandbox/units.ruleset b/data/sandbox/units.ruleset index 785e46fc56..0dec775bc2 100644 --- a/data/sandbox/units.ruleset +++ b/data/sandbox/units.ruleset @@ -2352,7 +2352,7 @@ On impact, the blast will destroy any unit in an area 3 tiles wide\ Nuclear fallout reduces tile output and increases the risk of global\ nuclear winter; see the help on Fallout.\ "), _("\ -Make sure that the upkeep (gold and shield) of your ICBM is payed.\ +Make sure that the upkeep (gold and shield) of your ICBM is paid.\ A non maintained nuke will detonate in place.\ "), _("\ TIP: You may be involved in a situation where you've invaded an\ diff --git a/server/cityturn.c b/server/cityturn.c index 3a679b39d1..3591d74669 100644 --- a/server/cityturn.c +++ b/server/cityturn.c @@ -85,7 +85,7 @@ static struct city_list *city_refresh_queue = NULL; /* The game is currently considering to remove the listed units because of * missing gold upkeep. A unit ends up here if it has gold upkeep that - * can't be payed. A random unit in the list will be removed until the + * can't be paid. A random unit in the list will be removed until the * problem is solved. */ static struct unit_list *uk_rem_gold = NULL; @@ -2693,7 +2693,7 @@ static void uk_rem_gold_callback(struct unit *punit) /* Remove the unit from uk_rem_gold. */ unit_list_remove(uk_rem_gold, punit); - gold_upkeep = punit->server.upkeep_payed[O_GOLD]; + gold_upkeep = punit->server.upkeep_paid[O_GOLD]; /* All units in uk_rem_gold should have gold upkeep! */ fc_assert_ret_msg(gold_upkeep > 0, "%s has %d gold upkeep", @@ -2769,7 +2769,7 @@ static struct unit *sell_random_unit(struct player *pplayer, unit_cargo_iterate(punit, pcargo) { /* Optimization, do not iterate over punitlist * if we are sure that pcargo is not in it. */ - if (pcargo->server.upkeep_payed[O_GOLD] > 0) { + if (pcargo->server.upkeep_paid[O_GOLD] > 0) { unit_list_iterate(punitlist, p2) { if (pcargo == p2) { unit_list_append(cargo, pcargo); @@ -2804,7 +2804,7 @@ static struct unit *sell_random_unit(struct player *pplayer, game.info.muuk_gold_wipe)) { unit_list_remove(punitlist, punit); - /* The gold was payed back when the unit removal made + /* The gold was paid back when the unit removal made * uk_rem_gold_callback() run as the unit's removal call back. */ notify_player(pplayer, utile, E_UNIT_LOST_MISC, ftc_server, @@ -2851,7 +2851,7 @@ static bool player_balance_treasury_units_and_buildings } city_built_iterate_end; unit_list_iterate(pcity->units_supported, punit) { - if (punit->server.upkeep_payed[O_GOLD] > 0) { + if (punit->server.upkeep_paid[O_GOLD] > 0) { uk_rem_gold_append(punit); } } unit_list_iterate_end; @@ -2900,7 +2900,7 @@ static bool player_balance_treasury_units(struct player *pplayer) city_list_iterate(pplayer->cities, pcity) { unit_list_iterate(pcity->units_supported, punit) { - if (punit->server.upkeep_payed[O_GOLD] > 0) { + if (punit->server.upkeep_paid[O_GOLD] > 0) { uk_rem_gold_append(punit); } } unit_list_iterate_end; @@ -2986,9 +2986,9 @@ static bool city_balance_treasury_units(struct city *pcity) /* Create a vector of all supported units with gold upkeep. */ unit_list_iterate(pcity->units_supported, punit) { - if (punit->server.upkeep_payed[O_GOLD] > 0) { - uk_rem_gold_append(punit); - } + if (punit->server.upkeep_paid[O_GOLD] > 0) { + uk_rem_gold_append(punit); + } } unit_list_iterate_end; /* Still not enough gold, so try "selling" some units. */ @@ -3274,9 +3274,9 @@ static void update_city_activity(struct city *pcity) pplayer->economic.gold -= city_total_impr_gold_upkeep(pcity); pplayer->economic.gold -= city_total_unit_gold_upkeep(pcity); - /* Remember how much gold upkeep each unit was payed. */ + /* Remember how much gold upkeep each unit was paid. */ unit_list_iterate(pcity->units_supported, punit) { - punit->server.upkeep_payed[O_GOLD] = punit->upkeep[O_GOLD]; + punit->server.upkeep_paid[O_GOLD] = punit->upkeep[O_GOLD]; } unit_list_iterate_end; if (pplayer->economic.gold < 0) { -- 2.34.1