dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r19521) -Codechange: Use a IndustryType array to sort industries by name instead of a LegendAndColour array.

Browse Source
This commit is contained in:
terkhen
2010-03-28 12:25:09 +00:00
parent 5193ed0fc1
commit 217a98e69b
5 changed files with 52 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/smallmap_gui.cpp
View File

@@ -26,7 +26,6 @@
#include "sound_func.h"
#include "window_func.h"
#include "company_base.h"
#include "core/sort_func.hpp"
#include "table/strings.h"
#include "table/sprites.h"
@@ -152,33 +151,6 @@ static uint _industry_to_list_pos[NUM_INDUSTRYTYPES];
/** Show heightmap in industry mode of smallmap window. */
static bool _smallmap_industry_show_heightmap;
/** Sort legends by their name. */
static int CDECL LegendNameSorter(const LegendAndColour *a, const LegendAndColour *b)
{
static char industry_name[2][64];
SetDParam(0, a->legend);
GetString(industry_name[0], STR_JUST_STRING, lastof(industry_name[0]));
SetDParam(0, b->legend);
GetString(industry_name[1], STR_JUST_STRING, lastof(industry_name[1]));
int r = strcmp(industry_name[0], industry_name[1]);
/* If the names are equal, sort by industry type. */
return (r != 0) ? r : (a->type - b->type);
}
void SortIndustriesLegend()
{
/* Sort industries by name. */
GSortT(_legend_from_industries, _smallmap_industry_count, &LegendNameSorter);
/* Store widget number for each industry type. */
for (int i = 0; i < _smallmap_industry_count; i++) {
_industry_to_list_pos[_legend_from_industries[i].type] = i;
}
}
/**
* Fills an array for the industries legends.
*/
@@ -187,16 +159,19 @@ void BuildIndustriesLegend()
uint j = 0;
/* Add each name */
for (IndustryType i = 0; i < NUM_INDUSTRYTYPES; i++) {
const IndustrySpec *indsp = GetIndustrySpec(i);
for (uint8 i = 0; i < NUM_INDUSTRYTYPES; i++) {
IndustryType ind = _sorted_industry_types[i];
const IndustrySpec *indsp = GetIndustrySpec(ind);
if (indsp->enabled) {
_legend_from_industries[j].legend = indsp->name;
_legend_from_industries[j].colour = indsp->map_colour;
_legend_from_industries[j].type = i;
_legend_from_industries[j].type = ind;
_legend_from_industries[j].show_on_map = true;
_legend_from_industries[j].col_break = false;
_legend_from_industries[j].end = false;
/* Store widget number for this industry type. */
_industry_to_list_pos[ind] = j;
j++;
}
}
@@ -1050,7 +1025,6 @@ public:
virtual void OnInit()
{
SortIndustriesLegend();
uint min_width = 0;
this->min_number_of_columns = INDUSTRY_MIN_NUMBER_OF_COLUMNS;
this->min_number_of_fixed_rows = 0;