From c9c6b4cd9298fe1d966f43332adb9603be7aa04a Mon Sep 17 00:00:00 2001 From: Jonathan G Rennison Date: Sat, 19 Jun 2021 07:59:36 +0200 Subject: [PATCH] Make GUIList resort interval variable --- src/sortlist_type.h | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/src/sortlist_type.h b/src/sortlist_type.h index 9c14d382bd..28f3ab6ec6 100644 --- a/src/sortlist_type.h +++ b/src/sortlist_type.h @@ -55,6 +55,7 @@ protected: uint8 sort_type; ///< what criteria to sort on uint8 filter_type; ///< what criteria to filter on uint16 resort_timer; ///< resort list after a given amount of ticks if set + uint16 resort_interval; ///< value to re-initialise resort_timer with after sorting /** * Check if the list is sortable @@ -71,8 +72,7 @@ protected: */ void ResetResortTimer() { - /* Resort every 10 days */ - this->resort_timer = DAY_TICKS * 10; + this->resort_timer = this->resort_interval; } public: @@ -82,7 +82,8 @@ public: flags(VL_NONE), sort_type(0), filter_type(0), - resort_timer(1) + resort_timer(1), + resort_interval(DAY_TICKS * 10) /* Resort every 10 days by default */ {}; /** @@ -215,6 +216,12 @@ public: SETBITS(this->flags, VL_RESORT); } + void SetResortInterval(uint16 resort_interval) + { + this->resort_interval = std::max(1, resort_interval); + this->resort_timer = std::min(this->resort_timer, this->resort_interval); + } + /** * Check if the sort order is descending *