From 623cd2227b03dc069382eecf1ecc42b150d1babb Mon Sep 17 00:00:00 2001 From: Sveinung Kvilhaugsvik Date: Wed, 28 Apr 2021 20:32:00 +0200 Subject: [PATCH] Show a (cultivate|plant|transform)_time of 0. A cultivate_time, plant_time or transform_time of 0 isn't illegal. Show those values in the in game help. See osdn #42105 --- client/gui-gtk-2.0/helpdlg.c | 1 - client/gui-gtk-3.0/helpdlg.c | 1 - client/gui-gtk-3.22/helpdlg.c | 1 - client/gui-qt/helpdlg.cpp | 1 - 4 files changed, 4 deletions(-) diff --git a/client/gui-gtk-2.0/helpdlg.c b/client/gui-gtk-2.0/helpdlg.c index 8780eabb78..0be730dcbf 100644 --- a/client/gui-gtk-2.0/helpdlg.c +++ b/client/gui-gtk-2.0/helpdlg.c @@ -1213,7 +1213,6 @@ static void help_update_terrain(const struct help_item *pitem, } if (pterrain->transform_result != T_NONE - && pterrain->transform_time != 0 && effect_cumulative_max(EFT_TRANSFORM_POSSIBLE, &for_terr) > 0) { fc_snprintf(buf, sizeof(buf), PL_("%d turn", "%d turns", pterrain->transform_time), diff --git a/client/gui-gtk-3.0/helpdlg.c b/client/gui-gtk-3.0/helpdlg.c index e97c812792..4d2cacc09e 100644 --- a/client/gui-gtk-3.0/helpdlg.c +++ b/client/gui-gtk-3.0/helpdlg.c @@ -1272,7 +1272,6 @@ static void help_update_terrain(const struct help_item *pitem, } if (pterrain->transform_result != T_NONE - && pterrain->transform_time != 0 && effect_cumulative_max(EFT_TRANSFORM_POSSIBLE, &for_terr) > 0) { fc_snprintf(buf, sizeof(buf), PL_("%d turn", "%d turns", pterrain->transform_time), diff --git a/client/gui-gtk-3.22/helpdlg.c b/client/gui-gtk-3.22/helpdlg.c index bb6e293ee5..0c9440db6f 100644 --- a/client/gui-gtk-3.22/helpdlg.c +++ b/client/gui-gtk-3.22/helpdlg.c @@ -1271,7 +1271,6 @@ static void help_update_terrain(const struct help_item *pitem, } if (pterrain->transform_result != T_NONE - && pterrain->transform_time != 0 && effect_cumulative_max(EFT_TRANSFORM_POSSIBLE, &for_terr) > 0) { fc_snprintf(buf, sizeof(buf), PL_("%d turn", "%d turns", pterrain->transform_time), diff --git a/client/gui-qt/helpdlg.cpp b/client/gui-qt/helpdlg.cpp index 10e78aeafa..68a02ca8d9 100644 --- a/client/gui-qt/helpdlg.cpp +++ b/client/gui-qt/helpdlg.cpp @@ -1364,7 +1364,6 @@ void help_widget::set_topic_terrain(const help_item *topic, } if (pterrain->transform_result != T_NONE - && pterrain->transform_time != 0 && effect_cumulative_max(EFT_TRANSFORM_POSSIBLE, &for_terr) > 0) { QLabel *tb; char tf_buffer[1024]; -- 2.30.2