Merge bac9bf93bc into 8675d7b498

Update: Translations from eints
chinese (simplified): 5 changes by WenSimEHRP
2025-07-29 04:48:31 +00:00 · 2025-07-29 04:48:22 +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/simplified_chinese.txt
+++ b/src/lang/simplified_chinese.txt
@ -634,8 +634,11 @@ STR_GRAPH_CARGO_TOOLTIP_DISABLE_ALL                             :{BLACK}在货
 STR_GRAPH_CARGO_PAYMENT_TOGGLE_CARGO                            :{BLACK}切换显示货物
 STR_GRAPH_CARGO_PAYMENT_CARGO                                   :{TINY_FONT}{BLACK}{STRING}

+STR_GRAPH_INDUSTRY_CAPTION                                      :{WHITE}{INDUSTRY} - 货物历史
 STR_GRAPH_INDUSTRY_RANGE_PRODUCED                               :已生产
 STR_GRAPH_INDUSTRY_RANGE_TRANSPORTED                            :已运输
+STR_GRAPH_INDUSTRY_RANGE_DELIVERED                              :已送抵
+STR_GRAPH_INDUSTRY_RANGE_WAITING                                :库存

 STR_GRAPH_PERFORMANCE_DETAIL_TOOLTIP                            :{BLACK}查看详细数据

@ -4023,6 +4026,8 @@ STR_INDUSTRY_VIEW_PRODUCTION_LAST_MONTH_TITLE                   :{BLACK}上月
 STR_INDUSTRY_VIEW_PRODUCTION_LAST_MINUTE_TITLE                  :{BLACK}上分钟产量：
 STR_INDUSTRY_VIEW_TRANSPORTED                                   :{YELLOW}{CARGO_LONG}{STRING}{BLACK}（已运输 {COMMA}%）
 STR_INDUSTRY_VIEW_LOCATION_TOOLTIP                              :{BLACK}将屏幕中心移动到当前工业的位置。按住 <Ctrl> 键点选会在新视点中显示工业位置
+STR_INDUSTRY_VIEW_CARGO_GRAPH                                   :{BLACK}货物图表
+STR_INDUSTRY_VIEW_CARGO_GRAPH_TOOLTIP                           :{BLACK}显示工业货物历史图表
 STR_INDUSTRY_VIEW_PRODUCTION_LEVEL                              :{BLACK}生产等级：{YELLOW}{COMMA}%
 STR_INDUSTRY_VIEW_INDUSTRY_ANNOUNCED_CLOSURE                    :{YELLOW}此工业已经宣布即刻停业倒闭！

--- 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	d337573f3e	Merge `bac9bf93bc` into `8675d7b498`	2025-07-29 04:48:31 +00:00
translators	8675d7b498	Update: Translations from eints chinese (simplified): 5 changes by WenSimEHRP	2025-07-29 04:48:22 +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