From 873318bcb42c681b8585815d5a4d48cca9e0c09b Mon Sep 17 00:00:00 2001
From: Marko Lindqvist <cazfi74@gmail.com>
Date: Wed, 18 Jan 2023 19:20:31 +0200
Subject: [PATCH 42/42] sdl2: Fix unused 'scroll' assignment from
remove_clause_widget_from_list()
See osdn #46545
Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
---
client/gui-sdl2/diplodlg.c | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/client/gui-sdl2/diplodlg.c b/client/gui-sdl2/diplodlg.c
index 8803be49e4..dad2b20dc0 100644
--- a/client/gui-sdl2/diplodlg.c
+++ b/client/gui-sdl2/diplodlg.c
@@ -70,7 +70,8 @@ static struct dialog_list *dialog_list;
static void update_diplomacy_dialog(struct diplomacy_dialog *pdialog);
static void update_acceptance_icons(struct diplomacy_dialog *pdialog);
static void update_clauses_list(struct diplomacy_dialog *pdialog);
-static void remove_clause_widget_from_list(struct player *they, struct player *giver,
+static void remove_clause_widget_from_list(struct player *they,
+ struct player *giver,
enum clause_type type, int value);
static void popdown_diplomacy_dialog(struct diplomacy_dialog *pdialog);
static void popdown_diplomacy_dialogs(void);
@@ -1141,10 +1142,10 @@ static void remove_clause_widget_from_list(struct player *they,
{
struct widget *buf;
SDL_Rect src = {0, 0, 0, 0};
- bool scroll = TRUE;
+ bool scroll;
struct diplomacy_dialog *pdialog = get_diplomacy_dialog(they);
- /* find widget with clause */
+ /* Find widget with clause */
buf = pdialog->pdialog->end_active_widget_list->next;
do {
@@ -1172,14 +1173,12 @@ static void remove_clause_widget_from_list(struct player *they,
buf = buf->prev;
widget_undraw(buf);
buf->size.w += len;
- /* we need to save a new background because the width has changed */
+ /* We need to save a new background because the width has changed */
FREESURFACE(buf->gfx);
} while (buf != pdialog->pdialog->begin_active_widget_list);
-
- scroll = FALSE;
}
- /* update state icons */
+ /* Update state icons */
buf = pdialog->pdialog->end_widget_list->prev;
if (buf->private_data.cbox->state) {
--
2.39.0