Jonathan G Rennison
ba34ec7ade
Merge branch 'master' into jgrpp
...
Replace build and refit, and group collapse implementations
Fix template creation build and refit
# Conflicts:
# Makefile.bundle.in
# config.lib
# src/animated_tile.cpp
# src/blitter/32bpp_anim.hpp
# src/blitter/32bpp_base.hpp
# src/blitter/8bpp_base.hpp
# src/blitter/null.hpp
# src/build_vehicle_gui.cpp
# src/command.cpp
# src/command_func.h
# src/console_gui.cpp
# src/core/smallstack_type.hpp
# src/date.cpp
# src/debug.cpp
# src/genworld_gui.cpp
# src/ground_vehicle.hpp
# src/group_gui.cpp
# src/lang/korean.txt
# src/linkgraph/linkgraph_gui.h
# src/main_gui.cpp
# src/misc_gui.cpp
# src/network/core/game.h
# src/network/core/packet.cpp
# src/network/core/udp.cpp
# src/network/core/udp.h
# src/network/network_content.cpp
# src/network/network_type.h
# src/network/network_udp.cpp
# src/newgrf_house.h
# src/openttd.cpp
# src/order_cmd.cpp
# src/order_gui.cpp
# src/os/unix/crashlog_unix.cpp
# src/os/windows/crashlog_win.cpp
# src/osk_gui.cpp
# src/pathfinder/opf/opf_ship.cpp
# src/rail_cmd.cpp
# src/rail_gui.cpp
# src/saveload/saveload.cpp
# src/settings.cpp
# src/settings_gui.cpp
# src/smallmap_gui.h
# src/station_base.h
# src/station_cmd.cpp
# src/table/gameopt_settings.ini
# src/table/newgrf_debug_data.h
# src/table/settings.ini
# src/timetable_gui.cpp
# src/toolbar_gui.cpp
# src/train_gui.cpp
# src/vehicle.cpp
# src/vehicle_gui.cpp
# src/vehiclelist.cpp
# src/viewport.cpp
# src/widgets/dropdown.cpp
# src/window_gui.h
2019-03-27 18:12:04 +00:00
Johannes E. Krause
fdaf67d924
Add: [Newgrf] Some 60+ Vars for industries that were missed in #6867
2019-03-27 10:44:21 +00:00
Johannes E. Krause
1a4c7a4e54
Cleanup: use switch for industry cargo vars
2019-03-27 10:44:21 +00:00
Charles Pigott
49f7332b75
Feature #6053 : Collapsible vehicle groups (3298)
2019-03-27 06:58:48 +00:00
Charles Pigott
8890436af1
Add #6189 : Groups now count the total number of vehicles in subgroups (3298)
2019-03-27 06:58:48 +00:00
Charles Pigott
a393c94695
Change #5977 : Use specific error message when attempting to create a circular group hierarchy (3298)
2019-03-27 06:58:48 +00:00
Charles Pigott
ed9005690a
Fix #7421 : Don't (directly) dereference std::vector::end() in SmallMap
2019-03-27 06:31:49 +00:00
Jonathan G Rennison
99b79c26c6
Remove disaster vehicles from tick cache immediately on deletion
2019-03-27 00:36:06 +00:00
stormcone
b913c92aa7
Fix #7165 : Missed 'Append() --> push_back()' replacement
2019-03-26 22:20:56 +00:00
Jonathan G Rennison
7395705775
Remove assertion in TownGenerateCargo
...
It is not correct with the new town cargo generation algorithm
2019-03-26 22:15:56 +00:00
glx22
427d9d483f
Fix #6564 : enforce types of arguments for station name strings ( #7419 )
2019-03-26 22:50:56 +01:00
Charles Pigott
a065d4623e
Codechange: Move 2 constants into the ifdef where they're used
2019-03-26 20:54:40 +00:00
Charles Pigott
7c81f8e076
Codechange: Simplify refit cargo filter condition and stop mixing enum types
2019-03-26 20:54:40 +00:00
Charles Pigott
e453572b6a
Codechange: Initialise a few variables that -flto seems to think could possibly be uninitialised
2019-03-26 20:54:40 +00:00
Henry Wilson
03ca3190c9
Codechange: Use range-based for-loop in Auto[Free|Delete]SmallVector
2019-03-26 20:15:57 +00:00
Henry Wilson
cc62f4163f
Cleanup: Remove unused size template parameters from SmallMap and Auto[Free|Delete]SmallVector
2019-03-26 20:15:57 +00:00
Henry Wilson
c01a2e2a81
Codechange: Removed SmallVector completely
2019-03-26 20:15:57 +00:00
Henry Wilson
6570f7989f
Codechange: Declare SmallVector as an alias for std::vector
2019-03-26 20:15:57 +00:00
Henry Wilson
ab711e6942
Codechange: Replaced SmallVector::[Begin|End]() with std alternatives
2019-03-26 20:15:57 +00:00
Henry Wilson
297fd3dda3
Codechange: Replaced SmallVector::Include() with include()
2019-03-26 20:15:57 +00:00
Henry Wilson
2bc2de9034
Codechange: Replaced SmallVector::Find() with std::find()
2019-03-26 20:15:57 +00:00
Henry Wilson
e0c58bf5ee
Codechange: Removed SmallVector::Insert()
2019-03-26 20:15:57 +00:00
Henry Wilson
a0f36a50e6
Codechange: Replaced SmallVector::Append() with std::vector::[push|emplace]_back()
2019-03-26 20:15:57 +00:00
Henry Wilson
ca2f33c6d0
Codechange: Replaced SmallVector::Erase() with std::vector::erase()
2019-03-26 20:15:57 +00:00
Henry Wilson
097328c3d7
Codechange: Replaced SmallVector::Get() const with std alternatives
2019-03-26 20:15:57 +00:00
Henry Wilson
aa7ca7fe64
Codechange: Replaced SmallVector::Get(n) non-const with std::vector::data() + n
2019-03-26 20:15:57 +00:00
Henry Wilson
bc7dcaffca
Codechange: Removed SmallVector::Assign()
2019-03-26 20:15:57 +00:00
Henry Wilson
5795f66d2e
Codechange: Replaced SmallVector::Contains() with std::find() pattern
2019-03-26 20:15:57 +00:00
Henry Wilson
b1f5119d3a
Codechange: Replaced SmallVector::ErasePreservingOrder(pos, count) with std::vector::erase()
2019-03-26 20:15:57 +00:00
Henry Wilson
9b5cc73f3e
Codechange: Replaced SmallVector::ErasePreservingOrder(it, count) with std::vector::erase()
2019-03-26 20:15:57 +00:00
Henry Wilson
8460952240
Codechange: Replaced SmallVector::Find() const with suitable alternatives
...
The use of std::none_of in network/core/host.cpp is driven by the non-const
comparison operator use by NetworkAddress. A future commit should address
the const_casts in that class to ensure const-correctness.
2019-03-26 20:15:57 +00:00
Henry Wilson
81315939b9
Codechange: Replaced SmallVector::Find() non-const with std::find()
2019-03-26 20:15:57 +00:00
Henry Wilson
f3938fdb83
Codechange: Replaced SmallVector::Reset() with std::vector::clear() + shrink_to_fit()
2019-03-26 20:15:57 +00:00
Henry Wilson
bad2c2154b
Codechange: Replaced SmallVector::Resize() with std::vector::resize()
2019-03-26 20:15:57 +00:00
Henry Wilson
a690936ed7
Codechange: Replace SmallVector::Length() with std::vector::size()
2019-03-26 20:15:57 +00:00
Henry Wilson
56ae855dc2
Codechange: Removed SmallVector::operator[]
2019-03-26 20:15:57 +00:00
Henry Wilson
9cba6f7193
Codechange: Replaced SmallVector::Compact() with std::vector::shrink_to_fit()
2019-03-26 20:15:57 +00:00
Henry Wilson
bfd79e59dc
Codechange: Replace SmallVector::Clear() with std::vector::clear()
2019-03-26 20:15:57 +00:00
Henry Wilson
4b349c0f90
Codechange: [core] Implement SmallVector using std::vector
...
The public and protected interface to SmallVector are unchanged
SmallVector now requires that items be default constructible
This isn't an issue since some contained items were previously created
uninitialized.
Temporary default constructors are added to the following structs
- SmallPair
- SmallStackItem
- GRFPresence
Where vector<bool> is required, transition immediately to std::vector
to avoid returning proxy object references.
2019-03-26 20:15:57 +00:00
translators
7a32cf1401
Update: Translations from eints
...
greek: 51 changes by Jubilee
russian: 17 changes by Lone_Wolf
latin: 19 changes by Supercheese
portuguese: 53 changes by JayCity
2019-03-26 19:45:43 +01:00
Jonathan G Rennison
f8724beb29
findversion.sh: Handle case where tag/stable tag is missing from .ottdrev-vc
2019-03-26 17:39:46 +00:00
PeterN
e3ea758c46
Fix #7414 : Reinstate marking sign dirty before removal. ( #7416 )
2019-03-25 23:24:40 +00:00
stormcone
8acca3a72b
Change: Do not display a newspaper about old vehicles for which replacement is activated.
2019-03-25 23:41:06 +01:00
PeterN
698241e16e
Fix #7410 : Sign position/width not set on initial creation. ( #7413 )
...
Sign width was only updated when the text was changed. This seems to work for player-placed
signs as there is always a rename operation, however AIs can create a sign with text in one
go, in which case the width was never set.
2019-03-25 20:01:55 +00:00
PeterN
a4073895ae
Fix #7411 : Use industry production callback (if used) on initial industry cargo generation. ( #7412 )
2019-03-25 19:30:23 +00:00
translators
10f0c1e3cd
Update: Translations from eints
...
finnish: 12 changes by hpiirai
greek: 40 changes by Jubilee
luxembourgish: 2 changes by Phreeze
dutch: 12 changes by JanWillem
french: 4 changes by romazoon
norwegian (bokmal): 12 changes by Leifbk
hungarian: 14 changes by Brumi
portuguese: 51 changes by JayCity, 11 changes by vesgo
2019-03-25 19:45:45 +01:00
translators
37b9fdc0c1
Update: Translations from eints
...
finnish: 13 changes by hpiirai
korean: 1 change by telk5093
2019-03-24 19:45:44 +01:00
Niels Martin Hansen
ce10d9be3f
Fix #7374 : Ensure k-d trees are always updated when station sign moves
2019-03-24 19:26:13 +01:00
peter1138
3860a2ce2a
Codechange: Use override keyword for smallmap window.
2019-03-24 17:38:42 +00:00
peter1138
07de9d6c3f
Codechange: Use override keyword in networking classes.
2019-03-24 17:38:42 +00:00
