From 6edeec90e23dd3c53f023fc6f5940633c46fca10 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Wed, 23 Nov 2022 22:36:32 +0200 Subject: [PATCH 17/17] Correct "in stead" as "instead" See osdn #44787 Signed-off-by: Marko Lindqvist --- ai/default/daidomestic.c | 2 +- client/gui-gtk-2.0/action_dialog.c | 2 +- client/gui-gtk-3.0/action_dialog.c | 2 +- client/gui-gtk-3.22/action_dialog.c | 2 +- client/gui-sdl2/action_dialog.c | 4 ++-- common/actions.c | 4 ++-- common/actions.h | 2 +- common/map.c | 2 +- common/networking/dataio_json.c | 8 ++++---- data/alien/game.ruleset | 8 ++++---- data/alien/techs.ruleset | 2 +- data/civ1/game.ruleset | 8 ++++---- data/civ1/techs.ruleset | 2 +- data/civ2/game.ruleset | 8 ++++---- data/civ2/techs.ruleset | 2 +- data/civ2civ3/game.ruleset | 8 ++++---- data/civ2civ3/techs.ruleset | 2 +- data/classic/game.ruleset | 8 ++++---- data/classic/techs.ruleset | 2 +- data/experimental/game.ruleset | 8 ++++---- data/experimental/techs.ruleset | 2 +- data/multiplayer/game.ruleset | 8 ++++---- data/multiplayer/techs.ruleset | 2 +- data/ruledit/comments.txt | 2 +- data/sandbox/game.ruleset | 8 ++++---- data/sandbox/techs.ruleset | 2 +- data/stub/game.ruleset | 8 ++++---- data/stub/techs.ruleset | 2 +- data/webperimental/game.ruleset | 8 ++++---- data/webperimental/techs.ruleset | 2 +- doc/HACKING | 2 +- server/unithand.c | 2 +- 32 files changed, 67 insertions(+), 67 deletions(-) diff --git a/ai/default/daidomestic.c b/ai/default/daidomestic.c index e487b80028..0d6eec7bcf 100644 --- a/ai/default/daidomestic.c +++ b/ai/default/daidomestic.c @@ -230,7 +230,7 @@ static void dai_choose_trade_route(struct ai_type *ait, struct city *pcity, if (!unit_type) { /* We'll never be able to establish a trade route. Consider a unit that - * can enter the marketplace in stead to stimulate science. */ + * can enter the marketplace instead, to stimulate science. */ unit_type = get_role_unit(action_id_get_role(ACTION_MARKETPLACE), 0); } diff --git a/client/gui-gtk-2.0/action_dialog.c b/client/gui-gtk-2.0/action_dialog.c index 5f04823be4..817ecff164 100644 --- a/client/gui-gtk-2.0/action_dialog.c +++ b/client/gui-gtk-2.0/action_dialog.c @@ -71,7 +71,7 @@ static GtkWidget *spy_tech_shell; static GtkWidget *spy_sabotage_shell; -/* A structure to hold parameters for actions inside the GUI in stead of +/* A structure to hold parameters for actions inside the GUI instead of * storing the needed data in a global variable. */ struct action_data { action_id act_id; diff --git a/client/gui-gtk-3.0/action_dialog.c b/client/gui-gtk-3.0/action_dialog.c index bf95dc5519..3ed6b2d72d 100644 --- a/client/gui-gtk-3.0/action_dialog.c +++ b/client/gui-gtk-3.0/action_dialog.c @@ -74,7 +74,7 @@ static GtkWidget *spy_tech_shell; static GtkWidget *spy_sabotage_shell; -/* A structure to hold parameters for actions inside the GUI in stead of +/* A structure to hold parameters for actions inside the GUI instead of * storing the needed data in a global variable. */ struct action_data { action_id act_id; diff --git a/client/gui-gtk-3.22/action_dialog.c b/client/gui-gtk-3.22/action_dialog.c index f849d2c684..8fe42fe556 100644 --- a/client/gui-gtk-3.22/action_dialog.c +++ b/client/gui-gtk-3.22/action_dialog.c @@ -74,7 +74,7 @@ static GtkWidget *spy_tech_shell; static GtkWidget *spy_sabotage_shell; -/* A structure to hold parameters for actions inside the GUI in stead of +/* A structure to hold parameters for actions inside the GUI instead of * storing the needed data in a global variable. */ struct action_data { action_id act_id; diff --git a/client/gui-sdl2/action_dialog.c b/client/gui-sdl2/action_dialog.c index a422cf1312..33e3324a0a 100644 --- a/client/gui-sdl2/action_dialog.c +++ b/client/gui-sdl2/action_dialog.c @@ -343,7 +343,7 @@ static int spy_investigate_callback(struct widget *pWidget) 0, ""); } - /* FIXME: Wait for the city display in stead? */ + /* FIXME: Wait for the city display instead? */ popdown_diplomat_dialog(); } @@ -365,7 +365,7 @@ static int diplomat_investigate_callback(struct widget *pWidget) 0, ""); } - /* FIXME: Wait for the city display in stead? */ + /* FIXME: Wait for the city display instead? */ popdown_diplomat_dialog(); } diff --git a/common/actions.c b/common/actions.c index df7e0ca859..6b7eaf7caa 100644 --- a/common/actions.c +++ b/common/actions.c @@ -3501,7 +3501,7 @@ static struct act_prob ap_diplomat_battle(const struct unit *pattacker, continue; } - /* There will be a diplomatic battle in stead of an action. */ + /* There will be a diplomatic battle instead of an action. */ return ap_dipl_battle_win(pattacker, punit); } unit_list_iterate_end; @@ -5197,7 +5197,7 @@ int action_dice_roll_odds(const struct player *act_player, paction->id); /* Let the Action_Odds_Pct effect modify the odds. The advantage of doing - * it this way in stead of rolling twice is that Action_Odds_Pct can + * it this way instead of rolling twice is that Action_Odds_Pct can * increase the odds. */ odds += ((odds * get_target_bonus_effects(NULL, diff --git a/common/actions.h b/common/actions.h index f2846b12c1..e98aa2dac1 100644 --- a/common/actions.h +++ b/common/actions.h @@ -198,7 +198,7 @@ struct action enum action_actor_kind actor_kind; enum action_target_kind target_kind; - bool hostile; /* TODO: Should this be a scale in stead? */ + bool hostile; /* TODO: Should this be a scale instead? */ /* Is the player required to specify details about this action? Only true * IFF the action needs details AND the server won't fill them in when diff --git a/common/map.c b/common/map.c index 454d306f4e..f1b05e1f86 100644 --- a/common/map.c +++ b/common/map.c @@ -1270,7 +1270,7 @@ static bool is_valid_dir_calculate(enum direction8 dir) Returns TRUE iff the given direction is a valid one. If the direction could be out of range you should use - map_untrusted_dir_is_valid() in stead. + map_untrusted_dir_is_valid() instead. **************************************************************************/ bool is_valid_dir(enum direction8 dir) { diff --git a/common/networking/dataio_json.c b/common/networking/dataio_json.c index 9f019e9db8..a289c86ba8 100644 --- a/common/networking/dataio_json.c +++ b/common/networking/dataio_json.c @@ -79,7 +79,7 @@ static void plocation_write_data(json_t *item, json_t *data); /************************************************************************** - Helper for plocation_write_data(). Use it in stead of this. + Helper for plocation_write_data(). Use it instead of this. **************************************************************************/ static void plocation_write_field(json_t *item, const struct plocation *location, @@ -94,7 +94,7 @@ static void plocation_write_field(json_t *item, } /************************************************************************** - Helper for plocation_write_data(). Use it in stead of this. + Helper for plocation_write_data(). Use it instead of this. **************************************************************************/ static void plocation_write_elem(json_t *item, const struct plocation *location, @@ -133,7 +133,7 @@ static json_t *plocation_read_data(json_t *item, const struct plocation *location); /************************************************************************** - Helper for plocation_read_data(). Use it in stead of this. + Helper for plocation_read_data(). Use it instead of this. **************************************************************************/ static json_t *plocation_read_field(json_t *item, const struct plocation *location) @@ -147,7 +147,7 @@ static json_t *plocation_read_field(json_t *item, } /************************************************************************** - Helper for plocation_read_data(). Use it in stead of this. + Helper for plocation_read_data(). Use it instead of this. **************************************************************************/ static json_t *plocation_read_elem(json_t *item, const struct plocation *location) diff --git a/data/alien/game.ruleset b/data/alien/game.ruleset index 3440b61146..b16978dc1c 100644 --- a/data/alien/game.ruleset +++ b/data/alien/game.ruleset @@ -225,22 +225,22 @@ only_killing_makes_veteran = FALSE [actions] ; If force_trade_route is set to TRUE it is illegal for an actor unit to ; enter the marketplace of a city if it can establish a trade route to it -; in stead. +; instead. force_trade_route = TRUE ; If force_capture_units is set to TRUE it is illegal for an actor unit to ; bombard, explode nuclear or perform a regular attack against a tile if -; it can capture units on it in stead. +; it can capture units on it instead. force_capture_units = TRUE ; If force_bombard is set to TRUE it is illegal for an actor unit to ; explode nuclear or perform a regular attack against a tile if it can -; bombard it in stead. +; bombard it instead. force_bombard = TRUE ; If force_explode_nuclear is set to TRUE it is illegal for an actor unit ; to perform a regular attack against a tile if it can do explode nuclear -; in stead. +; instead. force_explode_nuclear = FALSE ; If poison_empties_food_stock is set to TRUE a successful "Poison City" diff --git a/data/alien/techs.ruleset b/data/alien/techs.ruleset index d52aa9ce7b..9ee3a24213 100644 --- a/data/alien/techs.ruleset +++ b/data/alien/techs.ruleset @@ -82,7 +82,7 @@ format_version=10 ; tech requirements because it is a requirement vector. ; See doc/README.effects to learn more about requirement ; vectors. -; Requiring a tech here in stead of in req1, req2 or +; Requiring a tech here instead of in req1, req2 or ; root_req is not supported yet. ; Requirements that may become fulfilled during the game ; when they weren't at the start of the game is not diff --git a/data/civ1/game.ruleset b/data/civ1/game.ruleset index 02abb01546..9d4cd0a523 100644 --- a/data/civ1/game.ruleset +++ b/data/civ1/game.ruleset @@ -205,22 +205,22 @@ will_never = "Nuclear" [actions] ; If force_trade_route is set to TRUE it is illegal for an actor unit to ; enter the marketplace of a city if it can establish a trade route to it -; in stead. +; instead. force_trade_route = TRUE ; If force_capture_units is set to TRUE it is illegal for an actor unit to ; bombard, explode nuclear or perform a regular attack against a tile if -; it can capture units on it in stead. +; it can capture units on it instead. force_capture_units = FALSE ; If force_bombard is set to TRUE it is illegal for an actor unit to ; explode nuclear or perform a regular attack against a tile if it can -; bombard it in stead. +; bombard it instead. force_bombard = FALSE ; If force_explode_nuclear is set to TRUE it is illegal for an actor unit ; to perform a regular attack against a tile if it can do explode nuclear -; in stead. +; instead. force_explode_nuclear = TRUE ; If poison_empties_food_stock is set to TRUE a successful "Poison City" diff --git a/data/civ1/techs.ruleset b/data/civ1/techs.ruleset index 78439f47eb..1a70aa4e06 100644 --- a/data/civ1/techs.ruleset +++ b/data/civ1/techs.ruleset @@ -78,7 +78,7 @@ format_version=10 ; tech requirements because it is a requirement vector. ; See doc/README.effects to learn more about requirement ; vectors. -; Requiring a tech here in stead of in req1, req2 or +; Requiring a tech here instead of in req1, req2 or ; root_req is not supported yet. ; Requirements that may become fulfilled during the game ; when they weren't at the start of the game is not diff --git a/data/civ2/game.ruleset b/data/civ2/game.ruleset index 19c956738f..c14da84941 100644 --- a/data/civ2/game.ruleset +++ b/data/civ2/game.ruleset @@ -222,22 +222,22 @@ will_never = "Nuclear" [actions] ; If force_trade_route is set to TRUE it is illegal for an actor unit to ; enter the marketplace of a city if it can establish a trade route to it -; in stead. +; instead. force_trade_route = TRUE ; If force_capture_units is set to TRUE it is illegal for an actor unit to ; bombard, explode nuclear or perform a regular attack against a tile if -; it can capture units on it in stead. +; it can capture units on it instead. force_capture_units = FALSE ; If force_bombard is set to TRUE it is illegal for an actor unit to ; explode nuclear or perform a regular attack against a tile if it can -; bombard it in stead. +; bombard it instead. force_bombard = FALSE ; If force_explode_nuclear is set to TRUE it is illegal for an actor unit ; to perform a regular attack against a tile if it can do explode nuclear -; in stead. +; instead. force_explode_nuclear = TRUE ; If poison_empties_food_stock is set to TRUE a successful "Poison City" diff --git a/data/civ2/techs.ruleset b/data/civ2/techs.ruleset index 51b8f71fb3..92b6c2be9b 100644 --- a/data/civ2/techs.ruleset +++ b/data/civ2/techs.ruleset @@ -78,7 +78,7 @@ format_version=10 ; tech requirements because it is a requirement vector. ; See doc/README.effects to learn more about requirement ; vectors. -; Requiring a tech here in stead of in req1, req2 or +; Requiring a tech here instead of in req1, req2 or ; root_req is not supported yet. ; Requirements that may become fulfilled during the game ; when they weren't at the start of the game is not diff --git a/data/civ2civ3/game.ruleset b/data/civ2civ3/game.ruleset index 7efbf30d24..637d9d8575 100644 --- a/data/civ2civ3/game.ruleset +++ b/data/civ2civ3/game.ruleset @@ -231,22 +231,22 @@ will_never = "Nuclear" [actions] ; If force_trade_route is set to TRUE it is illegal for an actor unit to ; enter the marketplace of a city if it can establish a trade route to it -; in stead. +; instead. force_trade_route = TRUE ; If force_capture_units is set to TRUE it is illegal for an actor unit to ; bombard, explode nuclear or perform a regular attack against a tile if -; it can capture units on it in stead. +; it can capture units on it instead. force_capture_units = TRUE ; If force_bombard is set to TRUE it is illegal for an actor unit to ; explode nuclear or perform a regular attack against a tile if it can -; bombard it in stead. +; bombard it instead. force_bombard = TRUE ; If force_explode_nuclear is set to TRUE it is illegal for an actor unit ; to perform a regular attack against a tile if it can do explode nuclear -; in stead. +; instead. force_explode_nuclear = TRUE ; If poison_empties_food_stock is set to TRUE a successful "Poison City" diff --git a/data/civ2civ3/techs.ruleset b/data/civ2civ3/techs.ruleset index ecdc6d86bd..a1d962a550 100644 --- a/data/civ2civ3/techs.ruleset +++ b/data/civ2civ3/techs.ruleset @@ -78,7 +78,7 @@ format_version=10 ; tech requirements because it is a requirement vector. ; See doc/README.effects to learn more about requirement ; vectors. -; Requiring a tech here in stead of in req1, req2 or +; Requiring a tech here instead of in req1, req2 or ; root_req is not supported yet. ; Requirements that may become fulfilled during the game ; when they weren't at the start of the game is not diff --git a/data/classic/game.ruleset b/data/classic/game.ruleset index 945220bfb6..fd58c16557 100644 --- a/data/classic/game.ruleset +++ b/data/classic/game.ruleset @@ -226,22 +226,22 @@ will_never = "Nuclear" [actions] ; If force_trade_route is set to TRUE it is illegal for an actor unit to ; enter the marketplace of a city if it can establish a trade route to it -; in stead. +; instead. force_trade_route = TRUE ; If force_capture_units is set to TRUE it is illegal for an actor unit to ; bombard, explode nuclear or perform a regular attack against a tile if -; it can capture units on it in stead. +; it can capture units on it instead. force_capture_units = FALSE ; If force_bombard is set to TRUE it is illegal for an actor unit to ; explode nuclear or perform a regular attack against a tile if it can -; bombard it in stead. +; bombard it instead. force_bombard = FALSE ; If force_explode_nuclear is set to TRUE it is illegal for an actor unit ; to perform a regular attack against a tile if it can do explode nuclear -; in stead. +; instead. force_explode_nuclear = TRUE ; If poison_empties_food_stock is set to TRUE a successful "Poison City" diff --git a/data/classic/techs.ruleset b/data/classic/techs.ruleset index 87340a08d8..2cacac02b6 100644 --- a/data/classic/techs.ruleset +++ b/data/classic/techs.ruleset @@ -78,7 +78,7 @@ format_version=10 ; tech requirements because it is a requirement vector. ; See doc/README.effects to learn more about requirement ; vectors. -; Requiring a tech here in stead of in req1, req2 or +; Requiring a tech here instead of in req1, req2 or ; root_req is not supported yet. ; Requirements that may become fulfilled during the game ; when they weren't at the start of the game is not diff --git a/data/experimental/game.ruleset b/data/experimental/game.ruleset index d9a3852ba1..32a1128cce 100644 --- a/data/experimental/game.ruleset +++ b/data/experimental/game.ruleset @@ -229,22 +229,22 @@ will_never = "Nuclear" [actions] ; If force_trade_route is set to TRUE it is illegal for an actor unit to ; enter the marketplace of a city if it can establish a trade route to it -; in stead. +; instead. force_trade_route = FALSE ; If force_capture_units is set to TRUE it is illegal for an actor unit to ; bombard, explode nuclear or perform a regular attack against a tile if -; it can capture units on it in stead. +; it can capture units on it instead. force_capture_units = FALSE ; If force_bombard is set to TRUE it is illegal for an actor unit to ; explode nuclear or perform a regular attack against a tile if it can -; bombard it in stead. +; bombard it instead. force_bombard = FALSE ; If force_explode_nuclear is set to TRUE it is illegal for an actor unit ; to perform a regular attack against a tile if it can do explode nuclear -; in stead. +; instead. force_explode_nuclear = TRUE ; If poison_empties_food_stock is set to TRUE a successful "Poison City" diff --git a/data/experimental/techs.ruleset b/data/experimental/techs.ruleset index a30d420c0d..2f7eb2605b 100644 --- a/data/experimental/techs.ruleset +++ b/data/experimental/techs.ruleset @@ -80,7 +80,7 @@ format_version=10 ; tech requirements because it is a requirement vector. ; See doc/README.effects to learn more about requirement ; vectors. -; Requiring a tech here in stead of in req1, req2 or +; Requiring a tech here instead of in req1, req2 or ; root_req is not supported yet. ; Requirements that may become fulfilled during the game ; when they weren't at the start of the game is not diff --git a/data/multiplayer/game.ruleset b/data/multiplayer/game.ruleset index 680f08a006..dd6bf287c9 100644 --- a/data/multiplayer/game.ruleset +++ b/data/multiplayer/game.ruleset @@ -229,22 +229,22 @@ will_never = "Nuclear" [actions] ; If force_trade_route is set to TRUE it is illegal for an actor unit to ; enter the marketplace of a city if it can establish a trade route to it -; in stead. +; instead. force_trade_route = FALSE ; If force_capture_units is set to TRUE it is illegal for an actor unit to ; bombard, explode nuclear or perform a regular attack against a tile if -; it can capture units on it in stead. +; it can capture units on it instead. force_capture_units = FALSE ; If force_bombard is set to TRUE it is illegal for an actor unit to ; explode nuclear or perform a regular attack against a tile if it can -; bombard it in stead. +; bombard it instead. force_bombard = FALSE ; If force_explode_nuclear is set to TRUE it is illegal for an actor unit ; to perform a regular attack against a tile if it can do explode nuclear -; in stead. +; instead. force_explode_nuclear = TRUE ; If poison_empties_food_stock is set to TRUE a successful "Poison City" diff --git a/data/multiplayer/techs.ruleset b/data/multiplayer/techs.ruleset index b657df4593..3542f12e54 100644 --- a/data/multiplayer/techs.ruleset +++ b/data/multiplayer/techs.ruleset @@ -78,7 +78,7 @@ format_version=10 ; tech requirements because it is a requirement vector. ; See doc/README.effects to learn more about requirement ; vectors. -; Requiring a tech here in stead of in req1, req2 or +; Requiring a tech here instead of in req1, req2 or ; root_req is not supported yet. ; Requirements that may become fulfilled during the game ; when they weren't at the start of the game is not diff --git a/data/ruledit/comments.txt b/data/ruledit/comments.txt index d201111ca0..413874a7b2 100644 --- a/data/ruledit/comments.txt +++ b/data/ruledit/comments.txt @@ -125,7 +125,7 @@ techs = "\ ; tech requirements because it is a requirement vector.\n\ ; See doc/README.effects to learn more about requirement\n\ ; vectors.\n\ -; Requiring a tech here in stead of in req1, req2 or\n\ +; Requiring a tech here instead of in req1, req2 or\n\ ; root_req is not supported yet.\n\ ; Requirements that may become fulfilled during the game\n\ ; when they weren't at the start of the game is not\n\ diff --git a/data/sandbox/game.ruleset b/data/sandbox/game.ruleset index 9526ce3ec3..046b69edf6 100644 --- a/data/sandbox/game.ruleset +++ b/data/sandbox/game.ruleset @@ -229,22 +229,22 @@ will_never = "Nuclear" [actions] ; If force_trade_route is set to TRUE it is illegal for an actor unit to ; enter the marketplace of a city if it can establish a trade route to it -; in stead. +; instead. force_trade_route = FALSE ; If force_capture_units is set to TRUE it is illegal for an actor unit to ; bombard, explode nuclear or perform a regular attack against a tile if -; it can capture units on it in stead. +; it can capture units on it instead. force_capture_units = TRUE ; If force_bombard is set to TRUE it is illegal for an actor unit to ; explode nuclear or perform a regular attack against a tile if it can -; bombard it in stead. +; bombard it instead. force_bombard = TRUE ; If force_explode_nuclear is set to TRUE it is illegal for an actor unit ; to perform a regular attack against a tile if it can do explode nuclear -; in stead. +; instead. force_explode_nuclear = TRUE ; If poison_empties_food_stock is set to TRUE a successful "Poison City" diff --git a/data/sandbox/techs.ruleset b/data/sandbox/techs.ruleset index e98b0749c7..7fd6044d50 100644 --- a/data/sandbox/techs.ruleset +++ b/data/sandbox/techs.ruleset @@ -78,7 +78,7 @@ format_version=10 ; tech requirements because it is a requirement vector. ; See doc/README.effects to learn more about requirement ; vectors. -; Requiring a tech here in stead of in req1, req2 or +; Requiring a tech here instead of in req1, req2 or ; root_req is not supported yet. ; Requirements that may become fulfilled during the game ; when they weren't at the start of the game is not diff --git a/data/stub/game.ruleset b/data/stub/game.ruleset index c59f155cbc..66ed61aabe 100644 --- a/data/stub/game.ruleset +++ b/data/stub/game.ruleset @@ -213,22 +213,22 @@ only_killing_makes_veteran = FALSE [actions] ; If force_trade_route is set to TRUE it is illegal for an actor unit to ; enter the marketplace of a city if it can establish a trade route to it -; in stead. +; instead. force_trade_route = FALSE ; If force_capture_units is set to TRUE it is illegal for an actor unit to ; bombard, explode nuclear or perform a regular attack against a tile if -; it can capture units on it in stead. +; it can capture units on it instead. force_capture_units = FALSE ; If force_bombard is set to TRUE it is illegal for an actor unit to ; explode nuclear or perform a regular attack against a tile if it can -; bombard it in stead. +; bombard it instead. force_bombard = FALSE ; If force_explode_nuclear is set to TRUE it is illegal for an actor unit ; to perform a regular attack against a tile if it can do explode nuclear -; in stead. +; instead. force_explode_nuclear = FALSE ; If poison_empties_food_stock is set to TRUE a successful "Poison City" diff --git a/data/stub/techs.ruleset b/data/stub/techs.ruleset index e1bf670a7e..d24c4927a5 100644 --- a/data/stub/techs.ruleset +++ b/data/stub/techs.ruleset @@ -72,7 +72,7 @@ format_version=10 ; tech requirements because it is a requirement vector. ; See doc/README.effects to learn more about requirement ; vectors. -; Requiring a tech here in stead of in req1, req2 or +; Requiring a tech here instead of in req1, req2 or ; root_req is not supported yet. ; Requirements that may become fulfilled during the game ; when they weren't at the start of the game is not diff --git a/data/webperimental/game.ruleset b/data/webperimental/game.ruleset index 8fc7115daf..e658dd79af 100644 --- a/data/webperimental/game.ruleset +++ b/data/webperimental/game.ruleset @@ -230,22 +230,22 @@ will_never = "Nuclear" [actions] ; If force_trade_route is set to TRUE it is illegal for an actor unit to ; enter the marketplace of a city if it can establish a trade route to it -; in stead. +; instead. force_trade_route = TRUE ; If force_capture_units is set to TRUE it is illegal for an actor unit to ; bombard, explode nuclear or perform a regular attack against a tile if -; it can capture units on it in stead. +; it can capture units on it instead. force_capture_units = FALSE ; If force_bombard is set to TRUE it is illegal for an actor unit to ; explode nuclear or perform a regular attack against a tile if it can -; bombard it in stead. +; bombard it instead. force_bombard = FALSE ; If force_explode_nuclear is set to TRUE it is illegal for an actor unit ; to perform a regular attack against a tile if it can do explode nuclear -; in stead. +; instead. force_explode_nuclear = TRUE ; If poison_empties_food_stock is set to TRUE a successful "Poison City" diff --git a/data/webperimental/techs.ruleset b/data/webperimental/techs.ruleset index 7438b2c9dd..8b27ff1efe 100644 --- a/data/webperimental/techs.ruleset +++ b/data/webperimental/techs.ruleset @@ -78,7 +78,7 @@ format_version=10 ; tech requirements because it is a requirement vector. ; See doc/README.effects to learn more about requirement ; vectors. -; Requiring a tech here in stead of in req1, req2 or +; Requiring a tech here instead of in req1, req2 or ; root_req is not supported yet. ; Requirements that may become fulfilled during the game ; when they weren't at the start of the game is not diff --git a/doc/HACKING b/doc/HACKING index 51bf70290d..f977a83b7b 100644 --- a/doc/HACKING +++ b/doc/HACKING @@ -858,7 +858,7 @@ text generation and agents and for third party tools. Please don't make non actions actions because they are similar to actions or because some of the things Freeciv automatically does for actions would -be nice to have. Abstract out the stuff you want in stead. Make it apply to +be nice to have. Abstract out the stuff you want instead. Make it apply to both actions and to the thing you wanted. An action is something a player can order a game entity, the actor, to do. diff --git a/server/unithand.c b/server/unithand.c index f5b9ebbe51..03a4da3aed 100644 --- a/server/unithand.c +++ b/server/unithand.c @@ -743,7 +743,7 @@ static bool rel_may_become_war(const struct player *pplayer, Returns the first player that may enable the specified action if war is declared. - Helper for need_war_player(). Use it in stead. + Helper for need_war_player(). Use it instead. **************************************************************************/ static struct player *need_war_player_hlp(const struct unit *actor, const action_id act, -- 2.35.1