Commit Graph

47948 Commits

Author SHA1 Message Date
Charles Pigott
10c8104e70 Fix 5db883f: Railtype bits were moved too late, leading to rails under bridges losing their type
(cherry picked from commit 63a7df027d)
2019-05-02 18:25:35 +01:00
Charles Pigott
e334f7db30 Fix #6507: Don't try to load invalid depots from older savegames
(cherry picked from commit d9f9a64389)
2019-05-02 18:21:13 +01:00
Charles Pigott
44911ec254 Fix: Crash when attempting to load old save game with GRFs set
GroupStatistics pool was not initialised before trying to delete vehicles (specifically, trams with no tram track)

(cherry picked from commit 9da1c5bb0b)
2019-05-02 18:20:46 +01:00
PeterN
9197926bca Fix #7165: Missed another 'Append() --> push_back()' replacement (#7548)
(cherry picked from commit 0ab6244f6b)
2019-05-02 18:20:26 +01:00
Jonathan G Rennison
0e5dfa42c3 Check order indexing and consistency in cache check 2019-05-02 03:05:07 +01:00
Jonathan G Rennison
51579be197 Fix compilation warnings in windows crashlog 2019-05-02 01:42:53 +01:00
Jonathan G Rennison
03d7edd828 Fix use of nullptr for HIMC type in video/win32_v.cpp 2019-05-02 01:36:12 +01:00
Jonathan G Rennison
028d2505fd Fix missing format specifier in windows crash log abort message 2019-05-02 01:30:07 +01:00
Jonathan G Rennison
5fe784f520 Remove incorrect CDECL declaration from SlotNameSorter 2019-05-02 01:27:08 +01:00
Jonathan G Rennison
842b2249ee Fix possible incorrect value of VCF_GV_ZERO_SLOPE_RESIST
In case where slope resistance becomes non-zero when up/down flag removed
2019-05-02 00:05:35 +01:00
Jonathan G Rennison
5d4f1b488d Fix false positive vehicle cache mismatch detection in CheckCaches 2019-05-02 00:03:12 +01:00
Jonathan G Rennison
799eb25bb5 Delete outdated MSVC project files 2019-05-02 00:02:27 +01:00
Jonathan G Rennison
cef359193a Add GRF details to NewGRF debug window 2019-05-01 20:57:59 +01:00
Jonathan G Rennison
1ee33c46ef Linkgraph: Allow overriding distribution mode on a per-cargo basis, in game 2019-05-01 20:57:59 +01:00
Jonathan G Rennison
e7a916d2ce Linkgraph: Add asymmetric: equal and nearest demand distribution modes 2019-05-01 20:57:59 +01:00
Jonathan G Rennison
79e49cf4a9 Setting: Add setting flag: no new game (in game use only) 2019-05-01 20:57:59 +01:00
Jonathan G Rennison
8b1ee39ace Setting: Add support for enum type settings 2019-05-01 19:03:00 +01:00
Jonathan G Rennison
f54f549632 Add SlXvCheckSpecialSavegameVersions constants to SaveLoadVersion enum 2019-04-28 13:21:05 +01:00
Jonathan G Rennison
f8e34838c6 Avoid -Wdynamic-class-memaccess warning on clang in CheckCaches() 2019-04-28 13:21:05 +01:00
Jonathan G Rennison
f331ae8f81 Progsig: Fix error return path in CmdModifySignalInstruction 2019-04-28 12:24:40 +01:00
Jonathan G Rennison
06463b8be0 Merge branch 'tracerestrict-sx' into jgrpp 2019-04-28 12:24:40 +01:00
Jonathan G Rennison
d47c083e00 Comment out some unused constants 2019-04-28 12:24:40 +01:00
Jonathan G Rennison
24458e9990 Add various missing override specifiers 2019-04-28 12:24:40 +01:00
Jonathan G Rennison
6b107d65d9 Merge branch 'tracerestrict' into tracerestrict-sx 2019-04-28 11:09:25 +01:00
Jonathan G Rennison
0d2277211c Fix enum type mismatch in TestOrderCondition 2019-04-28 11:09:05 +01:00
Jonathan G Rennison
6d3e9093c4 TBTR: Show warning on templates which include unavailable vehicles 2019-04-27 22:47:31 +01:00
Jonathan G Rennison
9d861fb8a0 TBTR: Allow cloning virtual/template trains with unavailable engines 2019-04-27 21:25:56 +01:00
Jonathan G Rennison
2ff8a71e59 Fix handling of road-stop states in a6ea1ea40 2019-04-27 18:04:43 +01:00
Jonathan G Rennison
a6ea1ea408 Allow articulated road vehicles to overtake other vehicles
Add setting
2019-04-27 13:56:49 +01:00
Jonathan G Rennison
c84a8c14b4 Add ground vehicle cache info to vehicle debug window 2019-04-27 13:05:29 +01:00
Jonathan G Rennison
fedfedc492 Silence false-positive misalignment UBSan warning in YAPF road, ship 2019-04-24 19:06:25 +01:00
Jonathan G Rennison
1397bf5755 Update crash log section of low level changes doc 2019-04-24 18:58:50 +01:00
Jonathan G Rennison
92d97d9879 Allow removing signals from plain rail track when a train is present 2019-04-24 04:11:51 +01:00
Jonathan G Rennison
85c8f4baca Merge branch 'crashlog_improvements' into jgrpp
# Conflicts:
#	src/os/macosx/crashlog_osx.cpp
2019-04-23 19:51:09 +01:00
Jonathan G Rennison
cc970aac70 Add sigaltstack support to MacOS crashlog 2019-04-23 19:14:02 +01:00
Jonathan G Rennison
145fee04fa Add sigaltstack support to Unix crashlog 2019-04-23 18:41:20 +01:00
Jonathan G Rennison
61a4ecf078 Add sigaction and ucontext support to Mac crashlog 2019-04-23 18:04:08 +01:00
Jonathan G Rennison
bd2fdde759 Merge branch 'master' into jgrpp
# Conflicts:
#	src/core/sort_func.hpp
#	src/rail_cmd.cpp
#	src/timetable_cmd.cpp
#	src/video/sdl_v.cpp
#	src/video/win32_v.cpp
2019-04-23 08:11:52 +01:00
peter1138
66cd32a252 Codechange: Use std::underlying_type for DECLARE_POSTFIX_INCREMENT. 2019-04-21 22:31:12 +01:00
peter1138
ac1e1a272f Fix: Replace int with std::underlying_type in DECLARE_ENUM_AS_BIT_SET.
This fixes 64 bit uses of this macro.
2019-04-21 22:31:12 +01:00
PeterN
c17736b493 Fix e8d397e: Invisible station/waypoint signs could still be clicked on. (#7531) 2019-04-20 17:49:54 +01:00
PeterN
be073b46da Fix: Bounds check access to railtype_map. (#7529) 2019-04-20 02:34:25 +01:00
PeterN
d2b6176cdf Add: NewGRF string codes to access PUSH/POP_COLOUR. (#7527) 2019-04-20 02:21:25 +01:00
glx22
66a8db9dc5 Fix #7526, 5b77102b6: FiosItem::operator< must return false for equality (#7528) 2019-04-19 18:48:01 +02:00
Jonathan G Rennison
da2528cbe2 Add defensive checks to MacOSStringCompare 2019-04-19 02:06:38 +01:00
Jonathan G Rennison
ede88aa6cd Fix multi-packet network content requests (ContentVector)
Broken by incorrect merge conflict resolution in ba34ec7ad

See #86
2019-04-18 22:53:44 +01:00
glx
ebd4f32d15 Cleanup: remove core/sort_func.hpp as it's not used anymore 2019-04-18 21:49:34 +02:00
glx
48f99fd980 Codechange: use std::array for _sorted_industry_types 2019-04-18 21:49:34 +02:00
glx
60da17418a Codechange: use std::sort in SaveHighScoreValueNetwork() 2019-04-18 21:49:34 +02:00
glx
9388fa2aa1 Codechange: use std::vector to sort _all_grfs linked list 2019-04-18 21:49:34 +02:00