Archives
/
OpenTTD-patches
mirror of https://github.com/JGRennison/OpenTTD-patches
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove "Disable vehicle image update" setting

Browse Source
pull/261/head
Jonathan G Rennison 3 years ago
parent 7ab6ab7400
commit 3e8ee4f49f
9 changed files with 3 additions and 32 deletions
Show Stats Download Patch File Download Diff File

2
src/ground_vehicle.hpp
Unescape Escape View File

@ -405,7 +405,7 @@ struct GroundVehicle : public SpecializedVehicle<T, Type> {
if (this->cur_speed != this->gcache.last_speed) {
SetWindowWidgetDirty(WC_VEHICLE_VIEW, this->index, WID_VV_START_STOP);
this->gcache.last_speed = this->cur_speed;
if (HasBit(this->vcache.cached_veh_flags, VCF_REDRAW_ON_SPEED_CHANGE) && !_settings_client.gui.disable_vehicle_image_update) {
if (HasBit(this->vcache.cached_veh_flags, VCF_REDRAW_ON_SPEED_CHANGE)) {
this->RefreshImageCacheOfChain();
}
}

3
src/lang/english.txt
Unescape Escape View File

@ -1442,9 +1442,6 @@ STR_CONFIG_SETTING_LINKGRAPH_COLOURS_GREEN_TO_BLUE :Green to blue
STR_CONFIG_SETTING_LINKGRAPH_COLOURS_GREY_TO_RED :Grey to red
STR_CONFIG_SETTING_LINKGRAPH_COLOURS_GREYSCALE :Greyscale
STR_CONFIG_SETTING_DISABLE_VEHICLE_IMAGE_UPDATE :Disable vehicle image update: {STRING2}
STR_CONFIG_SETTING_DISABLE_VEHICLE_IMAGE_UPDATE_HELPTEXT :When enabled, prevent NewGRF vehicles from continuously updating the sprite used to draw vehicles as the vehicle moves. This can be used to prevent performance problems when there are many vehicles from computationally expensive NewGRFs.
STR_CONFIG_SETTING_VEHICLE_NAMES :Vehicle names: {STRING2}
STR_CONFIG_SETTING_VEHICLE_NAMES_HELPTEXT :Set the naming scheme used for vehicle names. This does not apply to vehicles which have a custom name.
STR_CONFIG_SETTING_VEHICLE_NAMES_TRADITIONAL :Traditional

3
src/lang/german.txt
Unescape Escape View File

@ -1425,9 +1425,6 @@ STR_CONFIG_SETTING_LINKGRAPH_COLOURS_GREEN_TO_BLUE :Grün nach Blau
STR_CONFIG_SETTING_LINKGRAPH_COLOURS_GREY_TO_RED :Grau nach Rot
STR_CONFIG_SETTING_LINKGRAPH_COLOURS_GREYSCALE :Graustufen
STR_CONFIG_SETTING_DISABLE_VEHICLE_IMAGE_UPDATE :Deaktiviere Update des Fahrzeugbilds: {STRING}
STR_CONFIG_SETTING_DISABLE_VEHICLE_IMAGE_UPDATE_HELPTEXT :Falls aktiviert, werden NewGRF-Fahrzeuge daran gehindert kontinuierlich das Fahrzeug-Sprite zum Zeichnen des Fahrzeugs zu updaten, während sich das Fahrzeug bewegt. Dies kann benutzt werden, um die Performance bei der Verwendung vieler Fahrzeuge aus berechnungsintensiven NewGRFs zu verbessern.
STR_CONFIG_SETTING_ADV_SIG_BRIDGE_TUN_MODES :Aktiviere erweiterten Modus der Signale auf Brücken und in Tunneln: {STRING}
STR_CONFIG_SETTING_ADV_SIG_BRIDGE_TUN_MODES_HELPTEXT :Aktiviert die Benutzung des erweiterten Modus zur Emulation von Signalen auf Brücken und in Tunneln. Falls deaktiviert, können Brücken/Tunnel, die sich nicht bereits im erweiterten Modus befinden, nicht in den erweiterten Modus versetzt werden. Andere Spieler können dennoch diese Option setzen und den erweiterten Modus verwenden.

3
src/lang/korean.txt
Unescape Escape View File

@ -1442,9 +1442,6 @@ STR_CONFIG_SETTING_LINKGRAPH_COLOURS_GREEN_TO_BLUE :초록색 / 파
STR_CONFIG_SETTING_LINKGRAPH_COLOURS_GREY_TO_RED :회색 / 빨간색
STR_CONFIG_SETTING_LINKGRAPH_COLOURS_GREYSCALE :흑백
STR_CONFIG_SETTING_DISABLE_VEHICLE_IMAGE_UPDATE :차량 이미지 업데이트 비활성화: {STRING}
STR_CONFIG_SETTING_DISABLE_VEHICLE_IMAGE_UPDATE_HELPTEXT :이 설정을 켜면, NewGRF 차량이 움직임에 따라 그래픽을 지속적으로 업데이트하는 것을 방지합니다. 이 설정을 통해 계산에 부하가 많이 걸리는 NewGRF를 많이 사용했을 때 성능 문제가 발생하는 것을 방지할 수 있습니다.
STR_CONFIG_SETTING_VEHICLE_NAMES :차량 이름: {STRING}
STR_CONFIG_SETTING_VEHICLE_NAMES_HELPTEXT :기본적으로 사용할 차량 이름입니다. 직접 이름을 지정한 차량에는 적용되지 않습니다.
STR_CONFIG_SETTING_VEHICLE_NAMES_TRADITIONAL :이전 방식

8
src/settings.cpp
Unescape Escape View File

@ -1513,14 +1513,6 @@ static bool UpdateLinkgraphColours(int32 p1)
return RedrawScreen(p1);
}
static bool InvalidateAllVehicleImageCaches(int32 p1)
{
for (Vehicle *v : Vehicle::Iterate()) {
v->InvalidateImageCache();
}
return true;
}
static bool ClimateThresholdModeChanged(int32 p1)
{
InvalidateWindowClassesData(WC_GENERATE_LANDSCAPE);

1
src/settings_gui.cpp
Unescape Escape View File

@ -1690,7 +1690,6 @@ static SettingsContainer &GetSettingsTree()
graphics->Add(new SettingEntry("gui.show_vehicle_route"));
graphics->Add(new SettingEntry("gui.dash_level_of_route_lines"));
graphics->Add(new SettingEntry("gui.show_restricted_signal_default"));
graphics->Add(new SettingEntry("gui.disable_vehicle_image_update"));
}
SettingsPage *sound = main->Add(new SettingsPage(STR_CONFIG_SETTING_SOUND));

1
src/settings_type.h
Unescape Escape View File

@ -218,7 +218,6 @@ struct GUISettings : public TimeSettings {
bool show_depot_sell_gui; ///< Show go to depot and sell in UI
bool open_vehicle_gui_clone_share; ///< Open vehicle GUI when share-cloning vehicle from depot GUI
uint8 linkgraph_colours; ///< linkgraph overlay colours
bool disable_vehicle_image_update; ///< Disable NewGRFs from continuously updating vehicle images
uint8 vehicle_names; ///< Vehicle naming scheme
bool shade_trees_on_slopes; ///< Shade trees on slopes

10
src/table/settings.ini
Unescape Escape View File

@ -60,7 +60,6 @@ static bool CheckYapfRailSignalPenalties(int32 p1);
static bool ViewportMapShowTunnelModeChanged(int32 p1);
static bool ViewportMapLandscapeModeChanged(int32 p1);
static bool UpdateLinkgraphColours(int32 p1);
static bool InvalidateAllVehicleImageCaches(int32 p1);
static bool ClimateThresholdModeChanged(int32 p1);
static bool UpdateClientName(int32 p1);
@ -5438,15 +5437,6 @@ strval = STR_CONFIG_SETTING_LINKGRAPH_COLOURS_GREEN_TO_RED
proc = UpdateLinkgraphColours
cat = SC_BASIC
[SDTC_BOOL]
var = gui.disable_vehicle_image_update
flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
def = false
str = STR_CONFIG_SETTING_DISABLE_VEHICLE_IMAGE_UPDATE
strhelp = STR_CONFIG_SETTING_DISABLE_VEHICLE_IMAGE_UPDATE_HELPTEXT
proc = InvalidateAllVehicleImageCaches
cat = SC_EXPERT
[SDTC_VAR]
var = gui.vehicle_names
type = SLE_UINT8

4
src/vehicle_base.h
Unescape Escape View File

@ -1367,7 +1367,7 @@ struct SpecializedVehicle : public Vehicle {
((T *)this)->T::GetImage(current_direction, EIT_ON_MAP, &seq);
if (EXPECTED_TYPE == VEH_TRAIN || EXPECTED_TYPE == VEH_ROAD) {
ClrBit(this->vcache.cached_veh_flags, VCF_IMAGE_REFRESH);
SB(this->vcache.cached_veh_flags, VCF_IMAGE_REFRESH_NEXT, 1, (_sprite_group_resolve_check_veh_check || _settings_client.gui.disable_vehicle_image_update) ? 0 : 1);
SB(this->vcache.cached_veh_flags, VCF_IMAGE_REFRESH_NEXT, 1, _sprite_group_resolve_check_veh_check ? 0 : 1);
if (unlikely(!_sprite_group_resolve_check_veh_curvature_check)) {
SetBit(this->vcache.cached_veh_flags, VCF_IMAGE_CURVATURE);
this->vcache.cached_image_curvature = get_vehicle_curvature();
@ -1375,7 +1375,7 @@ struct SpecializedVehicle : public Vehicle {
_sprite_group_resolve_check_veh_curvature_check = false;
this->cur_image_valid_dir = current_direction;
} else {
this->cur_image_valid_dir = (_sprite_group_resolve_check_veh_check || _settings_client.gui.disable_vehicle_image_update) ? current_direction : INVALID_DIR;
this->cur_image_valid_dir = _sprite_group_resolve_check_veh_check ? current_direction : INVALID_DIR;
}
_sprite_group_resolve_check_veh_check = false;
if (force_update || this->sprite_seq != seq) {

Write Preview
Loading…
Cancel
Save