upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-04-24 20:56:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

gui1: Remove unit level and xp sorters

Browse Source 
This functionality is entirely unused in 1.14 and later because GUI1
menus aren't used to list units anymore.

(Strictly speaking, all sorters are unused right now.)
This commit is contained in:
Iris Morelle 2021-03-10 17:24:24 -03:00
parent 066136af81
commit 5ce799ddbd
2 changed files with 2 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
src/widgets/menu.cpp
View File

@ -37,11 +37,8 @@ menu::basic_sorter::basic_sorter()
: alpha_sort_()
, numeric_sort_()
, id_sort_()
, xp_sort_()
, level_sort_()
, redirect_sort_()
, pos_sort_()
, xp_col_(-1)
{
set_id_sort(-1);
}
@ -58,19 +55,6 @@ menu::basic_sorter& menu::basic_sorter::set_numeric_sort(int column)
return *this;
}
menu::basic_sorter& menu::basic_sorter::set_xp_sort(int column)
{
xp_sort_.insert(column);
return *this;
}
menu::basic_sorter& menu::basic_sorter::set_level_sort(int level_column, int xp_column)
{
level_sort_.insert(level_column);
xp_col_ = xp_column;
return *this;
}
menu::basic_sorter& menu::basic_sorter::set_id_sort(int column)
{
id_sort_.insert(column);
@ -100,27 +84,7 @@ bool menu::basic_sorter::column_sortable(int column) const
}
return alpha_sort_.count(column) == 1 || numeric_sort_.count(column) == 1 ||
pos_sort_.count(column) == 1 || id_sort_.count(column) == 1 ||
xp_sort_.count(column) == 1 || level_sort_.count(column) == 1;
}
static std::pair<int, int> parse_fraction(const std::string& s)
{
std::vector<std::string> parts = utils::split(s, '/', 0);
parts.resize(2);
int num = lexical_cast_default<int>(parts[0], 0);
int denom = lexical_cast_default<int>(parts[1], 0);
return std::pair(num, denom);
}
static int xp_to_advance(const std::string& s) {
std::pair<int,int> xp_frac = parse_fraction(s);
//consider units without AMLA or advancement as having xp_max=1000000
if(xp_frac.second == 0)
xp_frac.second = 1000000;
return xp_frac.second - xp_frac.first;
pos_sort_.count(column) == 1 || id_sort_.count(column) == 1;
}
bool menu::basic_sorter::less(int column, const item& row1, const item& row2) const
@ -162,18 +126,6 @@ bool menu::basic_sorter::less(int column, const item& row1, const item& row2) co
int val_2 = lexical_cast_default<int>(item2, 0);
return val_1 > val_2;
} else if(xp_sort_.count(column) == 1) {
return xp_to_advance(item1) < xp_to_advance(item2);
} else if(level_sort_.count(column) == 1) {
int level_1 = lexical_cast_default<int>(item1, 0);
int level_2 = lexical_cast_default<int>(item2, 0);
if (level_1 == level_2) {
//break tie using xp
const std::string& xp_item1 = font::del_tags(row1.fields[xp_col_]);
const std::string& xp_item2 = font::del_tags(row2.fields[xp_col_]);
return xp_to_advance(xp_item1) < xp_to_advance(xp_item2);
}
return level_1 > level_2;
}
const std::map<int,std::vector<int>>::const_iterator itor = pos_sort_.find(column);

5
src/widgets/menu.hpp
View File

@ -132,8 +132,6 @@ public:
basic_sorter& set_alpha_sort(int column);
basic_sorter& set_numeric_sort(int column);
basic_sorter& set_xp_sort(int column);
basic_sorter& set_level_sort(int level_column, int xp_column);
basic_sorter& set_id_sort(int column);
basic_sorter& set_redirect_sort(int column, int to);
basic_sorter& set_position_sort(int column, const std::vector<int>& pos);
@ -142,10 +140,9 @@ public:
virtual bool less(int column, const item& row1, const item& row2) const;
private:
std::set<int> alpha_sort_, numeric_sort_, id_sort_, xp_sort_, level_sort_;
std::set<int> alpha_sort_, numeric_sort_, id_sort_;
std::map<int,int> redirect_sort_;
std::map<int,std::vector<int>> pos_sort_;
int xp_col_; //used by level sort
};
menu(CVideo& video, const std::vector<std::string>& items,