From 13d2d11fa8f2696611ddec0a4d8f31a831a86a25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Guilloux?= Date: Mon, 5 Dec 2022 12:46:46 +0100 Subject: [PATCH 1/5] Fix #10216: Initialise RoadStop caches before using them and don't try to teleport crashed vehicles (#10217) --- src/saveload/afterload.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/saveload/afterload.cpp b/src/saveload/afterload.cpp index 6fbc2ac9a2..3426a88010 100644 --- a/src/saveload/afterload.cpp +++ b/src/saveload/afterload.cpp @@ -3155,6 +3155,9 @@ bool AfterLoadGame() } } + /* Road stops is 'only' updating some caches, but they are needed for PF calls in SLV_MULTITRACK_LEVEL_CROSSINGS teleporting. */ + AfterLoadRoadStops(); + /* Road vehicles stopped on multitrack level crossings need teleporting to a depot * to avoid crashing into the side of the train they're waiting for. */ if (IsSavegameVersionBefore(SLV_MULTITRACK_LEVEL_CROSSINGS)) { @@ -3166,6 +3169,9 @@ bool AfterLoadGame() /* Ignore moving vehicles. */ if (rv->cur_speed > 0) continue; + /* Ignore crashed vehicles. */ + if (rv->vehstatus & VS_CRASHED) continue; + /* Ignore vehicles not on level crossings. */ TileIndex cur_tile = rv->tile; if (!IsLevelCrossingTile(cur_tile)) continue; @@ -3207,8 +3213,6 @@ bool AfterLoadGame() for (Station *st : Station::Iterate()) UpdateStationAcceptance(st, false); } - /* Road stops is 'only' updating some caches */ - AfterLoadRoadStops(); AfterLoadLabelMaps(); AfterLoadCompanyStats(); AfterLoadStoryBook(); From 53b827c46052601e5c5309e623eb4eb568d65813 Mon Sep 17 00:00:00 2001 From: PeterN Date: Mon, 5 Dec 2022 17:57:27 +0000 Subject: [PATCH 2/5] Fix: Maximum space for engine preview image was never scaled. (#10219) --- src/engine_gui.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/engine_gui.cpp b/src/engine_gui.cpp index 35ba1d1582..452b9b6eaa 100644 --- a/src/engine_gui.cpp +++ b/src/engine_gui.cpp @@ -24,6 +24,7 @@ #include "ship.h" #include "aircraft.h" #include "engine_cmd.h" +#include "zoom_func.h" #include "widgets/engine_widget.h" @@ -94,7 +95,7 @@ struct EnginePreviewWindow : Window { case VEH_SHIP: GetShipSpriteSize( engine, x, y, x_offs, y_offs, image_type); break; case VEH_AIRCRAFT: GetAircraftSpriteSize(engine, x, y, x_offs, y_offs, image_type); break; } - this->vehicle_space = std::max(40, y - y_offs); + this->vehicle_space = std::max(ScaleSpriteTrad(40), y - y_offs); size->width = std::max(size->width, x - x_offs); SetDParam(0, GetEngineCategoryName(engine)); From 985f48706520b560801ddd83c38c8c65f4904597 Mon Sep 17 00:00:00 2001 From: translators Date: Mon, 5 Dec 2022 18:43:08 +0000 Subject: [PATCH 3/5] Update: Translations from eints spanish: 1 change by MontyMontana --- src/lang/spanish.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lang/spanish.txt b/src/lang/spanish.txt index 59f51abdd3..fdb95bfcb5 100644 --- a/src/lang/spanish.txt +++ b/src/lang/spanish.txt @@ -2592,7 +2592,7 @@ STR_TRANSPARENT_LOADING_TOOLTIP :{BLACK}Ajustar STR_TRANSPARENT_INVISIBLE_TOOLTIP :{BLACK}Establece los objetos como invisibles en vez de transparentes # Linkgraph legend window -STR_LINKGRAPH_LEGEND_CAPTION :{BLACK}Leyenda de Flujos de Carga +STR_LINKGRAPH_LEGEND_CAPTION :{BLACK}Leyenda de flujos de carga STR_LINKGRAPH_LEGEND_ALL :{BLACK}Todas STR_LINKGRAPH_LEGEND_NONE :{BLACK}Ninguna STR_LINKGRAPH_LEGEND_SELECT_COMPANIES :{BLACK}Seleccione las empresas a mostrar From d5fc423793935c5411b71e680fa177b5ba58bd0e Mon Sep 17 00:00:00 2001 From: Michael Lutz Date: Wed, 7 Dec 2022 23:18:44 +0100 Subject: [PATCH 4/5] Fix #10223: Crash when vehicle cloning fails on order cloning. --- src/vehicle_cmd.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/vehicle_cmd.cpp b/src/vehicle_cmd.cpp index 373a92cdbf..ed7cf56689 100644 --- a/src/vehicle_cmd.cpp +++ b/src/vehicle_cmd.cpp @@ -958,7 +958,7 @@ std::tuple CmdCloneVehicle(DoCommandFlag flags, TileInde if (result.Failed()) { /* The vehicle has already been bought, so now it must be sold again. */ Command::Do(flags, w_front->index, true, false, INVALID_CLIENT_ID); - return { total_cost, INVALID_VEHICLE }; + return { result, INVALID_VEHICLE }; } /* Now clone the vehicle's name, if it has one. */ From 5cef40591bd8e13fbdcde83d1b915b8788a45de1 Mon Sep 17 00:00:00 2001 From: translators Date: Thu, 8 Dec 2022 18:43:04 +0000 Subject: [PATCH 5/5] Update: Translations from eints slovak: 2 changes by legitalk --- src/lang/slovak.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lang/slovak.txt b/src/lang/slovak.txt index 90a2fd7564..11bca4d72e 100644 --- a/src/lang/slovak.txt +++ b/src/lang/slovak.txt @@ -1464,7 +1464,7 @@ STR_CONFIG_SETTING_ORDER_REVIEW_OFF :Nie STR_CONFIG_SETTING_ORDER_REVIEW_EXDEPOT :Áno, okrem zastavených vozidiel STR_CONFIG_SETTING_ORDER_REVIEW_ON :U všetkých vozidiel -STR_CONFIG_SETTING_WARN_INCOME_LESS :Varovať, ak je vozidlo stratové: {STRING} +STR_CONFIG_SETTING_WARN_INCOME_LESS :Varovať ak je vozidlo stratové: {STRING} STR_CONFIG_SETTING_WARN_INCOME_LESS_HELPTEXT :Ak je zapnuté, zobrazí sa správa ak vozidlo nevykázalo žiaden zisk za predošlý rok. STR_CONFIG_SETTING_NEVER_EXPIRE_VEHICLES :Nikdy neprestať s výrobou starých vozidiel: {STRING} @@ -1875,7 +1875,7 @@ STR_CONFIG_SETTING_MIN_YEARS_FOR_SHARES :Minimálny vek STR_CONFIG_SETTING_MIN_YEARS_FOR_SHARES_HELPTEXT :Určuje minimálny vek spoločnosti na to, aby od nej mohli ostatné spoločnosti kupovať a predavať podiely. STR_CONFIG_SETTING_FEEDER_PAYMENT_SHARE :Percentáž zisku na zaplatenie podávacieho systému: {STRING} -STR_CONFIG_SETTING_FEEDER_PAYMENT_SHARE_HELPTEXT :Percento príjmov dať na strednú ´nohu´ vo feeder systémoch, získate väčšiu kontrolu nad príjmamy +STR_CONFIG_SETTING_FEEDER_PAYMENT_SHARE_HELPTEXT :Percento príjmov dať na strednú ´nohu´ vo feeder systémoch, získate väčšiu kontrolu nad príjmami STR_CONFIG_SETTING_DRAG_SIGNALS_DENSITY :Pri ťahaní, umiestni návestidlo každé: {STRING} STR_CONFIG_SETTING_DRAG_SIGNALS_DENSITY_HELPTEXT :Nastaviť vzdialenosť návestidiel, akou budú umiestnené na trati po najbližšiu prekážku (návestidlo, križovatku), pri stavbe ťahaním