f0bcec77fb
Import patch for random town road reconstruction.
...
From https://www.tt-forums.net/viewtopic.php?f=33&t=36438
Change scale from 0-100 to 0-1000
Adjust strings, settings GUI placement, etc.
8 years ago
f82feb160f
Merge branch 'signal_tunnels_bridges' into jgrpp
...
# Conflicts:
# projects/openttd_vs100.vcxproj
# projects/openttd_vs100.vcxproj.filters
# projects/openttd_vs140.vcxproj
# projects/openttd_vs140.vcxproj.filters
# projects/openttd_vs80.vcproj
# projects/openttd_vs90.vcproj
# source.list
# src/misc.cpp
# src/openttd.cpp
# src/pbs.cpp
# src/saveload/extended_ver_sl.cpp
# src/saveload/saveload.cpp
# src/signal.cpp
# src/train_cmd.cpp
# src/tunnelbridge_map.h
8 years ago
556594f2f0
Extend bridge signal simulation to support an unlimited no. of signals.
...
This is instead of the previous limit of 16, all stored in M2.
8 years ago
61500b596e
Fix tunnel/bridge entrance signal not being refreshed.
...
When a train left a tunnel or a bridge with no intermediary signals,
when setting the entrance signal to green, the display was not refreshed
with show track reservations was enabled.
8 years ago
0d2e9f91bf
Adjust signal on bridge/tunnel map bits, rename accessors, add docs.
...
Use same bit to store red/green state for entrances and exits.
No longer re-use exit bit to store red/green state of entrance.
Avoid modifying the M2 of tunnel entrances/exits.
Rename and rationalise map accessor functions.
Document bits used in landscape HTML docs.
8 years ago
161f70eb4a
Merge branch 'save_ext' into signal_tunnels_bridges
8 years ago
8a59b960d4
Fix missing include in parent commit.
8 years ago
021b72490f
Mark SpringPP imports as fake extended savegame versions.
8 years ago
e844b82d9e
Use vector instead of list for Station::loading_vehicles.
8 years ago
95aad35774
Instead of list use deque in FlowRiver, vector in StationViewWindow.
8 years ago
a422cb6753
Use a deque instead of list for CargoPacketList and StationCargoPacketMap.
8 years ago
ae8e19cf9a
Merge branch 'save_ext' into jgrpp
8 years ago
d124089d29
Add extended version tag and feature versions to output of -q.
8 years ago
94d3700f79
SaveLoad: Add support for saving/loading from a std::vector<T *>
8 years ago
c752da3a9e
SaveLoad: Add support for saving/loading from a std::deque<T *>
8 years ago
27ee2da1f7
Merge branch 'cpp-11' into save_ext
8 years ago
13fb737bed
Add a template parameter for the inner container of MultiMap.
8 years ago
0bd33eff1e
Fixes use of builtins in CountBits for small and/or signed input types.
8 years ago
e85e302a68
Merge branch 'signal_tunnels_bridges' into jgrpp
...
# Conflicts:
# src/rail_cmd.cpp
8 years ago
8281041784
Fix action cost estimation for signal dragging over bridge/tunnels.
...
If a bridge/tunnel entrance is signalled, blacklist the far end.
8 years ago
888cd1be07
Merge branch 'cpp-11' into signal_tunnels_bridges
...
# Conflicts:
# src/saveload/saveload.cpp
8 years ago
375b069f82
Replace day length scaled tick macros with global variables.
...
This is to avoid needing to expensively re-calculate them all the time.
Instead update them by incrementing.
8 years ago
d733955d33
Add road vehicle state to UpdateViewport()->GetImage() var whitelist.
...
Minor refactoring of var check.
8 years ago
0c1f59807d
Merge branch 'enhanced_viewport_overlay' into jgrpp
8 years ago
c137303584
Cache list of active viewports instead of always iterating window list.
...
This is to speed up marking all viewports dirty, which is done very
frequently.
8 years ago
c20cf31514
Merge branch 'cpp-11' into enhanced_viewport_overlay
...
# Conflicts:
# src/rail_gui.cpp
# src/saveload/saveload.cpp
# src/smallmap_gui.cpp
8 years ago
ea2b04a6be
Add C++11 container utility functions.
8 years ago
db026ec8b0
No longer truncate savegame version in gamelog.
...
Add an extended feature for changed savegame format.
8 years ago
a8e0862500
Enable prefetch and bswap buitins for clang.
8 years ago
34040b694c
Make use of override unconditional.
8 years ago
8ad53acfef
Merge branch 'crashlog_improvements' into jgrpp
8 years ago
c2825c12ea
Add clang version support to crashlog output.
8 years ago
f7774415f2
Merge branch 'cpp-11' into crashlog_improvements
...
# Conflicts:
# src/stdafx.h
8 years ago
b8a89437a1
Enable use of atomic store/load on clang.
8 years ago
390a22f864
Enable FINAL, (un)linkely, __attribute__ for clang.
8 years ago
9a7c1911fc
Fix narrowing conversion errors with clang.
8 years ago
9ea018abc5
Merge branch 'cargo_type_order' into jgrpp
...
# Conflicts:
# src/order_base.h
# src/order_gui.cpp
# src/order_type.h
# src/saveload/extended_ver_sl.cpp
# src/saveload/extended_ver_sl.h
# src/vehicle_base.h
8 years ago
bc04b07f2b
Fix double-use of bits 3 and 7 in Order::flags.
...
Use a different encoding for the cargo type load/unload bit in flags.
8 years ago
5e67582a64
Merge branch 'save_ext' into jgrpp
...
# Conflicts:
# config.lib
# src/saveload/extended_ver_sl.cpp
# src/saveload/saveload.cpp
8 years ago
315db4874a
Remove unused global struct RefitDesc
...
Global struct RefitDesc was defined but never used.
(cherry picked from commit 6826240f8170a93720a0f856f1a10d6dda1926c7)
8 years ago
ca98e78c69
Remove unused Vehicle capacity methods
...
Remove unused methods Vehicle::GetConsistFreeCapacities and
Vehicle::GetConsistTotalCapacity.
(cherry picked from commit d97442878f9856c253a3bf976b6a3e114faebefe)
8 years ago
25bd3ed6f4
Fix map borders when switching freeform edges
...
When disabling freeform edges after they were enabled, the tiles
at the northern borders of the map were turned from void to water
by simply setting their type to MP_WATER, which is wrong, because
they were left as owned by player 0, since their owner information
was not updated. Use MakeSea instead, which gets it right.
(cherry picked from commit 39408d6cc4080760f5a58d60cbed9f2ea584496f)
8 years ago
c5e30b8f04
Fix file descriptor leak in LoadOldSaveGame
...
LoadOldSaveGame was leaking a file descriptor when it
successfully loaded a savegame.
(cherry picked from commit f47cfbbba0b182f116109e02445bb419fab1a157)
8 years ago
293ce8b4ab
Remove impossible conditional in RealSave_Town
...
Saving always uses the current savegame version SAVEGAME_VERSION,
which is non-decreasing and already greater than 166.
(cherry picked from commit 6b79497d380b3ae865ddf4d3efb71c319a2bb579)
8 years ago
4a19babf9e
Remove unused ChunkType flag CH_AUTO_LENGTH
...
CH_AUTO_LENGTH is no longer used anywhere, so remove all code
that depends on it.
(cherry picked from commit 9c620d9de5d45b78f7d992d6b3897009fe988d86)
8 years ago
ec157b4a66
Remove save-only autolength flag from economy chunk handlers
...
CH_AUTO_LENGTH is only used when saving chunks; it makes no sense
to set it for chunks without a save handler.
(cherry picked from commit 8b2fe11d8491fb5f3b9bd7dd5344a0956817e41c)
8 years ago
6031cca2d7
Refactor Link Refresher cargo mask handling.
...
Add some separate helper functions.
Move cargo checks out of LinkRefresher::Run.
8 years ago
f8f8e642dc
Use unique_ptr and initialiser init for OrderExtraInfo.
8 years ago
e90b266af1
De-duplicate cargo masking boilerplate using C++11.
8 years ago
72a386abe5
Merge branch 'save_ext' into cargo_type_order
8 years ago
Jonathan G Rennison
cirdan