Commit Graph

54215 Commits

Author SHA1 Message Date
Jonathan G Rennison
d3e1c2695e Fix freight weight multiplier not being applied in train build window 2023-01-07 12:59:09 +00:00
Jonathan G Rennison
9cff3666ae Fix artic engines with no capacity on leading part in build window
Engines were being shown as not having any capacity overall
2023-01-07 00:26:04 +00:00
Jonathan G Rennison
e816c2416a Debug: Show more road vehicle engine fields in debug window 2023-01-07 00:22:39 +00:00
Jonathan G Rennison
62d524eaef Merge branch 'master' into jgrpp
# Conflicts:
#	src/saveload/station_sl.cpp
#	src/saveload/town_sl.cpp
#	src/spritecache.cpp
#	src/timetable_gui.cpp
2023-01-06 20:02:04 +00:00
translators
29af0f8c7b Update: Translations from eints
swedish: 18 changes by joeax910
chinese (simplified): 2 changes by HansKaffee
romanian: 3 changes by ALEX11BR
slovak: 15 changes by legitalk
tamil: 21 changes by Aswn
2023-01-06 18:46:19 +00:00
Rubidium
0251786f46 Fix: virtual call from constructor
That fills an instance variable that is only read from the Game Options window
and that is overwritten when the video driver is started. Since you cannot get
into the Game Options window without starting the video driver, it is just
pointless and wrong code that would never be noticed by the end user.
2023-01-06 19:34:35 +01:00
Rubidium
c1ff471c77 Fix: bad oddness checks
Modulo on a signed number returns negative values for negative values, so
i % 2 == 1 will only return true for positive odd numbers, whereas i % 2 != 0
returns true for both positive and negative odd numbers.
2023-01-06 19:34:35 +01:00
Rubidium
f7af9a299a Codechange: prevent suspicious pointer scaling 2023-01-06 19:34:35 +01:00
Rubidium
170f37d07f Codechange: silence some potentially uninitialized local variable errors
In these cases technically they are false positives, however dismissing the
alerts when the underlying code may make them true positives does not seem
like the safest solution.
2023-01-06 19:34:35 +01:00
Rubidium
496ec1f012 Fix: use reference and array indexing to prevent suspicious pointer scaling 2023-01-06 19:34:35 +01:00
Rubidium
fbd0f5ad7d Fix: inconsistent allocation error handling
Mix-and-matching std::bad_alloc exception handling with nullptr checks
2023-01-06 19:34:35 +01:00
Rubidium
3c54344825 Fix: comparison of narrow type with wide type in loop condition
Technically this can't be triggered with the currently returned values though.
2023-01-06 19:34:35 +01:00
Charles Pigott
e00996a18a
Change: Big UFO disaster targets current location of a random train (#10290) 2023-01-06 13:05:09 +00:00
PeterN
1b1aa682a6
Fix: Don't assume engclass 2 should be elrail. (#10315)
When disabling/enabling elrail, there is an assumption that `engclass` of 2
means the engine will run on elrail. While this holds for default engines,
NewGRFs can do other things.

To resolve this we store the intended railtype so that toggling elrail will
restore to the correct type.
2023-01-06 00:44:57 +00:00
Jonathan G Rennison
0310fb0cdc Merge branch 'master' into jgrpp
# Conflicts:
#	src/lang/czech.txt
#	src/lang/galician.txt
#	src/lang/german.txt
#	src/order_cmd.cpp
#	src/saveload/afterload.cpp
#	src/ship.h
#	src/vehicle.cpp
2023-01-05 23:45:34 +00:00
Loïc Guilloux
8f350c9ae6
Fix: [Actions] preview_build failure due to git upgrade (#10323) 2023-01-05 23:25:45 +00:00
Michael Lutz
c98a5c37d3 Remove: SmallMatrix be gone.
(cherry picked from commit 6dd8a4d670f921ee685d1a6326d304da6e9fc245)
2023-01-05 20:15:50 +00:00
Jonathan G Rennison
8f123589ec Linkgraph: Use sparse storage format for edge annotations
Copy relevant parts of base edge into edge annotation
2023-01-05 20:15:50 +00:00
Rubidium
51049946d1 Fix: prevent corrupted GRF files to allocate stupid amounts of memory 2023-01-05 20:11:59 +01:00
translators
58068883f8 Update: Translations from eints
swedish: 33 changes by joeax910
arabic (egypt): 11 changes by AviationGamerX
luxembourgish: 3 changes by Gubius
greek: 85 changes by SStelioss
indonesian: 55 changes by indrabagus, 20 changes by K4smun1
serbian: 527 changes by nkrs
latvian: 82 changes by lexuslatvia
polish: 2 changes by pAter-exe
2023-01-05 18:48:43 +00:00
Jonathan G Rennison
55473bc730 Linkgraph: Split demand annotations from edge flow annotations
Use sparse storage format for demand annotations
2023-01-05 02:48:07 +00:00
Rubidium
752cd5c0da Cleanup 84b71f7: remove G5 detector as it's not referenced anymore
The last supported Mac OS X for G5 is 10.5.8 and support for < 10.7 has already been removed.
2023-01-04 22:42:23 +01:00
Rubidium
375a5b8e3f Codechange: refactor FindClosestDepot to not use pointers, but return a struct 2023-01-04 22:30:48 +01:00
Jonathan G Rennison
9bc5f69a19 Debug: Deduplicate child groups for randomised sprite groups in sprite dump 2023-01-04 19:47:34 +00:00
Jonathan G Rennison
4275c8e96b VarAction2: Ignore callback failure groups when finding callback results 2023-01-04 19:42:30 +00:00
translators
b3907b1359 Update: Translations from eints
swedish: 39 changes by DonaldDuck313, 9 changes by joeax910
chinese (traditional): 62 changes by wpi3
greek: 8 changes by SStelioss
indonesian: 29 changes by indrabagus
serbian: 528 changes by nkrs
ukrainian: 82 changes by StepanIvasyn
turkish: 4 changes by jnmbk
french: 19 changes by glx22
2023-01-04 18:45:02 +00:00
Jonathan G Rennison
3b9e5a9a2e Adjust help text for the go to depot and sell setting
See: #470
2023-01-04 18:28:49 +00:00
Jonathan G Rennison
4b0d4a85fb Remove modified behaviour of depot button when ctrl not pressed and go to depot and sell enabled
See: #470
2023-01-04 18:17:18 +00:00
Rubidium
a0694759a1 Fix: do not allow more palette colours than there are indices for the colours
Or: do not pass unchecked size from BMP file into memory allocation
2023-01-04 18:36:49 +01:00
translators
3af2c7fff6 Update: Translations from eints
swedish: 9 changes by joeax910
norwegian (bokmal): 7 changes by buzzCraft
chinese (traditional): 48 changes by wpi3
galician: 98 changes by pvillaverde
vietnamese: 13 changes by myquartz
czech: 42 changes by vladoschreiner, 40 changes by PatrikSamuelTauchim, 19 changes by adamek0202, 3 changes by LubosKolouch
chinese (simplified): 52 changes by HansKaffee
luxembourgish: 148 changes by phreeze83
hungarian: 50 changes by PstasDev, 23 changes by baliball
german: 69 changes by Wuzzy2, 4 changes by Luensche
romanian: 3 changes by kneekoo
ukrainian: 45 changes by StepanIvasyn
catalan: 12 changes by J0anJosep
turkish: 9 changes by Anceph
french: 1 change by Athozus
portuguese (brazilian): 9 changes by ericandradex
2023-01-03 18:45:43 +00:00
Jonathan G Rennison
760cbcbb8b Merge branch 'master' into jgrpp
# Conflicts:
#	src/blitter/32bpp_anim.hpp
#	src/blitter/32bpp_base.hpp
#	src/blitter/8bpp_base.hpp
#	src/blitter/null.hpp
#	src/cheat_gui.cpp
#	src/gfx.cpp
#	src/linkgraph/linkgraph.cpp
#	src/spriteloader/grf.cpp
#	src/station_cmd.cpp
2023-01-03 11:40:02 +00:00
Jonathan G Rennison
ca11c66cb8 VarAction2: Allow DSE with rail stations 2023-01-03 03:57:42 +00:00
Jonathan G Rennison
381b2b536d VarAction2: Implement register tracking for rail station adv tile layouts 2023-01-03 03:57:42 +00:00
Jonathan G Rennison
4b51a3eda8 VarAction2: Mark applicable rail station variables as expensive 2023-01-03 03:55:51 +00:00
Jonathan G Rennison
96f790fc7d Debug: Show rail station tile layouts in debug window 2023-01-03 03:55:51 +00:00
Jonathan G Rennison
6a7cad1b47 Add NewGRFClass helper method for whether class ID is valid (for iteration) 2023-01-03 03:55:51 +00:00
Jonathan G Rennison
417416d19b Add NewGRFClass helper method for whether any UI classes available 2023-01-03 03:55:51 +00:00
Patric Stout
1fb101eabb
Codechange: address CodeQL issue "Multiplication result converted to larger type" (#10306)
Most are very unlikely to ever be triggered in our codebase; two
stand out: linkgraph and money cheat. Those, potentially, could
wrap earlier than expected.
2023-01-02 20:30:02 +00:00
Jonathan G Rennison
5e76e6fb07 MacOS: Add workaround for std::variant 2023-01-02 19:15:37 +00:00
translators
fcbe390353 Update: Translations from eints
dutch: 10 changes by Afoklala
polish: 33 changes by pAter-exe
2023-01-02 18:46:20 +00:00
Jonathan G Rennison
24b744f7c8 Merge branch 'master' into jgrpp
# Conflicts:
#	bin/ai/CMakeLists.txt
#	bin/game/CMakeLists.txt
#	src/saveload/saveload.h
2023-01-02 01:23:36 +00:00
Loïc Guilloux
91ca088065
Fix #10304, fe30f66: [Scripts] Don't start GS in intro (#10305) 2023-01-02 02:13:16 +01:00
Jonathan G Rennison
b8c7a0dd20 Add per-town override to disable town growth 2023-01-01 22:13:03 +00:00
Michael Lutz
150f05dc15
Change: Heading for 14 now. (#10302) 2023-01-01 22:52:23 +01:00
Jonathan G Rennison
42891a6d9d Fix allowed to build level crossings string 2023-01-01 21:36:36 +00:00
Jonathan G Rennison
1a5b485b41 Road stops: Use a struct for road stop tile data 2022-12-31 22:51:54 +00:00
Jonathan G Rennison
2c65b050e4 Saveload: Add SLEG_CONDVARVEC macros 2022-12-31 21:24:58 +00:00
Jonathan G Rennison
a1f6aaa58f Merge branch 'master' into jgrpp
# Conflicts:
#	src/lang/korean.txt
#	src/saveload/afterload.cpp
#	src/saveload/ai_sl.cpp
#	src/saveload/game_sl.cpp
#	src/script/script_instance.cpp
2022-12-31 18:17:24 +00:00
Jonathan G Rennison
5bcc420af3 Infra sharing: Allow using mass start/stop buttons in other company depots
See: #469
2022-12-31 18:00:19 +00:00
Jonathan G Rennison
d6046086da Infra sharing: Disallow control over other company trains wholly in depots
See: #469
2022-12-31 17:55:32 +00:00