From df764242dd22cb743ec3de86698681bbbbde8c0e Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Sun, 8 Nov 2026 02:41:30 +0200 Subject: [PATCH 57/57] Rename REQEST_* as REQUEST_* Requested by Andrew McGuinness See RM #2448 Signed-off-by: Marko Lindqvist --- client/control.c | 4 +-- client/gui-gtk-3.22/action_dialog.c | 8 ++--- client/gui-gtk-4.0/action_dialog.c | 8 ++--- client/gui-gtk-5.0/action_dialog.c | 8 ++--- client/gui-qt/dialogs.cpp | 2 +- client/packhand.c | 48 ++++++++++++++--------------- common/networking/packets.h | 2 +- server/unithand.c | 18 +++++------ 8 files changed, 49 insertions(+), 49 deletions(-) diff --git a/client/control.c b/client/control.c index 1f1b312783..0347a4bca3 100644 --- a/client/control.c +++ b/client/control.c @@ -379,7 +379,7 @@ static void ask_server_for_actions(struct unit *punit) IDENTITY_NUMBER_ZERO, tile_index(punit->action_decision_tile), EXTRA_NONE, - REQEST_PLAYER_INITIATED); + REQUEST_PLAYER_INITIATED); } /**********************************************************************//** @@ -1815,7 +1815,7 @@ void request_action_details(action_id action, int actor_id, /* Users that need the answer in the * background should send the packet them * self. At least for now. */ - REQEST_PLAYER_INITIATED); + REQUEST_PLAYER_INITIATED); } /**********************************************************************//** diff --git a/client/gui-gtk-3.22/action_dialog.c b/client/gui-gtk-3.22/action_dialog.c index 0854930ac2..c0bfd8889d 100644 --- a/client/gui-gtk-3.22/action_dialog.c +++ b/client/gui-gtk-3.22/action_dialog.c @@ -1112,14 +1112,14 @@ static void tgt_unit_change_callback(GtkWidget *dlg, gint arg) IDENTITY_NUMBER_ZERO, tgt_tile->index, action_selection_target_extra(), - REQEST_PLAYER_INITIATED); + REQUEST_PLAYER_INITIATED); } else { dsend_packet_unit_get_actions(&client.conn, actor->id, tgt_id, tgt_tile->index, action_selection_target_extra(), - REQEST_PLAYER_INITIATED); + REQUEST_PLAYER_INITIATED); } } } else { @@ -1183,14 +1183,14 @@ static void tgt_extra_change_callback(GtkWidget *dlg, gint arg) /* Let the server choose the target * extra. */ action_selection_target_extra(), - REQEST_PLAYER_INITIATED); + REQUEST_PLAYER_INITIATED); } else { dsend_packet_unit_get_actions(&client.conn, actor->id, action_selection_target_unit(), tgt_tile->index, tgt_id, - REQEST_PLAYER_INITIATED); + REQUEST_PLAYER_INITIATED); } } } else { diff --git a/client/gui-gtk-4.0/action_dialog.c b/client/gui-gtk-4.0/action_dialog.c index 562a2f8ed2..659c3a60d1 100644 --- a/client/gui-gtk-4.0/action_dialog.c +++ b/client/gui-gtk-4.0/action_dialog.c @@ -1108,14 +1108,14 @@ static void tgt_unit_change_callback(GtkWidget *dlg, gint arg) IDENTITY_NUMBER_ZERO, tgt_tile->index, action_selection_target_extra(), - REQEST_PLAYER_INITIATED); + REQUEST_PLAYER_INITIATED); } else { dsend_packet_unit_get_actions(&client.conn, actor->id, tgt_id, tgt_tile->index, action_selection_target_extra(), - REQEST_PLAYER_INITIATED); + REQUEST_PLAYER_INITIATED); } } } else { @@ -1179,14 +1179,14 @@ static void tgt_extra_change_callback(GtkWidget *dlg, gint arg) /* Let the server choose the target * extra. */ action_selection_target_extra(), - REQEST_PLAYER_INITIATED); + REQUEST_PLAYER_INITIATED); } else { dsend_packet_unit_get_actions(&client.conn, actor->id, action_selection_target_unit(), tgt_tile->index, tgt_id, - REQEST_PLAYER_INITIATED); + REQUEST_PLAYER_INITIATED); } } } else { diff --git a/client/gui-gtk-5.0/action_dialog.c b/client/gui-gtk-5.0/action_dialog.c index 54e1c26b00..b3bb398d73 100644 --- a/client/gui-gtk-5.0/action_dialog.c +++ b/client/gui-gtk-5.0/action_dialog.c @@ -1198,14 +1198,14 @@ static void tgt_unit_change_callback(GtkWidget *dlg, gint arg) IDENTITY_NUMBER_ZERO, tgt_tile->index, action_selection_target_extra(), - REQEST_PLAYER_INITIATED); + REQUEST_PLAYER_INITIATED); } else { dsend_packet_unit_get_actions(&client.conn, actor->id, tgt_id, tgt_tile->index, action_selection_target_extra(), - REQEST_PLAYER_INITIATED); + REQUEST_PLAYER_INITIATED); } } } else { @@ -1269,14 +1269,14 @@ static void tgt_extra_change_callback(GtkWidget *dlg, gint arg) /* Let the server choose the target * extra. */ action_selection_target_extra(), - REQEST_PLAYER_INITIATED); + REQUEST_PLAYER_INITIATED); } else { dsend_packet_unit_get_actions(&client.conn, actor->id, action_selection_target_unit(), tgt_tile->index, tgt_id, - REQEST_PLAYER_INITIATED); + REQUEST_PLAYER_INITIATED); } } } else { diff --git a/client/gui-qt/dialogs.cpp b/client/gui-qt/dialogs.cpp index 218615ec48..ef031891bf 100644 --- a/client/gui-qt/dialogs.cpp +++ b/client/gui-qt/dialogs.cpp @@ -1712,7 +1712,7 @@ void choice_dialog::switch_target() targeted_unit->id, targeted_unit->tile->index, action_selection_target_extra(), - REQEST_PLAYER_INITIATED); + REQUEST_PLAYER_INITIATED); layout->addLayout(unit_skip); } diff --git a/client/packhand.c b/client/packhand.c index 87ac9456d7..1bea179ddb 100644 --- a/client/packhand.c +++ b/client/packhand.c @@ -139,9 +139,9 @@ extern const char forced_tileset_name[]; static int last_turn = 0; /* Refresh the action selection dialog */ -#define REQEST_BACKGROUND_REFRESH (1) +#define REQUEST_BACKGROUND_REFRESH (1) /* Get possible actions for fast auto attack. */ -#define REQEST_BACKGROUND_FAST_AUTO_ATTACK (2) +#define REQUEST_BACKGROUND_FAST_AUTO_ATTACK (2) /* A unit will auto attack with the following actions. */ const action_id auto_attack_actions[] = { @@ -987,7 +987,7 @@ void handle_city_info(const struct packet_city_info *packet) action_selection_target_unit(), city_tile(pcity)->index, action_selection_target_extra(), - REQEST_BACKGROUND_REFRESH); + REQUEST_BACKGROUND_REFRESH); } if (gui_options.draw_city_trade_routes @@ -1691,7 +1691,7 @@ static void action_decision_handle(struct unit *punit) IDENTITY_NUMBER_ZERO, tile_index(punit->action_decision_tile), EXTRA_NONE, - REQEST_BACKGROUND_FAST_AUTO_ATTACK); + REQUEST_BACKGROUND_FAST_AUTO_ATTACK); return; } } action_array_iterate_end; @@ -2020,7 +2020,7 @@ static bool handle_unit_packet_common(struct unit *packet_unit) tile_index( packet_unit->action_decision_tile), action_selection_target_extra(), - REQEST_BACKGROUND_REFRESH); + REQUEST_BACKGROUND_REFRESH); } } punit->action_decision_want = packet_unit->action_decision_want; @@ -2913,7 +2913,7 @@ void handle_player_diplstate(const struct packet_player_diplstate *packet) action_selection_target_unit(), tgt_tile->index, action_selection_target_extra(), - REQEST_BACKGROUND_REFRESH); + REQUEST_BACKGROUND_REFRESH); } } } @@ -5065,7 +5065,7 @@ void handle_unit_action_answer(int actor_id, int target_id, int cost, log_error("handle_unit_action_answer() the action %d doesn't exist.", action_type); - if (request_kind == REQEST_PLAYER_INITIATED) { + if (request_kind == REQUEST_PLAYER_INITIATED) { action_selection_no_longer_in_progress(actor_id); action_decision_clear_want(actor_id); action_selection_next_in_focus(actor_id); @@ -5077,7 +5077,7 @@ void handle_unit_action_answer(int actor_id, int target_id, int cost, if (!pactor) { log_debug("Bad actor %d.", actor_id); - if (request_kind == REQEST_PLAYER_INITIATED) { + if (request_kind == REQUEST_PLAYER_INITIATED) { action_selection_no_longer_in_progress(actor_id); action_selection_next_in_focus(actor_id); } @@ -5089,7 +5089,7 @@ void handle_unit_action_answer(int actor_id, int target_id, int cost, case ACTION_SPY_BRIBE_UNIT: if (punit != nullptr && client.conn.playing && is_human(client.conn.playing)) { - if (request_kind == REQEST_PLAYER_INITIATED) { + if (request_kind == REQUEST_PLAYER_INITIATED) { /* Focus on the unit so the player knows where it is */ unit_focus_set(pactor); @@ -5100,7 +5100,7 @@ void handle_unit_action_answer(int actor_id, int target_id, int cost, } } else { log_debug("Bad target %d.", target_id); - if (request_kind == REQEST_PLAYER_INITIATED) { + if (request_kind == REQUEST_PLAYER_INITIATED) { action_selection_no_longer_in_progress(actor_id); action_decision_clear_want(actor_id); action_selection_next_in_focus(actor_id); @@ -5110,7 +5110,7 @@ void handle_unit_action_answer(int actor_id, int target_id, int cost, case ACTION_SPY_BRIBE_STACK: if (ptile != nullptr && client.conn.playing && is_human(client.conn.playing)) { - if (request_kind == REQEST_PLAYER_INITIATED) { + if (request_kind == REQUEST_PLAYER_INITIATED) { /* Focus on the unit so the player knows where it is */ unit_focus_set(pactor); @@ -5121,7 +5121,7 @@ void handle_unit_action_answer(int actor_id, int target_id, int cost, } } else { log_debug("Bad target %d.", target_id); - if (request_kind == REQEST_PLAYER_INITIATED) { + if (request_kind == REQUEST_PLAYER_INITIATED) { action_selection_no_longer_in_progress(actor_id); action_decision_clear_want(actor_id); action_selection_next_in_focus(actor_id); @@ -5132,7 +5132,7 @@ void handle_unit_action_answer(int actor_id, int target_id, int cost, case ACTION_SPY_INCITE_CITY_ESC: if (pcity && client.conn.playing && is_human(client.conn.playing)) { - if (request_kind == REQEST_PLAYER_INITIATED) { + if (request_kind == REQUEST_PLAYER_INITIATED) { /* Focus on the unit so the player knows where it is */ unit_focus_set(pactor); @@ -5143,7 +5143,7 @@ void handle_unit_action_answer(int actor_id, int target_id, int cost, } } else { log_debug("Bad target %d.", target_id); - if (request_kind == REQEST_PLAYER_INITIATED) { + if (request_kind == REQUEST_PLAYER_INITIATED) { action_selection_no_longer_in_progress(actor_id); action_decision_clear_want(actor_id); action_selection_next_in_focus(actor_id); @@ -5165,7 +5165,7 @@ void handle_unit_action_answer(int actor_id, int target_id, int cost, break; case ACTION_NONE: log_debug("Server didn't respond to query."); - if (request_kind == REQEST_PLAYER_INITIATED) { + if (request_kind == REQUEST_PLAYER_INITIATED) { action_selection_no_longer_in_progress(actor_id); action_decision_clear_want(actor_id); action_selection_next_in_focus(actor_id); @@ -5174,7 +5174,7 @@ void handle_unit_action_answer(int actor_id, int target_id, int cost, default: log_error("handle_unit_action_answer() invalid action_type (%d).", action_type); - if (request_kind == REQEST_PLAYER_INITIATED) { + if (request_kind == REQUEST_PLAYER_INITIATED) { action_selection_no_longer_in_progress(actor_id); action_decision_clear_want(actor_id); action_selection_next_in_focus(actor_id); @@ -5283,7 +5283,7 @@ static void action_decision_maybe_auto(struct unit *actor_unit, Handle reply to possible actions. Note that a reply to a foreground request (a reply where - request_kind is REQEST_PLAYER_INITIATED) must result in its clean up. + request_kind is REQUEST_PLAYER_INITIATED) must result in its clean up. ****************************************************************************/ void handle_unit_actions(const struct packet_unit_actions *packet) { @@ -5312,7 +5312,7 @@ void handle_unit_actions(const struct packet_unit_actions *packet) } switch (request_kind) { - case REQEST_PLAYER_INITIATED: + case REQUEST_PLAYER_INITIATED: if (valid) { /* The player can select an action and should be informed. */ @@ -5328,7 +5328,7 @@ void handle_unit_actions(const struct packet_unit_actions *packet) action_selection_next_in_focus(packet->actor_unit_id); } break; - case REQEST_BACKGROUND_REFRESH: + case REQUEST_BACKGROUND_REFRESH: /* This was a background action selection dialog refresh. */ if (actor_unit != nullptr @@ -5340,7 +5340,7 @@ void handle_unit_actions(const struct packet_unit_actions *packet) act_probs); } break; - case REQEST_BACKGROUND_FAST_AUTO_ATTACK: + case REQUEST_BACKGROUND_FAST_AUTO_ATTACK: if (actor_unit != nullptr) { action_decision_maybe_auto(actor_unit, act_probs, target_unit, target_city, target_tile); @@ -5367,7 +5367,7 @@ void handle_city_sabotage_list(int actor_id, int city_id, if (!pactor) { log_debug("Bad diplomat %d.", actor_id); - if (request_kind == REQEST_PLAYER_INITIATED) { + if (request_kind == REQUEST_PLAYER_INITIATED) { action_selection_no_longer_in_progress(actor_id); action_selection_next_in_focus(actor_id); } @@ -5378,7 +5378,7 @@ void handle_city_sabotage_list(int actor_id, int city_id, if (!pcity) { log_debug("Bad city %d.", city_id); - if (request_kind == REQEST_PLAYER_INITIATED) { + if (request_kind == REQUEST_PLAYER_INITIATED) { action_selection_no_longer_in_progress(actor_id); action_decision_clear_want(actor_id); action_selection_next_in_focus(actor_id); @@ -5394,7 +5394,7 @@ void handle_city_sabotage_list(int actor_id, int city_id, improvement_index(pimprove))); } improvement_iterate_end; - if (request_kind == REQEST_PLAYER_INITIATED) { + if (request_kind == REQUEST_PLAYER_INITIATED) { /* Focus on the unit so the player knows where it is */ unit_focus_set(pactor); @@ -5405,7 +5405,7 @@ void handle_city_sabotage_list(int actor_id, int city_id, } } else { log_debug("Can't issue orders"); - if (request_kind == REQEST_PLAYER_INITIATED) { + if (request_kind == REQUEST_PLAYER_INITIATED) { action_selection_no_longer_in_progress(actor_id); action_decision_clear_want(actor_id); } diff --git a/common/networking/packets.h b/common/networking/packets.h index 8ae757f83d..dbd51c61ac 100644 --- a/common/networking/packets.h +++ b/common/networking/packets.h @@ -60,7 +60,7 @@ do { \ /* Indicates that the player initiated a request. * * Used in network protocol. */ -#define REQEST_PLAYER_INITIATED (0) +#define REQUEST_PLAYER_INITIATED (0) /* Used in network protocol. */ enum unit_info_use { diff --git a/server/unithand.c b/server/unithand.c index ee467cffb0..301a648cfe 100644 --- a/server/unithand.c +++ b/server/unithand.c @@ -2514,7 +2514,7 @@ void handle_unit_get_actions(struct connection *pc, request_kind, probabilities); - if (request_kind == REQEST_PLAYER_INITIATED && !at_least_one_action) { + if (request_kind == REQUEST_PLAYER_INITIATED && !at_least_one_action) { /* The user should get an explanation why no action is possible. */ explain_why_no_action_enabled(actor_unit, target_tile, target_city, target_unit); @@ -3153,7 +3153,7 @@ static void illegal_action(struct player *pplayer, target_city, target_unit, target_tile, nullptr)); - if (request_kind == REQEST_PLAYER_INITIATED) { + if (request_kind == REQUEST_PLAYER_INITIATED) { /* This is a foreground request. */ illegal_action_msg(pplayer, (information_revealed ? E_UNIT_ILLEGAL_ACTION : E_BAD_COMMAND), @@ -3166,7 +3166,7 @@ static void illegal_action(struct player *pplayer, tgt_player, target_tile, requester); - if (request_kind != REQEST_PLAYER_INITIATED && was_punished) { + if (request_kind != REQUEST_PLAYER_INITIATED && was_punished) { /* FIXME: Temporary work around to prevent wrong information and/or * crashes. See hrm Bug #879880 */ /* TODO: Get the explanation before the punishment and show it here. @@ -3544,7 +3544,7 @@ bool unit_perform_action(struct player *pplayer, } else { \ illegal_action(pplayer, actor_unit, action_type, \ pcity ? city_owner(pcity) : nullptr, nullptr, pcity, \ - nullptr, REQEST_PLAYER_INITIATED, requester); \ + nullptr, REQUEST_PLAYER_INITIATED, requester); \ } #define ACTION_PERFORM_UNIT_SELF(action, actor, action_performer) \ @@ -3568,7 +3568,7 @@ bool unit_perform_action(struct player *pplayer, } else { \ illegal_action(pplayer, actor_unit, action_type, \ unit_owner(actor_unit), nullptr, nullptr, actor_unit, \ - REQEST_PLAYER_INITIATED, requester); \ + REQUEST_PLAYER_INITIATED, requester); \ } #define ACTION_PERFORM_UNIT_UNIT(action, actor, target, action_performer) \ @@ -3599,7 +3599,7 @@ bool unit_perform_action(struct player *pplayer, } else { \ illegal_action(pplayer, actor_unit, action_type, \ punit ? unit_owner(punit) : nullptr, nullptr, nullptr, \ - punit, REQEST_PLAYER_INITIATED, requester); \ + punit, REQUEST_PLAYER_INITIATED, requester); \ } #define ACTION_PERFORM_UNIT_STACK(action, actor, target, action_performer)\ @@ -3631,7 +3631,7 @@ bool unit_perform_action(struct player *pplayer, } else { \ illegal_action(pplayer, actor_unit, action_type, \ nullptr, target_tile, nullptr, nullptr, \ - REQEST_PLAYER_INITIATED, requester); \ + REQUEST_PLAYER_INITIATED, requester); \ } #define ACTION_PERFORM_UNIT_TILE(action, actor, target, action_performer) \ @@ -3659,7 +3659,7 @@ bool unit_perform_action(struct player *pplayer, illegal_action(pplayer, actor_unit, action_type, \ target_tile ? tile_owner(target_tile) : nullptr, \ target_tile, nullptr, nullptr, \ - REQEST_PLAYER_INITIATED, requester); \ + REQUEST_PLAYER_INITIATED, requester); \ } #define ACTION_PERFORM_UNIT_EXTRAS(action, actor, target, action_performer)\ @@ -3687,7 +3687,7 @@ bool unit_perform_action(struct player *pplayer, illegal_action(pplayer, actor_unit, action_type, \ target_tile ? target_tile->extras_owner : nullptr, \ target_tile, nullptr, nullptr, \ - REQEST_PLAYER_INITIATED, requester); \ + REQUEST_PLAYER_INITIATED, requester); \ } #define ACTION_PERFORM_UNIT_ANY(paction, actor, \ -- 2.53.0