Merge branch 'master' into jgrpp
# Conflicts: # src/company_cmd.cpp # src/company_func.h # src/core/overflowsafe_type.hpp # src/engine.cpp # src/music/midifile.cpp # src/network/network_command.cpp # src/newgrf_debug_gui.cpp # src/newgrf_roadstop.h # src/newgrf_spritegroup.cpp # src/os/macosx/crashlog_osx.cpp # src/os/unix/crashlog_unix.cpp # src/pathfinder/yapf/yapf_common.hpp # src/road_gui.cpp # src/saveload/engine_sl.cpp # src/script/api/script_depotlist.cpp # src/script/api/script_roadtypelist.cpp # src/settings_gui.cpp # src/settings_type.h # src/strings.cpp # src/table/settings/game_settings.ini
This commit is contained in:
@@ -96,10 +96,10 @@ static void ShowCustCurrency();
|
||||
/** Window for displaying the textfile of a BaseSet. */
|
||||
template <class TBaseSet>
|
||||
struct BaseSetTextfileWindow : public TextfileWindow {
|
||||
const TBaseSet* baseset; ///< View the textfile of this BaseSet.
|
||||
const TBaseSet *baseset; ///< View the textfile of this BaseSet.
|
||||
StringID content_type; ///< STR_CONTENT_TYPE_xxx for title.
|
||||
|
||||
BaseSetTextfileWindow(TextfileType file_type, const TBaseSet* baseset, StringID content_type) : TextfileWindow(file_type), baseset(baseset), content_type(content_type)
|
||||
BaseSetTextfileWindow(TextfileType file_type, const TBaseSet *baseset, StringID content_type) : TextfileWindow(file_type), baseset(baseset), content_type(content_type)
|
||||
{
|
||||
const char *textfile = this->baseset->GetTextfile(file_type);
|
||||
this->LoadTextfile(textfile, BASESET_DIR);
|
||||
@@ -121,7 +121,7 @@ struct BaseSetTextfileWindow : public TextfileWindow {
|
||||
* @param content_type STR_CONTENT_TYPE_xxx for title.
|
||||
*/
|
||||
template <class TBaseSet>
|
||||
void ShowBaseSetTextfileWindow(TextfileType file_type, const TBaseSet* baseset, StringID content_type)
|
||||
void ShowBaseSetTextfileWindow(TextfileType file_type, const TBaseSet *baseset, StringID content_type)
|
||||
{
|
||||
CloseWindowById(WC_TEXTFILE, file_type);
|
||||
new BaseSetTextfileWindow<TBaseSet>(file_type, baseset, content_type);
|
||||
@@ -727,7 +727,7 @@ struct GameOptionsWindow : Window {
|
||||
case WID_GO_BASE_GRF_DROPDOWN:
|
||||
if (_game_mode == GM_MENU) {
|
||||
CloseWindowByClass(WC_GRF_PARAMETERS);
|
||||
auto* set = BaseGraphics::GetSet(index);
|
||||
auto set = BaseGraphics::GetSet(index);
|
||||
BaseGraphics::SetSet(set);
|
||||
this->reload = true;
|
||||
this->InvalidateData();
|
||||
@@ -736,7 +736,7 @@ struct GameOptionsWindow : Window {
|
||||
|
||||
case WID_GO_BASE_SFX_DROPDOWN:
|
||||
if (_game_mode == GM_MENU) {
|
||||
auto* set = BaseSounds::GetSet(index);
|
||||
auto set = BaseSounds::GetSet(index);
|
||||
BaseSounds::ini_set = set->name;
|
||||
BaseSounds::SetSet(set);
|
||||
this->reload = true;
|
||||
@@ -2291,6 +2291,7 @@ static SettingsContainer &GetSettingsTree()
|
||||
limitations->Add(new SettingEntry("construction.crossing_with_competitor"));
|
||||
limitations->Add(new SettingEntry("construction.convert_town_road_no_houses"));
|
||||
limitations->Add(new SettingEntry("vehicle.disable_elrails"));
|
||||
limitations->Add(new SettingEntry("order.station_length_loading_penalty"));
|
||||
limitations->Add(new SettingEntry("construction.maximum_signal_evaluations"));
|
||||
limitations->Add(new SettingEntry("construction.enable_build_river"));
|
||||
limitations->Add(new SettingEntry("construction.enable_remove_water"));
|
||||
|
Reference in New Issue
Block a user