Changeset - r28022:a8a8bac7b6cf
Parent rev.
Child rev.
[Not reviewed]
master
0 21 0
Peter Nelson - 14 months ago 2023-10-20 17:40:48
peter1138@openttd.org
Codechange: Avoid emplace_back(new()) into a unique_ptr. (#11384)

This could theoretically leave an unmanaged pointer in certain circumstances, and directly using
make_unique shows intent.
21 files changed with 117 insertions and 118 deletions:
src/airport_gui.cpp
1
1
src/autoreplace_gui.cpp
2
2
src/company_gui.cpp
2
2
src/date_gui.cpp
3
3
src/game/game_gui.cpp
1
1
src/genworld_gui.cpp
4
4
src/industry_gui.cpp
2
2
src/network/network_gui.cpp
12
12
src/newgrf_gui.cpp
3
3
src/order_gui.cpp
1
1
src/rail_gui.cpp
5
5
src/road_gui.cpp
8
8
src/script/script_gui.cpp
1
1
src/settings_gui.cpp
14
14
src/settings_gui.h
1
1
src/spritecache.cpp
1
1
src/story_gui.cpp
2
2
src/textfile_gui.cpp
1
2
src/toolbar_gui.cpp
46
46
src/vehicle_gui.cpp
6
6
src/widgets/dropdown.cpp
1
1
0 comments (0 inline, 0 general)
src/airport_gui.cpp
➞
Show inline comments
 
@@ -241,7 +241,7 @@ class BuildAirportWindow : public Picker
 
		DropDownList list;
 

			




	
	
	
		
 
		for (uint i = 0; i < AirportClass::GetClassCount(); i++) {

			




	
	
	
		
 
			list.emplace_back(new DropDownListStringItem(AirportClass::Get((AirportClassID)i)->name, i, false));

			




	
	
	
		
 
			list.push_back(std::make_unique<DropDownListStringItem>(AirportClass::Get((AirportClassID)i)->name, i, false));

			




	
	
	
		
 
		}

			




	
	
	
		
 

			




	
	
	
		
 
		return list;

			




        

    


    
    

    

        

                

                    src/autoreplace_gui.cpp
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -568,8 +568,8 @@ public:

			




	
	
	
		
 

			




	
	
	
		
 
			case WID_RV_TRAIN_ENGINEWAGON_DROPDOWN: {

			




	
	
	
		
 
				DropDownList list;

			




	
	
	
		
 
				list.emplace_back(new DropDownListStringItem(STR_REPLACE_ENGINES, 1, false));

			




	
	
	
		
 
				list.emplace_back(new DropDownListStringItem(STR_REPLACE_WAGONS, 0, false));

			




	
	
	
		
 
				list.push_back(std::make_unique<DropDownListStringItem>(STR_REPLACE_ENGINES, 1, false));

			




	
	
	
		
 
				list.push_back(std::make_unique<DropDownListStringItem>(STR_REPLACE_WAGONS, 0, false));

			




	
	
	
		
 
				ShowDropDownList(this, std::move(list), this->replace_engines ? 1 : 0, WID_RV_TRAIN_ENGINEWAGON_DROPDOWN);

			




	
	
	
		
 
				break;

			




	
	
	
		
 
			}

			




        

    


    
    

    

        

                

                    src/company_gui.cpp
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -675,10 +675,10 @@ private:

			




	
	
	
		
 
		if (default_livery != nullptr) {

			




	
	
	
		
 
			/* Add COLOUR_END to put the colour out of range, but also allow us to show what the default is */

			




	
	
	
		
 
			default_col = (primary ? default_livery->colour1 : default_livery->colour2) + COLOUR_END;

			




	
	
	
		
 
			list.emplace_back(new DropDownListColourItem(default_col, false));

			




	
	
	
		
 
			list.push_back(std::make_unique<DropDownListColourItem>(default_col, false));

			




	
	
	
		
 
		}

			




	
	
	
		
 
		for (uint i = 0; i < lengthof(_colour_dropdown); i++) {

			




	
	
	
		
 
			list.emplace_back(new DropDownListColourItem(i, HasBit(used_colours, i)));

			




	
	
	
		
 
			list.push_back(std::make_unique<DropDownListColourItem>(i, HasBit(used_colours, i)));

			




	
	
	
		
 
		}

			




	
	
	
		
 

			




	
	
	
		
 
		byte sel = (default_livery == nullptr || HasBit(livery->in_use, primary ? 0 : 1)) ? (primary ? livery->colour1 : livery->colour2) : default_col;

			




        

    


    
    

    

        

                

                    src/date_gui.cpp
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -75,14 +75,14 @@ struct SetDateWindow : Window {

			




	
	
	
		
 

			




	
	
	
		
 
			case WID_SD_DAY:

			




	
	
	
		
 
				for (uint i = 0; i < 31; i++) {

			




	
	
	
		
 
					list.emplace_back(new DropDownListStringItem(STR_DAY_NUMBER_1ST + i, i + 1, false));

			




	
	
	
		
 
					list.push_back(std::make_unique<DropDownListStringItem>(STR_DAY_NUMBER_1ST + i, i + 1, false));

			




	
	
	
		
 
				}

			




	
	
	
		
 
				selected = this->date.day;

			




	
	
	
		
 
				break;

			




	
	
	
		
 

			




	
	
	
		
 
			case WID_SD_MONTH:

			




	
	
	
		
 
				for (uint i = 0; i < 12; i++) {

			




	
	
	
		
 
					list.emplace_back(new DropDownListStringItem(STR_MONTH_JAN + i, i, false));

			




	
	
	
		
 
					list.push_back(std::make_unique<DropDownListStringItem>(STR_MONTH_JAN + i, i, false));

			




	
	
	
		
 
				}

			




	
	
	
		
 
				selected = this->date.month;

			




	
	
	
		
 
				break;

			




	
	
		
 
@@ -90,7 +90,7 @@ struct SetDateWindow : Window {

			




	
	
	
		
 
			case WID_SD_YEAR:

			




	
	
	
		
 
				for (TimerGameCalendar::Year i = this->min_year; i <= this->max_year; i++) {

			




	
	
	
		
 
					SetDParam(0, i);

			




	
	
	
		
 
					list.emplace_back(new DropDownListStringItem(STR_JUST_INT, static_cast<int32_t>(i), false));

			




	
	
	
		
 
					list.push_back(std::make_unique<DropDownListStringItem>(STR_JUST_INT, static_cast<int32_t>(i), false));

			




	
	
	
		
 
				}

			




	
	
	
		
 
				selected = static_cast<int32_t>(this->date.year);

			




	
	
	
		
 
				break;

			




        

    


    
    

    

        

                

                    src/game/game_gui.cpp
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -311,7 +311,7 @@ struct GSConfigWindow : public Window {

			




	
	
	
		
 

			




	
	
	
		
 
							DropDownList list;

			




	
	
	
		
 
							for (int i = config_item.min_value; i <= config_item.max_value; i++) {

			




	
	
	
		
 
								list.emplace_back(new DropDownListStringItem(config_item.labels.find(i)->second, i, false));

			




	
	
	
		
 
								list.push_back(std::make_unique<DropDownListStringItem>(config_item.labels.find(i)->second, i, false));

			




	
	
	
		
 
							}

			




	
	
	
		
 

			




	
	
	
		
 
							ShowDropDownListAt(this, std::move(list), old_val, WID_GSC_SETTING_DROPDOWN, wi_rect, COLOUR_ORANGE);

			




        

    


    
    

    

        

                

                    src/genworld_gui.cpp
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -356,7 +356,7 @@ static DropDownList BuildMapsizeDropDown

			




	
	
	
		
 

			




	
	
	
		
 
	for (uint i = MIN_MAP_SIZE_BITS; i <= MAX_MAP_SIZE_BITS; i++) {

			




	
	
	
		
 
		SetDParam(0, 1LL << i);

			




	
	
	
		
 
		list.emplace_back(new DropDownListStringItem(STR_JUST_INT, i, false));

			




	
	
	
		
 
		list.push_back(std::make_unique<DropDownListStringItem>(STR_JUST_INT, i, false));

			




	
	
	
		
 
	}

			




	
	
	
		
 

			




	
	
	
		
 
	return list;

			




	
	
		
 
@@ -369,20 +369,20 @@ static DropDownList BuildTownNameDropDow

			




	
	
	
		
 
	/* Add and sort newgrf townnames generators */

			




	
	
	
		
 
	const auto &grf_names = GetGRFTownNameList();

			




	
	
	
		
 
	for (uint i = 0; i < grf_names.size(); i++) {

			




	
	
	
		
 
		list.emplace_back(new DropDownListStringItem(grf_names[i], BUILTIN_TOWNNAME_GENERATOR_COUNT + i, false));

			




	
	
	
		
 
		list.push_back(std::make_unique<DropDownListStringItem>(grf_names[i], BUILTIN_TOWNNAME_GENERATOR_COUNT + i, false));

			




	
	
	
		
 
	}

			




	
	
	
		
 
	std::sort(list.begin(), list.end(), DropDownListStringItem::NatSortFunc);

			




	
	
	
		
 

			




	
	
	
		
 
	size_t newgrf_size = list.size();

			




	
	
	
		
 
	/* Insert newgrf_names at the top of the list */

			




	
	
	
		
 
	if (newgrf_size > 0) {

			




	
	
	
		
 
		list.emplace_back(new DropDownListItem(-1, false)); // separator line

			




	
	
	
		
 
		list.push_back(std::make_unique<DropDownListItem>(-1, false)); // separator line

			




	
	
	
		
 
		newgrf_size++;

			




	
	
	
		
 
	}

			




	
	
	
		
 

			




	
	
	
		
 
	/* Add and sort original townnames generators */

			




	
	
	
		
 
	for (uint i = 0; i < BUILTIN_TOWNNAME_GENERATOR_COUNT; i++) {

			




	
	
	
		
 
		list.emplace_back(new DropDownListStringItem(STR_MAPGEN_TOWN_NAME_ORIGINAL_ENGLISH + i, i, false));

			




	
	
	
		
 
		list.push_back(std::make_unique<DropDownListStringItem>(STR_MAPGEN_TOWN_NAME_ORIGINAL_ENGLISH + i, i, false));

			




	
	
	
		
 
	}

			




	
	
	
		
 
	std::sort(list.begin() + newgrf_size, list.end(), DropDownListStringItem::NatSortFunc);

			




	
	
	
		
 

			




        

    


    
    

    

        

                

                    src/industry_gui.cpp
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -3063,7 +3063,7 @@ struct IndustryCargoesWindow : public Wi

			




	
	
	
		
 
			case WID_IC_CARGO_DROPDOWN: {

			




	
	
	
		
 
				DropDownList lst;

			




	
	
	
		
 
				for (const CargoSpec *cs : _sorted_standard_cargo_specs) {

			




	
	
	
		
 
					lst.emplace_back(new DropDownListStringItem(cs->name, cs->Index(), false));

			




	
	
	
		
 
					lst.push_back(std::make_unique<DropDownListStringItem>(cs->name, cs->Index(), false));

			




	
	
	
		
 
				}

			




	
	
	
		
 
				if (!lst.empty()) {

			




	
	
	
		
 
					int selected = (this->ind_cargo >= NUM_INDUSTRYTYPES) ? (int)(this->ind_cargo - NUM_INDUSTRYTYPES) : -1;

			




	
	
		
 
@@ -3077,7 +3077,7 @@ struct IndustryCargoesWindow : public Wi

			




	
	
	
		
 
				for (IndustryType ind : _sorted_industry_types) {

			




	
	
	
		
 
					const IndustrySpec *indsp = GetIndustrySpec(ind);

			




	
	
	
		
 
					if (!indsp->enabled) continue;

			




	
	
	
		
 
					lst.emplace_back(new DropDownListStringItem(indsp->name, ind, false));

			




	
	
	
		
 
					lst.push_back(std::make_unique<DropDownListStringItem>(indsp->name, ind, false));

			




	
	
	
		
 
				}

			




	
	
	
		
 
				if (!lst.empty()) {

			




	
	
	
		
 
					int selected = (this->ind_cargo < NUM_INDUSTRYTYPES) ? (int)this->ind_cargo : -1;

			




        

    


    
    

    

        

                

                    src/network/network_gui.cpp
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -72,9 +72,9 @@ static DropDownList BuildVisibilityDropD

			




	
	
	
		
 
{

			




	
	
	
		
 
	DropDownList list;

			




	
	
	
		
 

			




	
	
	
		
 
	list.emplace_back(new DropDownListStringItem(STR_NETWORK_SERVER_VISIBILITY_LOCAL, SERVER_GAME_TYPE_LOCAL, false));

			




	
	
	
		
 
	list.emplace_back(new DropDownListStringItem(STR_NETWORK_SERVER_VISIBILITY_INVITE_ONLY, SERVER_GAME_TYPE_INVITE_ONLY, false));

			




	
	
	
		
 
	list.emplace_back(new DropDownListStringItem(STR_NETWORK_SERVER_VISIBILITY_PUBLIC, SERVER_GAME_TYPE_PUBLIC, false));

			




	
	
	
		
 
	list.push_back(std::make_unique<DropDownListStringItem>(STR_NETWORK_SERVER_VISIBILITY_LOCAL, SERVER_GAME_TYPE_LOCAL, false));

			




	
	
	
		
 
	list.push_back(std::make_unique<DropDownListStringItem>(STR_NETWORK_SERVER_VISIBILITY_INVITE_ONLY, SERVER_GAME_TYPE_INVITE_ONLY, false));

			




	
	
	
		
 
	list.push_back(std::make_unique<DropDownListStringItem>(STR_NETWORK_SERVER_VISIBILITY_PUBLIC, SERVER_GAME_TYPE_PUBLIC, false));

			




	
	
	
		
 

			




	
	
	
		
 
	return list;

			




	
	
	
		
 
}

			




	
	
		
 
@@ -1544,8 +1544,8 @@ private:

			




	
	
	
		
 
	static void OnClickClientAdmin([[maybe_unused]] NetworkClientListWindow *w, [[maybe_unused]] Point pt, ClientID client_id)

			




	
	
	
		
 
	{

			




	
	
	
		
 
		DropDownList list;

			




	
	
	
		
 
		list.emplace_back(new DropDownListStringItem(STR_NETWORK_CLIENT_LIST_ADMIN_CLIENT_KICK, DD_CLIENT_ADMIN_KICK, false));

			




	
	
	
		
 
		list.emplace_back(new DropDownListStringItem(STR_NETWORK_CLIENT_LIST_ADMIN_CLIENT_BAN, DD_CLIENT_ADMIN_BAN, false));

			




	
	
	
		
 
		list.push_back(std::make_unique<DropDownListStringItem>(STR_NETWORK_CLIENT_LIST_ADMIN_CLIENT_KICK, DD_CLIENT_ADMIN_KICK, false));

			




	
	
	
		
 
		list.push_back(std::make_unique<DropDownListStringItem>(STR_NETWORK_CLIENT_LIST_ADMIN_CLIENT_BAN, DD_CLIENT_ADMIN_BAN, false));

			




	
	
	
		
 

			




	
	
	
		
 
		Rect wi_rect;

			




	
	
	
		
 
		wi_rect.left   = pt.x;

			




	
	
		
 
@@ -1566,8 +1566,8 @@ private:

			




	
	
	
		
 
	static void OnClickCompanyAdmin([[maybe_unused]] NetworkClientListWindow *w, [[maybe_unused]] Point pt, CompanyID company_id)

			




	
	
	
		
 
	{

			




	
	
	
		
 
		DropDownList list;

			




	
	
	
		
 
		list.emplace_back(new DropDownListStringItem(STR_NETWORK_CLIENT_LIST_ADMIN_COMPANY_RESET, DD_COMPANY_ADMIN_RESET, NetworkCompanyHasClients(company_id)));

			




	
	
	
		
 
		list.emplace_back(new DropDownListStringItem(STR_NETWORK_CLIENT_LIST_ADMIN_COMPANY_UNLOCK, DD_COMPANY_ADMIN_UNLOCK, !NetworkCompanyIsPassworded(company_id)));

			




	
	
	
		
 
		list.push_back(std::make_unique<DropDownListStringItem>(STR_NETWORK_CLIENT_LIST_ADMIN_COMPANY_RESET, DD_COMPANY_ADMIN_RESET, NetworkCompanyHasClients(company_id)));

			




	
	
	
		
 
		list.push_back(std::make_unique<DropDownListStringItem>(STR_NETWORK_CLIENT_LIST_ADMIN_COMPANY_UNLOCK, DD_COMPANY_ADMIN_UNLOCK, !NetworkCompanyIsPassworded(company_id)));

			




	
	
	
		
 

			




	
	
	
		
 
		Rect wi_rect;

			




	
	
	
		
 
		wi_rect.left   = pt.x;

			




	
	
		
 
@@ -1598,9 +1598,9 @@ private:

			




	
	
	
		
 
	{

			




	
	
	
		
 
		ButtonCommon *chat_button = new CompanyButton(SPR_CHAT, company_id == COMPANY_SPECTATOR ? STR_NETWORK_CLIENT_LIST_CHAT_SPECTATOR_TOOLTIP : STR_NETWORK_CLIENT_LIST_CHAT_COMPANY_TOOLTIP, COLOUR_ORANGE, company_id, &NetworkClientListWindow::OnClickCompanyChat);

			




	
	
	
		
 

			




	
	
	
		
 
		if (_network_server) this->buttons[line_count].emplace_back(new CompanyButton(SPR_ADMIN, STR_NETWORK_CLIENT_LIST_ADMIN_COMPANY_TOOLTIP, COLOUR_RED, company_id, &NetworkClientListWindow::OnClickCompanyAdmin, company_id == COMPANY_SPECTATOR));

			




	
	
	
		
 
		if (_network_server) this->buttons[line_count].push_back(std::make_unique<CompanyButton>(SPR_ADMIN, STR_NETWORK_CLIENT_LIST_ADMIN_COMPANY_TOOLTIP, COLOUR_RED, company_id, &NetworkClientListWindow::OnClickCompanyAdmin, company_id == COMPANY_SPECTATOR));

			




	
	
	
		
 
		this->buttons[line_count].emplace_back(chat_button);

			




	
	
	
		
 
		if (client_playas != company_id) this->buttons[line_count].emplace_back(new CompanyButton(SPR_JOIN, STR_NETWORK_CLIENT_LIST_JOIN_TOOLTIP, COLOUR_ORANGE, company_id, &NetworkClientListWindow::OnClickCompanyJoin, company_id != COMPANY_SPECTATOR && Company::Get(company_id)->is_ai));

			




	
	
	
		
 
		if (client_playas != company_id) this->buttons[line_count].push_back(std::make_unique<CompanyButton>(SPR_JOIN, STR_NETWORK_CLIENT_LIST_JOIN_TOOLTIP, COLOUR_ORANGE, company_id, &NetworkClientListWindow::OnClickCompanyJoin, company_id != COMPANY_SPECTATOR && Company::Get(company_id)->is_ai));

			




	
	
	
		
 

			




	
	
	
		
 
		this->line_count += 1;

			




	
	
	
		
 

			




	
	
		
 
@@ -1609,8 +1609,8 @@ private:

			




	
	
	
		
 
			if (ci->client_playas != company_id) continue;

			




	
	
	
		
 
			has_players = true;

			




	
	
	
		
 

			




	
	
	
		
 
			if (_network_server) this->buttons[line_count].emplace_back(new ClientButton(SPR_ADMIN, STR_NETWORK_CLIENT_LIST_ADMIN_CLIENT_TOOLTIP, COLOUR_RED, ci->client_id, &NetworkClientListWindow::OnClickClientAdmin, _network_own_client_id == ci->client_id));

			




	
	
	
		
 
			if (_network_own_client_id != ci->client_id) this->buttons[line_count].emplace_back(new ClientButton(SPR_CHAT, STR_NETWORK_CLIENT_LIST_CHAT_CLIENT_TOOLTIP, COLOUR_ORANGE, ci->client_id, &NetworkClientListWindow::OnClickClientChat));

			




	
	
	
		
 
			if (_network_server) this->buttons[line_count].push_back(std::make_unique<ClientButton>(SPR_ADMIN, STR_NETWORK_CLIENT_LIST_ADMIN_CLIENT_TOOLTIP, COLOUR_RED, ci->client_id, &NetworkClientListWindow::OnClickClientAdmin, _network_own_client_id == ci->client_id));

			




	
	
	
		
 
			if (_network_own_client_id != ci->client_id) this->buttons[line_count].push_back(std::make_unique<ClientButton>(SPR_CHAT, STR_NETWORK_CLIENT_LIST_CHAT_CLIENT_TOOLTIP, COLOUR_ORANGE, ci->client_id, &NetworkClientListWindow::OnClickClientChat));

			




	
	
	
		
 

			




	
	
	
		
 
			if (ci->client_id == _network_own_client_id) {

			




	
	
	
		
 
				this->player_self_index = this->line_count;

			




	
	
		
 
@@ -1640,7 +1640,7 @@ private:

			




	
	
	
		
 

			




	
	
	
		
 
		/* As spectator, show a line to create a new company. */

			




	
	
	
		
 
		if (client_playas == COMPANY_SPECTATOR && !NetworkMaxCompaniesReached()) {

			




	
	
	
		
 
			this->buttons[line_count].emplace_back(new CompanyButton(SPR_JOIN, STR_NETWORK_CLIENT_LIST_NEW_COMPANY_TOOLTIP, COLOUR_ORANGE, COMPANY_SPECTATOR, &NetworkClientListWindow::OnClickCompanyNew));

			




	
	
	
		
 
			this->buttons[line_count].push_back(std::make_unique<CompanyButton>(SPR_JOIN, STR_NETWORK_CLIENT_LIST_NEW_COMPANY_TOOLTIP, COLOUR_ORANGE, COMPANY_SPECTATOR, &NetworkClientListWindow::OnClickCompanyNew));

			




	
	
	
		
 
			this->line_count += 1;

			




	
	
	
		
 
		}

			




	
	
	
		
 

			




        

    


    
    

    

        

                

                    src/newgrf_gui.cpp
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -392,7 +392,7 @@ struct NewGRFParametersWindow : public W

			




	
	
	
		
 

			




	
	
	
		
 
							DropDownList list;

			




	
	
	
		
 
							for (uint32_t i = par_info.min_value; i <= par_info.max_value; i++) {

			




	
	
	
		
 
								list.emplace_back(new DropDownListStringItem(GetGRFStringFromGRFText(par_info.value_names.find(i)->second), i, false));

			




	
	
	
		
 
								list.push_back(std::make_unique<DropDownListStringItem>(GetGRFStringFromGRFText(par_info.value_names.find(i)->second), i, false));

			




	
	
	
		
 
							}

			




	
	
	
		
 

			




	
	
	
		
 
							ShowDropDownListAt(this, std::move(list), old_val, WID_NP_SETTING_DROPDOWN, wi_rect, COLOUR_ORANGE);

			




	
	
		
 
@@ -952,10 +952,10 @@ struct NewGRFWindow : public Window, New

			




	
	
	
		
 
				DropDownList list;

			




	
	
	
		
 

			




	
	
	
		
 
				/* Add 'None' option for clearing list */

			




	
	
	
		
 
				list.emplace_back(new DropDownListStringItem(STR_NONE, -1, false));

			




	
	
	
		
 
				list.push_back(std::make_unique<DropDownListStringItem>(STR_NONE, -1, false));

			




	
	
	
		
 

			




	
	
	
		
 
				for (uint i = 0; i < this->grf_presets.size(); i++) {

			




	
	
	
		
 
					list.emplace_back(new DropDownListStringItem(this->grf_presets[i], i, false));

			




	
	
	
		
 
					list.push_back(std::make_unique<DropDownListStringItem>(this->grf_presets[i], i, false));

			




	
	
	
		
 
				}

			




	
	
	
		
 

			




	
	
	
		
 
				this->CloseChildWindows(WC_QUERY_STRING); // Remove the parameter query window

			




        

    


    
    

    

        

                

                    src/order_gui.cpp
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -1299,7 +1299,7 @@ public:

			




	
	
	
		
 
			case WID_O_COND_VARIABLE: {

			




	
	
	
		
 
				DropDownList list;

			




	
	
	
		
 
				for (uint i = 0; i < lengthof(_order_conditional_variable); i++) {

			




	
	
	
		
 
					list.emplace_back(new DropDownListStringItem(STR_ORDER_CONDITIONAL_LOAD_PERCENTAGE + _order_conditional_variable[i], _order_conditional_variable[i], false));

			




	
	
	
		
 
					list.push_back(std::make_unique<DropDownListStringItem>(STR_ORDER_CONDITIONAL_LOAD_PERCENTAGE + _order_conditional_variable[i], _order_conditional_variable[i], false));

			




	
	
	
		
 
				}

			




	
	
	
		
 
				ShowDropDownList(this, std::move(list), this->vehicle->GetOrder(this->OrderGetSel())->GetConditionVariable(), WID_O_COND_VARIABLE);

			




	
	
	
		
 
				break;

			




        

    


    
    

    

        

                

                    src/rail_gui.cpp
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -2353,7 +2353,7 @@ DropDownList GetRailTypeDropDownList(boo

			




	
	
	
		
 
	DropDownList list;

			




	
	
	
		
 

			




	
	
	
		
 
	if (all_option) {

			




	
	
	
		
 
		list.emplace_back(new DropDownListStringItem(STR_REPLACE_ALL_RAILTYPE, INVALID_RAILTYPE, false));

			




	
	
	
		
 
		list.push_back(std::make_unique<DropDownListStringItem>(STR_REPLACE_ALL_RAILTYPE, INVALID_RAILTYPE, false));

			




	
	
	
		
 
	}

			




	
	
	
		
 

			




	
	
	
		
 
	Dimension d = { 0, 0 };

			




	
	
		
 
@@ -2375,18 +2375,18 @@ DropDownList GetRailTypeDropDownList(boo

			




	
	
	
		
 
		SetDParam(0, rti->strings.menu_text);

			




	
	
	
		
 
		SetDParam(1, rti->max_speed);

			




	
	
	
		
 
		if (for_replacement) {

			




	
	
	
		
 
			list.emplace_back(new DropDownListStringItem(rti->strings.replace_text, rt, !HasBit(avail_railtypes, rt)));

			




	
	
	
		
 
			list.push_back(std::make_unique<DropDownListStringItem>(rti->strings.replace_text, rt, !HasBit(avail_railtypes, rt)));

			




	
	
	
		
 
		} else {

			




	
	
	
		
 
			StringID str = rti->max_speed > 0 ? STR_TOOLBAR_RAILTYPE_VELOCITY : STR_JUST_STRING;

			




	
	
	
		
 
			DropDownListIconItem *iconitem = new DropDownListIconItem(rti->gui_sprites.build_x_rail, PAL_NONE, str, rt, !HasBit(avail_railtypes, rt));

			




	
	
	
		
 
			auto iconitem = std::make_unique<DropDownListIconItem>(rti->gui_sprites.build_x_rail, PAL_NONE, str, rt, !HasBit(avail_railtypes, rt));

			




	
	
	
		
 
			iconitem->SetDimension(d);

			




	
	
	
		
 
			list.emplace_back(iconitem);

			




	
	
	
		
 
			list.push_back(std::move(iconitem));

			




	
	
	
		
 
		}

			




	
	
	
		
 
	}

			




	
	
	
		
 

			




	
	
	
		
 
	if (list.size() == 0) {

			




	
	
	
		
 
		/* Empty dropdowns are not allowed */

			




	
	
	
		
 
		list.emplace_back(new DropDownListStringItem(STR_NONE, INVALID_RAILTYPE, true));

			




	
	
	
		
 
		list.push_back(std::make_unique<DropDownListStringItem>(STR_NONE, INVALID_RAILTYPE, true));

			




	
	
	
		
 
	}

			




	
	
	
		
 

			




	
	
	
		
 
	return list;

			




        

    


    
    

    

        

                

                    src/road_gui.cpp
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -1814,7 +1814,7 @@ DropDownList GetRoadTypeDropDownList(Roa

			




	
	
	
		
 
	DropDownList list;

			




	
	
	
		
 

			




	
	
	
		
 
	if (all_option) {

			




	
	
	
		
 
		list.emplace_back(new DropDownListStringItem(STR_REPLACE_ALL_ROADTYPE, INVALID_ROADTYPE, false));

			




	
	
	
		
 
		list.push_back(std::make_unique<DropDownListStringItem>(STR_REPLACE_ALL_ROADTYPE, INVALID_ROADTYPE, false));

			




	
	
	
		
 
	}

			




	
	
	
		
 

			




	
	
	
		
 
	Dimension d = { 0, 0 };

			




	
	
		
 
@@ -1836,18 +1836,18 @@ DropDownList GetRoadTypeDropDownList(Roa

			




	
	
	
		
 
		SetDParam(0, rti->strings.menu_text);

			




	
	
	
		
 
		SetDParam(1, rti->max_speed / 2);

			




	
	
	
		
 
		if (for_replacement) {

			




	
	
	
		
 
			list.emplace_back(new DropDownListStringItem(rti->strings.replace_text, rt, !HasBit(avail_roadtypes, rt)));

			




	
	
	
		
 
			list.push_back(std::make_unique<DropDownListStringItem>(rti->strings.replace_text, rt, !HasBit(avail_roadtypes, rt)));

			




	
	
	
		
 
		} else {

			




	
	
	
		
 
			StringID str = rti->max_speed > 0 ? STR_TOOLBAR_RAILTYPE_VELOCITY : STR_JUST_STRING;

			




	
	
	
		
 
			DropDownListIconItem *iconitem = new DropDownListIconItem(rti->gui_sprites.build_x_road, PAL_NONE, str, rt, !HasBit(avail_roadtypes, rt));

			




	
	
	
		
 
			auto iconitem = std::make_unique<DropDownListIconItem>(rti->gui_sprites.build_x_road, PAL_NONE, str, rt, !HasBit(avail_roadtypes, rt));

			




	
	
	
		
 
			iconitem->SetDimension(d);

			




	
	
	
		
 
			list.emplace_back(iconitem);

			




	
	
	
		
 
			list.push_back(std::move(iconitem));

			




	
	
	
		
 
		}

			




	
	
	
		
 
	}

			




	
	
	
		
 

			




	
	
	
		
 
	if (list.size() == 0) {

			




	
	
	
		
 
		/* Empty dropdowns are not allowed */

			




	
	
	
		
 
		list.emplace_back(new DropDownListStringItem(STR_NONE, INVALID_ROADTYPE, true));

			




	
	
	
		
 
		list.push_back(std::make_unique<DropDownListStringItem>(STR_NONE, INVALID_ROADTYPE, true));

			




	
	
	
		
 
	}

			




	
	
	
		
 

			




	
	
	
		
 
	return list;

			




	
	
		
 
@@ -1880,14 +1880,14 @@ DropDownList GetScenRoadTypeDropDownList

			




	
	
	
		
 
		SetDParam(0, rti->strings.menu_text);

			




	
	
	
		
 
		SetDParam(1, rti->max_speed / 2);

			




	
	
	
		
 
		StringID str = rti->max_speed > 0 ? STR_TOOLBAR_RAILTYPE_VELOCITY : STR_JUST_STRING;

			




	
	
	
		
 
		DropDownListIconItem *item = new DropDownListIconItem(rti->gui_sprites.build_x_road, PAL_NONE, str, rt, !HasBit(avail_roadtypes, rt));

			




	
	
	
		
 
		auto item = std::make_unique<DropDownListIconItem>(rti->gui_sprites.build_x_road, PAL_NONE, str, rt, !HasBit(avail_roadtypes, rt));

			




	
	
	
		
 
		item->SetDimension(d);

			




	
	
	
		
 
		list.emplace_back(item);

			




	
	
	
		
 
		list.push_back(std::move(item));

			




	
	
	
		
 
	}

			




	
	
	
		
 

			




	
	
	
		
 
	if (list.size() == 0) {

			




	
	
	
		
 
		/* Empty dropdowns are not allowed */

			




	
	
	
		
 
		list.emplace_back(new DropDownListStringItem(STR_NONE, -1, true));

			




	
	
	
		
 
		list.push_back(std::make_unique<DropDownListStringItem>(STR_NONE, -1, true));

			




	
	
	
		
 
	}

			




	
	
	
		
 

			




	
	
	
		
 
	return list;

			




        

    


    
    

    

        

                

                    src/script/script_gui.cpp
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -469,7 +469,7 @@ struct ScriptSettingsWindow : public Win

			




	
	
	
		
 

			




	
	
	
		
 
							DropDownList list;

			




	
	
	
		
 
							for (int i = config_item.min_value; i <= config_item.max_value; i++) {

			




	
	
	
		
 
								list.emplace_back(new DropDownListStringItem(config_item.labels.find(i)->second, i, false));

			




	
	
	
		
 
								list.push_back(std::make_unique<DropDownListStringItem>(config_item.labels.find(i)->second, i, false));

			




	
	
	
		
 
							}

			




	
	
	
		
 

			




	
	
	
		
 
							ShowDropDownListAt(this, std::move(list), old_val, WID_SCRS_SETTING_DROPDOWN, wi_rect, COLOUR_ORANGE);

			




        

    


    
    

    

        

                

                    src/settings_gui.cpp
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -213,18 +213,18 @@ struct GameOptionsWindow : Window {

			




	
	
	
		
 
					int i = &currency - _currency_specs;

			




	
	
	
		
 
					if (i == CURRENCY_CUSTOM) continue;

			




	
	
	
		
 
					if (currency.code.empty()) {

			




	
	
	
		
 
						list.emplace_back(new DropDownListStringItem(currency.name, i, HasBit(disabled, i)));

			




	
	
	
		
 
						list.push_back(std::make_unique<DropDownListStringItem>(currency.name, i, HasBit(disabled, i)));

			




	
	
	
		
 
					} else {

			




	
	
	
		
 
						SetDParam(0, currency.name);

			




	
	
	
		
 
						SetDParamStr(1, currency.code);

			




	
	
	
		
 
						list.emplace_back(new DropDownListStringItem(STR_GAME_OPTIONS_CURRENCY_CODE, i, HasBit(disabled, i)));

			




	
	
	
		
 
						list.push_back(std::make_unique<DropDownListStringItem>(STR_GAME_OPTIONS_CURRENCY_CODE, i, HasBit(disabled, i)));

			




	
	
	
		
 
					}

			




	
	
	
		
 
				}

			




	
	
	
		
 
				std::sort(list.begin(), list.end(), DropDownListStringItem::NatSortFunc);

			




	
	
	
		
 

			




	
	
	
		
 
				/* Append custom currency at the end */

			




	
	
	
		
 
				list.emplace_back(new DropDownListItem(-1, false)); // separator line

			




	
	
	
		
 
				list.emplace_back(new DropDownListStringItem(STR_GAME_OPTIONS_CURRENCY_CUSTOM, CURRENCY_CUSTOM, HasBit(disabled, CURRENCY_CUSTOM)));

			




	
	
	
		
 
				list.push_back(std::make_unique<DropDownListItem>(-1, false)); // separator line

			




	
	
	
		
 
				list.push_back(std::make_unique<DropDownListStringItem>(STR_GAME_OPTIONS_CURRENCY_CUSTOM, CURRENCY_CUSTOM, HasBit(disabled, CURRENCY_CUSTOM)));

			




	
	
	
		
 
				break;

			




	
	
	
		
 
			}

			




	
	
	
		
 

			




	
	
		
 
@@ -238,7 +238,7 @@ struct GameOptionsWindow : Window {

			




	
	
	
		
 

			




	
	
	
		
 
				const StringID *items = _autosave_dropdown;

			




	
	
	
		
 
				for (uint i = 0; *items != INVALID_STRING_ID; items++, i++) {

			




	
	
	
		
 
					list.emplace_back(new DropDownListStringItem(*items, i, false));

			




	
	
	
		
 
					list.push_back(std::make_unique<DropDownListStringItem>(*items, i, false));

			




	
	
	
		
 
				}

			




	
	
	
		
 
				break;

			




	
	
	
		
 
			}

			




	
	
		
 
@@ -260,7 +260,7 @@ struct GameOptionsWindow : Window {

			




	
	
	
		
 
						SetDParamStr(0, _languages[i].name);

			




	
	
	
		
 
					}

			




	
	
	
		
 
					SetDParam(1, (LANGUAGE_TOTAL_STRINGS - _languages[i].missing) * 100 / LANGUAGE_TOTAL_STRINGS);

			




	
	
	
		
 
					list.emplace_back(new DropDownListStringItem(hide_percentage ? STR_JUST_RAW_STRING : STR_GAME_OPTIONS_LANGUAGE_PERCENTAGE, i, false));

			




	
	
	
		
 
					list.push_back(std::make_unique<DropDownListStringItem>(hide_percentage ? STR_JUST_RAW_STRING : STR_GAME_OPTIONS_LANGUAGE_PERCENTAGE, i, false));

			




	
	
	
		
 
				}

			




	
	
	
		
 
				std::sort(list.begin(), list.end(), DropDownListStringItem::NatSortFunc);

			




	
	
	
		
 
				break;

			




	
	
		
 
@@ -273,7 +273,7 @@ struct GameOptionsWindow : Window {

			




	
	
	
		
 
				for (uint i = 0; i < _resolutions.size(); i++) {

			




	
	
	
		
 
					SetDParam(0, _resolutions[i].width);

			




	
	
	
		
 
					SetDParam(1, _resolutions[i].height);

			




	
	
	
		
 
					list.emplace_back(new DropDownListStringItem(STR_GAME_OPTIONS_RESOLUTION_ITEM, i, false));

			




	
	
	
		
 
					list.push_back(std::make_unique<DropDownListStringItem>(STR_GAME_OPTIONS_RESOLUTION_ITEM, i, false));

			




	
	
	
		
 
				}

			




	
	
	
		
 
				break;

			




	
	
	
		
 

			




	
	
		
 
@@ -282,7 +282,7 @@ struct GameOptionsWindow : Window {

			




	
	
	
		
 
					auto i = std::distance(_refresh_rates.begin(), it);

			




	
	
	
		
 
					if (*it == _settings_client.gui.refresh_rate) *selected_index = i;

			




	
	
	
		
 
					SetDParam(0, *it);

			




	
	
	
		
 
					list.emplace_back(new DropDownListStringItem(STR_GAME_OPTIONS_REFRESH_RATE_ITEM, i, false));

			




	
	
	
		
 
					list.push_back(std::make_unique<DropDownListStringItem>(STR_GAME_OPTIONS_REFRESH_RATE_ITEM, i, false));

			




	
	
	
		
 
				}

			




	
	
	
		
 
				break;

			




	
	
	
		
 

			




	
	
		
 
@@ -2219,15 +2219,15 @@ struct GameSettingsWindow : Window {

			




	
	
	
		
 
					 * we don't want to allow comparing with new game's settings. */

			




	
	
	
		
 
					bool disabled = mode == RM_CHANGED_AGAINST_NEW && settings_ptr == &_settings_newgame;

			




	
	
	
		
 

			




	
	
	
		
 
					list.emplace_back(new DropDownListStringItem(_game_settings_restrict_dropdown[mode], mode, disabled));

			




	
	
	
		
 
					list.push_back(std::make_unique<DropDownListStringItem>(_game_settings_restrict_dropdown[mode], mode, disabled));

			




	
	
	
		
 
				}

			




	
	
	
		
 
				break;

			




	
	
	
		
 

			




	
	
	
		
 
			case WID_GS_TYPE_DROPDOWN:

			




	
	
	
		
 
				list.emplace_back(new DropDownListStringItem(STR_CONFIG_SETTING_TYPE_DROPDOWN_ALL, ST_ALL, false));

			




	
	
	
		
 
				list.emplace_back(new DropDownListStringItem(_game_mode == GM_MENU ? STR_CONFIG_SETTING_TYPE_DROPDOWN_GAME_MENU : STR_CONFIG_SETTING_TYPE_DROPDOWN_GAME_INGAME, ST_GAME, false));

			




	
	
	
		
 
				list.emplace_back(new DropDownListStringItem(_game_mode == GM_MENU ? STR_CONFIG_SETTING_TYPE_DROPDOWN_COMPANY_MENU : STR_CONFIG_SETTING_TYPE_DROPDOWN_COMPANY_INGAME, ST_COMPANY, false));

			




	
	
	
		
 
				list.emplace_back(new DropDownListStringItem(STR_CONFIG_SETTING_TYPE_DROPDOWN_CLIENT, ST_CLIENT, false));

			




	
	
	
		
 
				list.push_back(std::make_unique<DropDownListStringItem>(STR_CONFIG_SETTING_TYPE_DROPDOWN_ALL, ST_ALL, false));

			




	
	
	
		
 
				list.push_back(std::make_unique<DropDownListStringItem>(_game_mode == GM_MENU ? STR_CONFIG_SETTING_TYPE_DROPDOWN_GAME_MENU : STR_CONFIG_SETTING_TYPE_DROPDOWN_GAME_INGAME, ST_GAME, false));

			




	
	
	
		
 
				list.push_back(std::make_unique<DropDownListStringItem>(_game_mode == GM_MENU ? STR_CONFIG_SETTING_TYPE_DROPDOWN_COMPANY_MENU : STR_CONFIG_SETTING_TYPE_DROPDOWN_COMPANY_INGAME, ST_COMPANY, false));

			




	
	
	
		
 
				list.push_back(std::make_unique<DropDownListStringItem>(STR_CONFIG_SETTING_TYPE_DROPDOWN_CLIENT, ST_CLIENT, false));

			




	
	
	
		
 
				break;

			




	
	
	
		
 
		}

			




	
	
	
		
 
		return list;

			




	
	
		
 
@@ -2391,7 +2391,7 @@ struct GameSettingsWindow : Window {

			




	
	
	
		
 

			




	
	
	
		
 
					DropDownList list;

			




	
	
	
		
 
					for (int i = sd->min; i <= (int)sd->max; i++) {

			




	
	
	
		
 
						list.emplace_back(new DropDownListStringItem(sd->str_val + i - sd->min, i, false));

			




	
	
	
		
 
						list.push_back(std::make_unique<DropDownListStringItem>(sd->str_val + i - sd->min, i, false));

			




	
	
	
		
 
					}

			




	
	
	
		
 

			




	
	
	
		
 
					ShowDropDownListAt(this, std::move(list), value, WID_GS_SETTING_DROPDOWN, wi_rect, COLOUR_ORANGE);

			




        

    


    
    

    

        

                

                    src/settings_gui.h
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -29,7 +29,7 @@ DropDownList BuildSetDropDownList(int *s

			




	
	
	
		
 
	*selected_index = T::GetIndexOfUsedSet();

			




	
	
	
		
 
	DropDownList list;

			




	
	
	
		
 
	for (int i = 0; i < n; i++) {

			




	
	
	
		
 
		list.emplace_back(new DropDownListStringItem(T::GetSet(i)->name, i, false));

			




	
	
	
		
 
		list.push_back(std::make_unique<DropDownListStringItem>(T::GetSet(i)->name, i, false));

			




	
	
	
		
 
	}

			




	
	
	
		
 
	return list;

			




	
	
	
		
 
}

			




        

    


    
    

    

        

                

                    src/spritecache.cpp
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -98,7 +98,7 @@ SpriteFile &OpenCachedSpriteFile(const s

			




	
	
	
		
 
{

			




	
	
	
		
 
	SpriteFile *file = GetCachedSpriteFileByName(filename);

			




	
	
	
		
 
	if (file == nullptr) {

			




	
	
	
		
 
		file = _sprite_files.emplace_back(new SpriteFile(filename, subdir, palette_remap)).get();

			




	
	
	
		
 
		file = _sprite_files.insert(std::end(_sprite_files), std::make_unique<SpriteFile>(filename, subdir, palette_remap))->get();

			




	
	
	
		
 
	} else {

			




	
	
	
		
 
		file->SeekToBegin();

			




	
	
	
		
 
	}

			




        

    


    
    

    

        

                

                    src/story_gui.cpp
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -253,11 +253,11 @@ protected:

			




	
	
	
		
 
		for (const StoryPage *p : this->story_pages) {

			




	
	
	
		
 
			bool current_page = p->index == this->selected_page_id;

			




	
	
	
		
 
			if (!p->title.empty()) {

			




	
	
	
		
 
				list.emplace_back(new DropDownListStringItem(p->title, p->index, current_page));

			




	
	
	
		
 
				list.push_back(std::make_unique<DropDownListStringItem>(p->title, p->index, current_page));

			




	
	
	
		
 
			} else {

			




	
	
	
		
 
				/* No custom title => use a generic page title with page number. */

			




	
	
	
		
 
				SetDParam(0, page_num);

			




	
	
	
		
 
				list.emplace_back(new DropDownListStringItem(STR_STORY_BOOK_GENERIC_PAGE_ITEM, p->index, current_page));

			




	
	
	
		
 
				list.push_back(std::make_unique<DropDownListStringItem>(STR_STORY_BOOK_GENERIC_PAGE_ITEM, p->index, current_page));

			




	
	
	
		
 
			}

			




	
	
	
		
 
			page_num++;

			




	
	
	
		
 
		}

			




        

    


    
    

    

        

                

                    src/textfile_gui.cpp
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -528,8 +528,7 @@ void TextfileWindow::AfterLoadMarkdown()

			




	
	
	
		
 
			DropDownList list;

			




	
	
	
		
 
			for (size_t line : this->jumplist) {

			




	
	
	
		
 
				SetDParamStr(0, this->lines[line].text);

			




	
	
	
		
 
				DropDownListStringItem *item = new DropDownListStringItem(STR_TEXTFILE_JUMPLIST_ITEM, (int)line, false);

			




	
	
	
		
 
				list.emplace_back(item);

			




	
	
	
		
 
				list.push_back(std::make_unique<DropDownListStringItem>(STR_TEXTFILE_JUMPLIST_ITEM, (int)line, false));

			




	
	
	
		
 
			}

			




	
	
	
		
 
			ShowDropDownList(this, std::move(list), -1, widget);

			




	
	
	
		
 
			break;

			




        

    


    
    

    

        

                

                    src/toolbar_gui.cpp
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -207,7 +207,7 @@ static void PopupMainToolbMenu(Window *w

			




	
	
	
		
 
{

			




	
	
	
		
 
	DropDownList list;

			




	
	
	
		
 
	for (int i = 0; i < count; i++) {

			




	
	
	
		
 
		list.emplace_back(new DropDownListStringItem(string + i, i, false));

			




	
	
	
		
 
		list.push_back(std::make_unique<DropDownListStringItem>(string + i, i, false));

			




	
	
	
		
 
	}

			




	
	
	
		
 
	PopupMainToolbMenu(w, widget, std::move(list), 0);

			




	
	
	
		
 
}

			




	
	
		
 
@@ -232,24 +232,24 @@ static void PopupMainCompanyToolbMenu(Wi

			




	
	
	
		
 
			if (!_networking) break;

			




	
	
	
		
 

			




	
	
	
		
 
			/* Add the client list button for the companies menu */

			




	
	
	
		
 
			list.emplace_back(new DropDownListStringItem(STR_NETWORK_COMPANY_LIST_CLIENT_LIST, CTMN_CLIENT_LIST, false));

			




	
	
	
		
 
			list.push_back(std::make_unique<DropDownListStringItem>(STR_NETWORK_COMPANY_LIST_CLIENT_LIST, CTMN_CLIENT_LIST, false));

			




	
	
	
		
 

			




	
	
	
		
 
			if (_local_company != COMPANY_SPECTATOR) {

			




	
	
	
		
 
				list.emplace_back(new DropDownListStringItem(STR_NETWORK_COMPANY_LIST_SPECTATE, CTMN_SPECTATE, false));

			




	
	
	
		
 
				list.push_back(std::make_unique<DropDownListStringItem>(STR_NETWORK_COMPANY_LIST_SPECTATE, CTMN_SPECTATE, false));

			




	
	
	
		
 
			}

			




	
	
	
		
 
			break;

			




	
	
	
		
 
		case WID_TN_STORY:

			




	
	
	
		
 
			list.emplace_back(new DropDownListStringItem(STR_STORY_BOOK_SPECTATOR, CTMN_SPECTATOR, false));

			




	
	
	
		
 
			list.push_back(std::make_unique<DropDownListStringItem>(STR_STORY_BOOK_SPECTATOR, CTMN_SPECTATOR, false));

			




	
	
	
		
 
			break;

			




	
	
	
		
 

			




	
	
	
		
 
		case WID_TN_GOAL:

			




	
	
	
		
 
			list.emplace_back(new DropDownListStringItem(STR_GOALS_SPECTATOR, CTMN_SPECTATOR, false));

			




	
	
	
		
 
			list.push_back(std::make_unique<DropDownListStringItem>(STR_GOALS_SPECTATOR, CTMN_SPECTATOR, false));

			




	
	
	
		
 
			break;

			




	
	
	
		
 
	}

			




	
	
	
		
 

			




	
	
	
		
 
	for (CompanyID c = COMPANY_FIRST; c < MAX_COMPANIES; c++) {

			




	
	
	
		
 
		if (!Company::IsValidID(c)) continue;

			




	
	
	
		
 
		list.emplace_back(new DropDownListCompanyItem(c, false, HasBit(grey, c)));

			




	
	
	
		
 
		list.push_back(std::make_unique<DropDownListCompanyItem>(c, false, HasBit(grey, c)));

			




	
	
	
		
 
	}

			




	
	
	
		
 

			




	
	
	
		
 
	PopupMainToolbMenu(w, widget, std::move(list), _local_company == COMPANY_SPECTATOR ? (widget == WID_TN_COMPANIES ? CTMN_CLIENT_LIST : CTMN_SPECTATOR) : (int)_local_company);

			




	
	
		
 
@@ -325,27 +325,27 @@ enum OptionMenuEntries {

			




	
	
	
		
 
static CallBackFunction ToolbarOptionsClick(Window *w)

			




	
	
	
		
 
{

			




	
	
	
		
 
	DropDownList list;

			




	
	
	
		
 
	list.emplace_back(new DropDownListStringItem(STR_SETTINGS_MENU_GAME_OPTIONS,             OME_GAMEOPTIONS, false));

			




	
	
	
		
 
	list.emplace_back(new DropDownListStringItem(STR_SETTINGS_MENU_CONFIG_SETTINGS_TREE,     OME_SETTINGS, false));

			




	
	
	
		
 
	list.push_back(std::make_unique<DropDownListStringItem>(STR_SETTINGS_MENU_GAME_OPTIONS,             OME_GAMEOPTIONS, false));

			




	
	
	
		
 
	list.push_back(std::make_unique<DropDownListStringItem>(STR_SETTINGS_MENU_CONFIG_SETTINGS_TREE,     OME_SETTINGS, false));

			




	
	
	
		
 
	/* Changes to the per-AI settings don't get send from the server to the clients. Clients get

			




	
	
	
		
 
	 * the settings once they join but never update it. As such don't show the window at all

			




	
	
	
		
 
	 * to network clients. */

			




	
	
	
		
 
	if (!_networking || _network_server) {

			




	
	
	
		
 
		list.emplace_back(new DropDownListStringItem(STR_SETTINGS_MENU_AI_SETTINGS,          OME_AI_SETTINGS, false));

			




	
	
	
		
 
		list.emplace_back(new DropDownListStringItem(STR_SETTINGS_MENU_GAMESCRIPT_SETTINGS,  OME_GAMESCRIPT_SETTINGS, false));

			




	
	
	
		
 
		list.push_back(std::make_unique<DropDownListStringItem>(STR_SETTINGS_MENU_AI_SETTINGS,          OME_AI_SETTINGS, false));

			




	
	
	
		
 
		list.push_back(std::make_unique<DropDownListStringItem>(STR_SETTINGS_MENU_GAMESCRIPT_SETTINGS,  OME_GAMESCRIPT_SETTINGS, false));

			




	
	
	
		
 
	}

			




	
	
	
		
 
	list.emplace_back(new DropDownListStringItem(STR_SETTINGS_MENU_NEWGRF_SETTINGS,          OME_NEWGRFSETTINGS, false));

			




	
	
	
		
 
	list.emplace_back(new DropDownListStringItem(STR_SETTINGS_MENU_TRANSPARENCY_OPTIONS,     OME_TRANSPARENCIES, false));

			




	
	
	
		
 
	list.emplace_back(new DropDownListItem(-1, false));

			




	
	
	
		
 
	list.emplace_back(new DropDownListCheckedItem(STR_SETTINGS_MENU_TOWN_NAMES_DISPLAYED,    OME_SHOW_TOWNNAMES, false, HasBit(_display_opt, DO_SHOW_TOWN_NAMES)));

			




	
	
	
		
 
	list.emplace_back(new DropDownListCheckedItem(STR_SETTINGS_MENU_STATION_NAMES_DISPLAYED, OME_SHOW_STATIONNAMES, false, HasBit(_display_opt, DO_SHOW_STATION_NAMES)));

			




	
	
	
		
 
	list.emplace_back(new DropDownListCheckedItem(STR_SETTINGS_MENU_WAYPOINTS_DISPLAYED,     OME_SHOW_WAYPOINTNAMES, false, HasBit(_display_opt, DO_SHOW_WAYPOINT_NAMES)));

			




	
	
	
		
 
	list.emplace_back(new DropDownListCheckedItem(STR_SETTINGS_MENU_SIGNS_DISPLAYED,         OME_SHOW_SIGNS, false, HasBit(_display_opt, DO_SHOW_SIGNS)));

			




	
	
	
		
 
	list.emplace_back(new DropDownListCheckedItem(STR_SETTINGS_MENU_SHOW_COMPETITOR_SIGNS,   OME_SHOW_COMPETITOR_SIGNS, false, HasBit(_display_opt, DO_SHOW_COMPETITOR_SIGNS)));

			




	
	
	
		
 
	list.emplace_back(new DropDownListCheckedItem(STR_SETTINGS_MENU_FULL_ANIMATION,          OME_FULL_ANIMATION, false, HasBit(_display_opt, DO_FULL_ANIMATION)));

			




	
	
	
		
 
	list.emplace_back(new DropDownListCheckedItem(STR_SETTINGS_MENU_FULL_DETAIL,             OME_FULL_DETAILS, false, HasBit(_display_opt, DO_FULL_DETAIL)));

			




	
	
	
		
 
	list.emplace_back(new DropDownListCheckedItem(STR_SETTINGS_MENU_TRANSPARENT_BUILDINGS,   OME_TRANSPARENTBUILDINGS, false, IsTransparencySet(TO_HOUSES)));

			




	
	
	
		
 
	list.emplace_back(new DropDownListCheckedItem(STR_SETTINGS_MENU_TRANSPARENT_SIGNS,       OME_SHOW_STATIONSIGNS, false, IsTransparencySet(TO_SIGNS)));

			




	
	
	
		
 
	list.push_back(std::make_unique<DropDownListStringItem>(STR_SETTINGS_MENU_NEWGRF_SETTINGS,          OME_NEWGRFSETTINGS, false));

			




	
	
	
		
 
	list.push_back(std::make_unique<DropDownListStringItem>(STR_SETTINGS_MENU_TRANSPARENCY_OPTIONS,     OME_TRANSPARENCIES, false));

			




	
	
	
		
 
	list.push_back(std::make_unique<DropDownListItem>(-1, false));

			




	
	
	
		
 
	list.push_back(std::make_unique<DropDownListCheckedItem>(STR_SETTINGS_MENU_TOWN_NAMES_DISPLAYED,    OME_SHOW_TOWNNAMES, false, HasBit(_display_opt, DO_SHOW_TOWN_NAMES)));

			




	
	
	
		
 
	list.push_back(std::make_unique<DropDownListCheckedItem>(STR_SETTINGS_MENU_STATION_NAMES_DISPLAYED, OME_SHOW_STATIONNAMES, false, HasBit(_display_opt, DO_SHOW_STATION_NAMES)));

			




	
	
	
		
 
	list.push_back(std::make_unique<DropDownListCheckedItem>(STR_SETTINGS_MENU_WAYPOINTS_DISPLAYED,     OME_SHOW_WAYPOINTNAMES, false, HasBit(_display_opt, DO_SHOW_WAYPOINT_NAMES)));

			




	
	
	
		
 
	list.push_back(std::make_unique<DropDownListCheckedItem>(STR_SETTINGS_MENU_SIGNS_DISPLAYED,         OME_SHOW_SIGNS, false, HasBit(_display_opt, DO_SHOW_SIGNS)));

			




	
	
	
		
 
	list.push_back(std::make_unique<DropDownListCheckedItem>(STR_SETTINGS_MENU_SHOW_COMPETITOR_SIGNS,   OME_SHOW_COMPETITOR_SIGNS, false, HasBit(_display_opt, DO_SHOW_COMPETITOR_SIGNS)));

			




	
	
	
		
 
	list.push_back(std::make_unique<DropDownListCheckedItem>(STR_SETTINGS_MENU_FULL_ANIMATION,          OME_FULL_ANIMATION, false, HasBit(_display_opt, DO_FULL_ANIMATION)));

			




	
	
	
		
 
	list.push_back(std::make_unique<DropDownListCheckedItem>(STR_SETTINGS_MENU_FULL_DETAIL,             OME_FULL_DETAILS, false, HasBit(_display_opt, DO_FULL_DETAIL)));

			




	
	
	
		
 
	list.push_back(std::make_unique<DropDownListCheckedItem>(STR_SETTINGS_MENU_TRANSPARENT_BUILDINGS,   OME_TRANSPARENTBUILDINGS, false, IsTransparencySet(TO_HOUSES)));

			




	
	
	
		
 
	list.push_back(std::make_unique<DropDownListCheckedItem>(STR_SETTINGS_MENU_TRANSPARENT_SIGNS,       OME_SHOW_STATIONSIGNS, false, IsTransparencySet(TO_SIGNS)));

			




	
	
	
		
 

			




	
	
	
		
 
	ShowDropDownList(w, std::move(list), 0, WID_TN_SETTINGS, 140, true);

			




	
	
	
		
 
	if (_settings_client.sound.click_beep) SndPlayFx(SND_15_BEEP);

			




	
	
		
 
@@ -475,10 +475,10 @@ enum MapMenuEntries {

			




	
	
	
		
 
static CallBackFunction ToolbarMapClick(Window *w)

			




	
	
	
		
 
{

			




	
	
	
		
 
	DropDownList list;

			




	
	
	
		
 
	list.emplace_back(new DropDownListStringItem(STR_MAP_MENU_MAP_OF_WORLD,            MME_SHOW_SMALLMAP,          false));

			




	
	
	
		
 
	list.emplace_back(new DropDownListStringItem(STR_MAP_MENU_EXTRA_VIEWPORT,          MME_SHOW_EXTRAVIEWPORTS,    false));

			




	
	
	
		
 
	list.emplace_back(new DropDownListStringItem(STR_MAP_MENU_LINGRAPH_LEGEND,         MME_SHOW_LINKGRAPH,         false));

			




	
	
	
		
 
	list.emplace_back(new DropDownListStringItem(STR_MAP_MENU_SIGN_LIST,               MME_SHOW_SIGNLISTS,         false));

			




	
	
	
		
 
	list.push_back(std::make_unique<DropDownListStringItem>(STR_MAP_MENU_MAP_OF_WORLD,            MME_SHOW_SMALLMAP,          false));

			




	
	
	
		
 
	list.push_back(std::make_unique<DropDownListStringItem>(STR_MAP_MENU_EXTRA_VIEWPORT,          MME_SHOW_EXTRAVIEWPORTS,    false));

			




	
	
	
		
 
	list.push_back(std::make_unique<DropDownListStringItem>(STR_MAP_MENU_LINGRAPH_LEGEND,         MME_SHOW_LINKGRAPH,         false));

			




	
	
	
		
 
	list.push_back(std::make_unique<DropDownListStringItem>(STR_MAP_MENU_SIGN_LIST,               MME_SHOW_SIGNLISTS,         false));

			




	
	
	
		
 
	PopupMainToolbMenu(w, WID_TN_SMALL_MAP, std::move(list), 0);

			




	
	
	
		
 
	return CBF_NONE;

			




	
	
	
		
 
}

			




	
	
		
 
@@ -486,11 +486,11 @@ static CallBackFunction ToolbarMapClick(

			




	
	
	
		
 
static CallBackFunction ToolbarScenMapTownDir(Window *w)

			




	
	
	
		
 
{

			




	
	
	
		
 
	DropDownList list;

			




	
	
	
		
 
	list.emplace_back(new DropDownListStringItem(STR_MAP_MENU_MAP_OF_WORLD,            MME_SHOW_SMALLMAP,          false));

			




	
	
	
		
 
	list.emplace_back(new DropDownListStringItem(STR_MAP_MENU_EXTRA_VIEWPORT,          MME_SHOW_EXTRAVIEWPORTS,    false));

			




	
	
	
		
 
	list.emplace_back(new DropDownListStringItem(STR_MAP_MENU_SIGN_LIST,               MME_SHOW_SIGNLISTS,         false));

			




	
	
	
		
 
	list.emplace_back(new DropDownListStringItem(STR_TOWN_MENU_TOWN_DIRECTORY,         MME_SHOW_TOWNDIRECTORY,     false));

			




	
	
	
		
 
	list.emplace_back(new DropDownListStringItem(STR_INDUSTRY_MENU_INDUSTRY_DIRECTORY, MME_SHOW_INDUSTRYDIRECTORY, false));

			




	
	
	
		
 
	list.push_back(std::make_unique<DropDownListStringItem>(STR_MAP_MENU_MAP_OF_WORLD,            MME_SHOW_SMALLMAP,          false));

			




	
	
	
		
 
	list.push_back(std::make_unique<DropDownListStringItem>(STR_MAP_MENU_EXTRA_VIEWPORT,          MME_SHOW_EXTRAVIEWPORTS,    false));

			




	
	
	
		
 
	list.push_back(std::make_unique<DropDownListStringItem>(STR_MAP_MENU_SIGN_LIST,               MME_SHOW_SIGNLISTS,         false));

			




	
	
	
		
 
	list.push_back(std::make_unique<DropDownListStringItem>(STR_TOWN_MENU_TOWN_DIRECTORY,         MME_SHOW_TOWNDIRECTORY,     false));

			




	
	
	
		
 
	list.push_back(std::make_unique<DropDownListStringItem>(STR_INDUSTRY_MENU_INDUSTRY_DIRECTORY, MME_SHOW_INDUSTRYDIRECTORY, false));

			




	
	
	
		
 
	PopupMainToolbMenu(w, WID_TE_SMALL_MAP, std::move(list), 0);

			




	
	
	
		
 
	return CBF_NONE;

			




	
	
	
		
 
}

			




	
	
		
 
@@ -693,13 +693,13 @@ static const int LTMN_HIGHSCORE         

			




	
	
	
		
 
static void AddDropDownLeagueTableOptions(DropDownList &list) {

			




	
	
	
		
 
	if (LeagueTable::GetNumItems() > 0) {

			




	
	
	
		
 
		for (LeagueTable *lt : LeagueTable::Iterate()) {

			




	
	
	
		
 
			list.emplace_back(new DropDownListStringItem(lt->title, lt->index, false));

			




	
	
	
		
 
			list.push_back(std::make_unique<DropDownListStringItem>(lt->title, lt->index, false));

			




	
	
	
		
 
		}

			




	
	
	
		
 
	} else {

			




	
	
	
		
 
		list.emplace_back(new DropDownListStringItem(STR_GRAPH_MENU_COMPANY_LEAGUE_TABLE, LTMN_PERFORMANCE_LEAGUE, false));

			




	
	
	
		
 
		list.emplace_back(new DropDownListStringItem(STR_GRAPH_MENU_DETAILED_PERFORMANCE_RATING, LTMN_PERFORMANCE_RATING, false));

			




	
	
	
		
 
		list.push_back(std::make_unique<DropDownListStringItem>(STR_GRAPH_MENU_COMPANY_LEAGUE_TABLE, LTMN_PERFORMANCE_LEAGUE, false));

			




	
	
	
		
 
		list.push_back(std::make_unique<DropDownListStringItem>(STR_GRAPH_MENU_DETAILED_PERFORMANCE_RATING, LTMN_PERFORMANCE_RATING, false));

			




	
	
	
		
 
		if (!_networking) {

			




	
	
	
		
 
			list.emplace_back(new DropDownListStringItem(STR_GRAPH_MENU_HIGHSCORE, LTMN_HIGHSCORE, false));

			




	
	
	
		
 
			list.push_back(std::make_unique<DropDownListStringItem>(STR_GRAPH_MENU_HIGHSCORE, LTMN_HIGHSCORE, false));

			




	
	
	
		
 
		}

			




	
	
	
		
 
	}

			




	
	
	
		
 
}

			




	
	
		
 
@@ -708,12 +708,12 @@ static CallBackFunction ToolbarGraphsCli

			




	
	
	
		
 
{

			




	
	
	
		
 
	DropDownList list;

			




	
	
	
		
 

			




	
	
	
		
 
	list.emplace_back(new DropDownListStringItem(STR_GRAPH_MENU_OPERATING_PROFIT_GRAPH, GRMN_OPERATING_PROFIT_GRAPH, false));

			




	
	
	
		
 
	list.emplace_back(new DropDownListStringItem(STR_GRAPH_MENU_INCOME_GRAPH, GRMN_INCOME_GRAPH, false));

			




	
	
	
		
 
	list.emplace_back(new DropDownListStringItem(STR_GRAPH_MENU_DELIVERED_CARGO_GRAPH, GRMN_DELIVERED_CARGO_GRAPH, false));

			




	
	
	
		
 
	list.emplace_back(new DropDownListStringItem(STR_GRAPH_MENU_PERFORMANCE_HISTORY_GRAPH, GRMN_PERFORMANCE_HISTORY_GRAPH, false));

			




	
	
	
		
 
	list.emplace_back(new DropDownListStringItem(STR_GRAPH_MENU_COMPANY_VALUE_GRAPH, GRMN_COMPANY_VALUE_GRAPH, false));

			




	
	
	
		
 
	list.emplace_back(new DropDownListStringItem(STR_GRAPH_MENU_CARGO_PAYMENT_RATES, GRMN_CARGO_PAYMENT_RATES, false));

			




	
	
	
		
 
	list.push_back(std::make_unique<DropDownListStringItem>(STR_GRAPH_MENU_OPERATING_PROFIT_GRAPH, GRMN_OPERATING_PROFIT_GRAPH, false));

			




	
	
	
		
 
	list.push_back(std::make_unique<DropDownListStringItem>(STR_GRAPH_MENU_INCOME_GRAPH, GRMN_INCOME_GRAPH, false));

			




	
	
	
		
 
	list.push_back(std::make_unique<DropDownListStringItem>(STR_GRAPH_MENU_DELIVERED_CARGO_GRAPH, GRMN_DELIVERED_CARGO_GRAPH, false));

			




	
	
	
		
 
	list.push_back(std::make_unique<DropDownListStringItem>(STR_GRAPH_MENU_PERFORMANCE_HISTORY_GRAPH, GRMN_PERFORMANCE_HISTORY_GRAPH, false));

			




	
	
	
		
 
	list.push_back(std::make_unique<DropDownListStringItem>(STR_GRAPH_MENU_COMPANY_VALUE_GRAPH, GRMN_COMPANY_VALUE_GRAPH, false));

			




	
	
	
		
 
	list.push_back(std::make_unique<DropDownListStringItem>(STR_GRAPH_MENU_CARGO_PAYMENT_RATES, GRMN_CARGO_PAYMENT_RATES, false));

			




	
	
	
		
 

			




	
	
	
		
 
	if (_toolbar_mode != TB_NORMAL) AddDropDownLeagueTableOptions(list);

			




	
	
	
		
 

			




	
	
		
 
@@ -974,7 +974,7 @@ static CallBackFunction MenuClickBuildTr

			




	
	
	
		
 
static CallBackFunction ToolbarBuildWaterClick(Window *w)

			




	
	
	
		
 
{

			




	
	
	
		
 
	DropDownList list;

			




	
	
	
		
 
	list.emplace_back(new DropDownListIconItem(SPR_IMG_BUILD_CANAL, PAL_NONE, STR_WATERWAYS_MENU_WATERWAYS_CONSTRUCTION, 0, false));

			




	
	
	
		
 
	list.push_back(std::make_unique<DropDownListIconItem>(SPR_IMG_BUILD_CANAL, PAL_NONE, STR_WATERWAYS_MENU_WATERWAYS_CONSTRUCTION, 0, false));

			




	
	
	
		
 
	ShowDropDownList(w, std::move(list), 0, WID_TN_WATER, 140, true);

			




	
	
	
		
 
	if (_settings_client.sound.click_beep) SndPlayFx(SND_15_BEEP);

			




	
	
	
		
 
	return CBF_NONE;

			




	
	
		
 
@@ -996,7 +996,7 @@ static CallBackFunction MenuClickBuildWa

			




	
	
	
		
 
static CallBackFunction ToolbarBuildAirClick(Window *w)

			




	
	
	
		
 
{

			




	
	
	
		
 
	DropDownList list;

			




	
	
	
		
 
	list.emplace_back(new DropDownListIconItem(SPR_IMG_AIRPORT, PAL_NONE, STR_AIRCRAFT_MENU_AIRPORT_CONSTRUCTION, 0, false));

			




	
	
	
		
 
	list.push_back(std::make_unique<DropDownListIconItem>(SPR_IMG_AIRPORT, PAL_NONE, STR_AIRCRAFT_MENU_AIRPORT_CONSTRUCTION, 0, false));

			




	
	
	
		
 
	ShowDropDownList(w, std::move(list), 0, WID_TN_AIR, 140, true);

			




	
	
	
		
 
	if (_settings_client.sound.click_beep) SndPlayFx(SND_15_BEEP);

			




	
	
	
		
 
	return CBF_NONE;

			




	
	
		
 
@@ -1018,9 +1018,9 @@ static CallBackFunction MenuClickBuildAi

			




	
	
	
		
 
static CallBackFunction ToolbarForestClick(Window *w)

			




	
	
	
		
 
{

			




	
	
	
		
 
	DropDownList list;

			




	
	
	
		
 
	list.emplace_back(new DropDownListIconItem(SPR_IMG_LANDSCAPING, PAL_NONE, STR_LANDSCAPING_MENU_LANDSCAPING, 0, false));

			




	
	
	
		
 
	list.emplace_back(new DropDownListIconItem(SPR_IMG_PLANTTREES, PAL_NONE, STR_LANDSCAPING_MENU_PLANT_TREES, 1, false));

			




	
	
	
		
 
	list.emplace_back(new DropDownListIconItem(SPR_IMG_SIGN, PAL_NONE, STR_LANDSCAPING_MENU_PLACE_SIGN, 2, false));

			




	
	
	
		
 
	list.push_back(std::make_unique<DropDownListIconItem>(SPR_IMG_LANDSCAPING, PAL_NONE, STR_LANDSCAPING_MENU_LANDSCAPING, 0, false));

			




	
	
	
		
 
	list.push_back(std::make_unique<DropDownListIconItem>(SPR_IMG_PLANTTREES, PAL_NONE, STR_LANDSCAPING_MENU_PLANT_TREES, 1, false));

			




	
	
	
		
 
	list.push_back(std::make_unique<DropDownListIconItem>(SPR_IMG_SIGN, PAL_NONE, STR_LANDSCAPING_MENU_PLACE_SIGN, 2, false));

			




	
	
	
		
 
	ShowDropDownList(w, std::move(list), 0, WID_TN_LANDSCAPE, 100, true);

			




	
	
	
		
 
	if (_settings_client.sound.click_beep) SndPlayFx(SND_15_BEEP);

			




	
	
	
		
 
	return CBF_NONE;

			




        

    


    
    

    

        

                

                    src/vehicle_gui.cpp
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -399,15 +399,15 @@ DropDownList BaseVehicleListWindow::Buil

			




	
	
	
		
 
{

			




	
	
	
		
 
	DropDownList list;

			




	
	
	
		
 

			




	
	
	
		
 
	if (show_autoreplace) list.emplace_back(new DropDownListStringItem(STR_VEHICLE_LIST_REPLACE_VEHICLES, ADI_REPLACE, false));

			




	
	
	
		
 
	list.emplace_back(new DropDownListStringItem(STR_VEHICLE_LIST_SEND_FOR_SERVICING, ADI_SERVICE, false));

			




	
	
	
		
 
	list.emplace_back(new DropDownListStringItem(this->vehicle_depot_name[this->vli.vtype], ADI_DEPOT, false));

			




	
	
	
		
 
	if (show_autoreplace) list.push_back(std::make_unique<DropDownListStringItem>(STR_VEHICLE_LIST_REPLACE_VEHICLES, ADI_REPLACE, false));

			




	
	
	
		
 
	list.push_back(std::make_unique<DropDownListStringItem>(STR_VEHICLE_LIST_SEND_FOR_SERVICING, ADI_SERVICE, false));

			




	
	
	
		
 
	list.push_back(std::make_unique<DropDownListStringItem>(this->vehicle_depot_name[this->vli.vtype], ADI_DEPOT, false));

			




	
	
	
		
 

			




	
	
	
		
 
	if (show_group) {

			




	
	
	
		
 
		list.emplace_back(new DropDownListStringItem(STR_GROUP_ADD_SHARED_VEHICLE, ADI_ADD_SHARED, false));

			




	
	
	
		
 
		list.emplace_back(new DropDownListStringItem(STR_GROUP_REMOVE_ALL_VEHICLES, ADI_REMOVE_ALL, false));

			




	
	
	
		
 
		list.push_back(std::make_unique<DropDownListStringItem>(STR_GROUP_ADD_SHARED_VEHICLE, ADI_ADD_SHARED, false));

			




	
	
	
		
 
		list.push_back(std::make_unique<DropDownListStringItem>(STR_GROUP_REMOVE_ALL_VEHICLES, ADI_REMOVE_ALL, false));

			




	
	
	
		
 
	} else if (show_create) {

			




	
	
	
		
 
		list.emplace_back(new DropDownListStringItem(STR_VEHICLE_LIST_CREATE_GROUP, ADI_CREATE_GROUP, false));

			




	
	
	
		
 
		list.push_back(std::make_unique<DropDownListStringItem>(STR_VEHICLE_LIST_CREATE_GROUP, ADI_CREATE_GROUP, false));

			




	
	
	
		
 
	}

			




	
	
	
		
 

			




	
	
	
		
 
	return list;

			




        

    


    
    

    

        

                

                    src/widgets/dropdown.cpp
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -464,7 +464,7 @@ void ShowDropDownMenu(Window *w, const S

			




	
	
	
		
 

			




	
	
	
		
 
	for (uint i = 0; strings[i] != INVALID_STRING_ID; i++) {

			




	
	
	
		
 
		if (!HasBit(hidden_mask, i)) {

			




	
	
	
		
 
			list.emplace_back(new DropDownListStringItem(strings[i], i, HasBit(disabled_mask, i)));

			




	
	
	
		
 
			list.push_back(std::make_unique<DropDownListStringItem>(strings[i], i, HasBit(disabled_mask, i)));

			




	
	
	
		
 
		}

			




	
	
	
		
 
	}

			




	
	
	
		
 

			




        

    



    


    



    



      

      





    
    0 comments (0 inline, 0 general)
    





    


  

  







  


    




    








    
        Server instance: code.theleruby.com-48
    
    
        This site is powered by
            Kallithea,
        which is
        © 2010–2022 by various authors & licensed under GPLv3.
            – Support