Merge bac9bf93bc into 7eb042feac

Update: Translations from eints
english (us): 5 changes by 2TallTyler
2025-07-24 04:46:47 +00:00 · 2025-07-24 04:46:38 +00:00 · 2025-02-05 06:40:50 +01:00 · 2025-02-04 20:47:51 +01:00
2 changed files with 10 additions and 2 deletions
--- a/src/lang/english_US.txt
+++ b/src/lang/english_US.txt
@ -634,8 +634,11 @@ STR_GRAPH_CARGO_TOOLTIP_DISABLE_ALL                             :{BLACK}Display
 STR_GRAPH_CARGO_PAYMENT_TOGGLE_CARGO                            :{BLACK}Toggle graph of this cargo type
 STR_GRAPH_CARGO_PAYMENT_CARGO                                   :{TINY_FONT}{BLACK}{STRING}

+STR_GRAPH_INDUSTRY_CAPTION                                      :{WHITE}{INDUSTRY} - Cargo History
 STR_GRAPH_INDUSTRY_RANGE_PRODUCED                               :Produced
 STR_GRAPH_INDUSTRY_RANGE_TRANSPORTED                            :Transported
+STR_GRAPH_INDUSTRY_RANGE_DELIVERED                              :Delivered
+STR_GRAPH_INDUSTRY_RANGE_WAITING                                :Waiting

 STR_GRAPH_PERFORMANCE_DETAIL_TOOLTIP                            :{BLACK}Show detailed performance ratings

@ -4023,6 +4026,8 @@ STR_INDUSTRY_VIEW_PRODUCTION_LAST_MONTH_TITLE                   :{BLACK}Producti
 STR_INDUSTRY_VIEW_PRODUCTION_LAST_MINUTE_TITLE                  :{BLACK}Production last minute:
 STR_INDUSTRY_VIEW_TRANSPORTED                                   :{YELLOW}{CARGO_LONG}{STRING}{BLACK} ({COMMA}% transported)
 STR_INDUSTRY_VIEW_LOCATION_TOOLTIP                              :{BLACK}Center the main view on industry location. Ctrl+Click to open a new viewport on industry location
+STR_INDUSTRY_VIEW_CARGO_GRAPH                                   :{BLACK}Cargo Graph
+STR_INDUSTRY_VIEW_CARGO_GRAPH_TOOLTIP                           :{BLACK}Shows the graph of industry cargo history
 STR_INDUSTRY_VIEW_PRODUCTION_LEVEL                              :{BLACK}Production level: {YELLOW}{COMMA}%
 STR_INDUSTRY_VIEW_INDUSTRY_ANNOUNCED_CLOSURE                    :{YELLOW}The industry has announced imminent closure!

--- a/src/video/null_v.cpp
+++ b/src/video/null_v.cpp
@ -50,8 +50,11 @@ void VideoDriver_Null::MainLoop()
 {
 	uint i;

-	for (i = 0; i < this->ticks; i++) {
-		::GameLoop();
+	for (i = 0; i < this->ticks && ! _exit_game; i++) {
+		{
+			std::lock_guard<std::mutex> lock(this->game_state_mutex);
+			::GameLoop();
+		}
 		::InputLoop();
 		::UpdateWindows();
 	}
Author	SHA1	Message	Date
Matthias Urlichs	21efa4da12	Merge `bac9bf93bc` into `7eb042feac`	2025-07-24 04:46:47 +00:00
translators	7eb042feac	Update: Translations from eints english (us): 5 changes by 2TallTyler	2025-07-24 04:46:38 +00:00
Matthias Urlichs	bac9bf93bc	Codefix: Null video driver: take the game lock The game loop must run with the game lock held.	2025-02-05 06:40:50 +01:00
Matthias Urlichs	abdea49d24	Codechange: Null video driver: End on game exit The Null driver now exits when the game ends. It also gains the ability to run for an unlimited number of ticks (using '-v null:ticks=0').	2025-02-04 20:47:51 +01:00