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

Merge branch 'master' into jgrpp

Browse Source 
# Conflicts:
#	config.lib
#	projects/openttd_vs140.vcxproj
#	projects/openttd_vs140.vcxproj.filters
#	projects/openttd_vs141.vcxproj
#	projects/openttd_vs141.vcxproj.filters
#	projects/openttd_vs142.vcxproj
#	projects/openttd_vs142.vcxproj.filters
#	src/aircraft_cmd.cpp
#	src/base_station_base.h
#	src/core/pool_type.hpp
#	src/disaster_vehicle.cpp
#	src/economy.cpp
#	src/engine.cpp
#	src/group.h
#	src/group_cmd.cpp
#	src/group_gui.cpp
#	src/lang/english.txt
#	src/lang/german.txt
#	src/linkgraph/linkgraph_gui.cpp
#	src/network/network_command.cpp
#	src/network/network_server.cpp
#	src/openttd.cpp
#	src/order_cmd.cpp
#	src/road_cmd.cpp
#	src/saveload/afterload.cpp
#	src/saveload/cargopacket_sl.cpp
#	src/saveload/linkgraph_sl.cpp
#	src/saveload/order_sl.cpp
#	src/saveload/station_sl.cpp
#	src/saveload/town_sl.cpp
#	src/saveload/vehicle_sl.cpp
#	src/screenshot.cpp
#	src/screenshot.h
#	src/settings_gui.cpp
#	src/settings_type.h
#	src/smallmap_gui.cpp
#	src/station.cpp
#	src/station_cmd.cpp
#	src/table/settings.ini
#	src/toolbar_gui.cpp
#	src/town_cmd.cpp
#	src/train.h
#	src/train_cmd.cpp
#	src/train_gui.cpp
#	src/vehicle.cpp
#	src/vehicle_base.h
#	src/vehiclelist.cpp
#	src/window_type.h
This commit is contained in:
Jonathan G Rennison
2020-01-06 18:45:51 +00:00
parent 7afa667e66 5b52f25902
commit 7960db35f2
281 changed files with 2714 additions and 2467 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/plans_gui.cpp
View File

@@ -119,8 +119,7 @@ struct PlansWindow : Window {
}
break;
case WID_PLN_HIDE_ALL: {
Plan *p;
FOR_ALL_PLANS(p) {
for (Plan *p : Plan::Iterate()) {
if (p->IsListable()) p->SetVisibility(false);
}
this->SetWidgetDirty(WID_PLN_LIST);
@@ -137,8 +136,7 @@ struct PlansWindow : Window {
}
case WID_PLN_SHOW_ALL: {
Plan *p;
FOR_ALL_PLANS(p) {
for (Plan *p : Plan::Iterate()) {
if (p->IsListable()) p->SetVisibility(true);
}
this->SetWidgetDirty(WID_PLN_LIST);
@@ -206,8 +204,7 @@ struct PlansWindow : Window {
bool AllPlansHidden() const
{
Plan *p;
FOR_ALL_PLANS(p) {
for (Plan *p : Plan::Iterate()) {
if (p->IsVisible()) return false;
}
return true;
@@ -332,8 +329,7 @@ struct PlansWindow : Window {
int sbcnt = 0;
this->list.clear();
Plan *p;
FOR_ALL_PLANS(p) {
for (Plan *p : Plan::Iterate()) {
if (!p->IsListable()) continue;
ListItem li;