From 9a7618aeb6e8c2d199b3bd1ce4b9f2cbdd155db4 Mon Sep 17 00:00:00 2001 From: frosch Date: Thu, 9 Jun 2016 19:04:53 +0000 Subject: [PATCH 1/2] (svn r27598) -Fix: Company 0 could accept engine previews before they were offered. --- src/engine.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/engine.cpp b/src/engine.cpp index 9f9abcde0e..56fab3e65f 100644 --- a/src/engine.cpp +++ b/src/engine.cpp @@ -85,6 +85,7 @@ Engine::Engine(VehicleType type, EngineID base) this->type = type; this->grf_prop.local_id = base; this->list_position = base; + this->preview_company = INVALID_COMPANY; /* Check if this base engine is within the original engine data range */ if (base >= _engine_counts[type]) { @@ -902,7 +903,7 @@ CommandCost CmdSetVehicleVisibility(TileIndex tile, DoCommandFlag flags, uint32 CommandCost CmdWantEnginePreview(TileIndex tile, DoCommandFlag flags, uint32 p1, uint32 p2, const char *text) { Engine *e = Engine::GetIfValid(p1); - if (e == NULL || e->preview_company != _current_company) return CMD_ERROR; + if (e == NULL || !(e->flags & ENGINE_EXCLUSIVE_PREVIEW) || e->preview_company != _current_company) return CMD_ERROR; if (flags & DC_EXEC) AcceptEnginePreview(p1, _current_company); From 1234b7d0f827d74bed2577c790e2c8df4c8904df Mon Sep 17 00:00:00 2001 From: translators Date: Sun, 12 Jun 2016 17:45:36 +0000 Subject: [PATCH 2/2] (svn r27599) -Update from Eints: persian: 2 changes by rkarimabadi --- src/lang/unfinished/persian.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/lang/unfinished/persian.txt b/src/lang/unfinished/persian.txt index 1d36e8a47a..6e5335f7d1 100644 --- a/src/lang/unfinished/persian.txt +++ b/src/lang/unfinished/persian.txt @@ -970,6 +970,7 @@ STR_GAME_OPTIONS_RESOLUTION_TOOLTIP :{BLACK}وضوح STR_GAME_OPTIONS_RESOLUTION_OTHER :دیگر +STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_2X_ZOOM :دو برابر STR_GAME_OPTIONS_BASE_GRF :{BLACK}بسته گرافیک پایه STR_GAME_OPTIONS_BASE_GRF_TOOLTIP :{BLACK}بسته گرافیک پایه را انتخاب کنید @@ -3071,6 +3072,7 @@ STR_REPLACE_VEHICLE_AVAILABLE_VEHICLES_TOOLTIP :{BLACK} ستو STR_REPLACE_HELP_STOP_BUTTON :{BLACK}برای توقف جایگزین کردن برای نوع انتخاب شده در سمت چپ کلیک کنید +STR_REPLACE_ELRAIL_VEHICLES :وسایل نقلیه ریلی برقی # Vehicle view