38729297f9
Codechange: No need for AutoFreePtr if there's std::unique_ptr.
6 years ago
4e85ccf3c0
Codechange: Replace SmallStackSafeStackAlloc with std::array.
...
The only port that ever used it to make heap allocations instead of stack ones was the NDS port, which got thrown out some time ago.
6 years ago
410b81537c
Fix 801cbea9c: operator< is not always the best idea
...
Also removes unused and anyway broken SmallMap::SortByKey() function.
6 years ago
801cbea9cc
Codechange: use std::sort() for all std::vector types
6 years ago
674732cd68
Merge: Codechange: Use null pointer literal instead of the NULL macro
6 years ago
f5747bf753
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/genworld_gui.cpp
# src/group_gui.cpp
# src/saveload/saveload.cpp
# src/settings_gui.cpp
# src/toolbar_gui.cpp
# src/vehicle_gui.cpp
# src/vehicle_gui_base.h
# src/widgets/dropdown.cpp
# src/widgets/dropdown_type.h
6 years ago
7c8e7c6b6e
Codechange: Use null pointer literal instead of the NULL macro
6 years ago
8b1880187a
Remove: AutoFreeSmallVector.
...
The last use was for storing a list of memory blocks. As the way these lists are accessed is very
specific, it is easier to just write an explicit destructor instead of trying to exactly match the behaviour.
6 years ago
e804173595
Codechange: If something is a vector of strings, use a vector of strings instead of an AutoFreeSmallVector.
6 years ago
c7b9987d08
Codechange: Switch DropDownList to directly use std::vector, thus making AutoDeleteSmallVector obsolete.
...
DropDownListItem are strongly managed using std::unique_ptr to ensure leak-free handling. Appropriate use
of move-semantics make intent a lot clearer than parameter comments and allows the compiler to generate
copy-free code for most situations.
6 years ago
01261daec0
Merge branch 'master' into cpp-11
...
# Conflicts:
# config.lib
6 years ago
05f4e73608
Codechange: Replace custom mutex code with C++11 mutex'es.
...
A conforming compiler with a valid <mutex>-header is expected.
Most parts of the code assume that locking a mutex will never fail unexpectedly,
which is generally true on all common platforms that don't just pretend to
be C++11. The use of condition variables in driver code is checked.
6 years ago
58433c7667
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/core/smallmap_type.hpp
# src/lang/korean.txt
# src/network/network_content.cpp
# src/smallmap_gui.cpp
# src/station_cmd.cpp
6 years ago
21d9e87b46
Fix #7165 : Const overload SmallMap::Contains(key) compared wrong types.
...
Const and non-const Find() have different return types.
6 years ago
ee260e4704
Fix #7165 : SmallMap::Erase(key) does not work correctly
6 years ago
66dd7c3879
Fix: MSVC warnings ( #7423 )
6 years ago
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
6 years ago
ed9005690a
Fix #7421 : Don't (directly) dereference std::vector::end() in SmallMap
6 years ago
03ca3190c9
Codechange: Use range-based for-loop in Auto[Free|Delete]SmallVector
6 years ago
cc62f4163f
Cleanup: Remove unused size template parameters from SmallMap and Auto[Free|Delete]SmallVector
6 years ago
c01a2e2a81
Codechange: Removed SmallVector completely
6 years ago
6570f7989f
Codechange: Declare SmallVector as an alias for std::vector
6 years ago
ab711e6942
Codechange: Replaced SmallVector::[Begin|End]() with std alternatives
6 years ago
297fd3dda3
Codechange: Replaced SmallVector::Include() with include()
6 years ago
2bc2de9034
Codechange: Replaced SmallVector::Find() with std::find()
6 years ago
e0c58bf5ee
Codechange: Removed SmallVector::Insert()
6 years ago
a0f36a50e6
Codechange: Replaced SmallVector::Append() with std::vector::[push|emplace]_back()
6 years ago
ca2f33c6d0
Codechange: Replaced SmallVector::Erase() with std::vector::erase()
6 years ago
097328c3d7
Codechange: Replaced SmallVector::Get() const with std alternatives
6 years ago
aa7ca7fe64
Codechange: Replaced SmallVector::Get(n) non-const with std::vector::data() + n
6 years ago
bc7dcaffca
Codechange: Removed SmallVector::Assign()
6 years ago
5795f66d2e
Codechange: Replaced SmallVector::Contains() with std::find() pattern
6 years ago
b1f5119d3a
Codechange: Replaced SmallVector::ErasePreservingOrder(pos, count) with std::vector::erase()
6 years ago
9b5cc73f3e
Codechange: Replaced SmallVector::ErasePreservingOrder(it, count) with std::vector::erase()
6 years ago
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.
6 years ago
81315939b9
Codechange: Replaced SmallVector::Find() non-const with std::find()
6 years ago
f3938fdb83
Codechange: Replaced SmallVector::Reset() with std::vector::clear() + shrink_to_fit()
6 years ago
bad2c2154b
Codechange: Replaced SmallVector::Resize() with std::vector::resize()
6 years ago
a690936ed7
Codechange: Replace SmallVector::Length() with std::vector::size()
6 years ago
56ae855dc2
Codechange: Removed SmallVector::operator[]
6 years ago
9cba6f7193
Codechange: Replaced SmallVector::Compact() with std::vector::shrink_to_fit()
6 years ago
bfd79e59dc
Codechange: Replace SmallVector::Clear() with std::vector::clear()
6 years ago
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.
6 years ago
72c5f2b3ee
Remove: DOS support
...
In 10 years there was no active development on DOS. Although it
turned out to still work, the FPS was very bad. There is little
interest in the current community to look into this.
Further more, we like to switch to c++11 functions for threads,
which are not implemented by DJGPP, the only current compiler
for DOS.
Additionally, DOS is the only platform which does not support
networking. It is the reason we have tons of #ifdefs to support
disabling networking.
By removing DOS support, we can both use c++11 functions for threads,
and remove all the code related to disabling network. Sadly, this
means we have to see DOS go.
Of course, if you feel up for the task, simply revert this commit,
and implement stub c++11 functions for threads and stub functions
for networking. We are more than happy to accept such Pull Request.
6 years ago
5e6d283463
Merge branch 'master' into jgrpp
...
Remove the viewport sign cache as this is now superseded by the kd tree
implementation
# Conflicts:
# src/crashlog.cpp
# src/lang/english.txt
# src/misc.cpp
# src/pathfinder/follow_track.hpp
# src/pbs.cpp
# src/rail_cmd.cpp
# src/saveload/vehicle_sl.cpp
# src/settings.cpp
# src/settings_gui.cpp
# src/ship_cmd.cpp
# src/station.cpp
# src/station_base.h
# src/station_cmd.cpp
# src/table/settings.ini
# src/thread/thread_morphos.cpp
# src/town_cmd.cpp
# src/train_cmd.cpp
# src/viewport.cpp
# src/waypoint.cpp
6 years ago
d7522e5e8f
Codechange: Add a k-d tree generic data structure
6 years ago
f52e5a4d61
Fix: warnings when compiling with DJGPP
...
This was most likely broken for months, if not years.
6 years ago
1c5ea33099
Fix: warnings when compiling for a recent version of Haiku
...
This might break older Haiku versions, but it is hard to tell.
6 years ago
ad30d04b5e
Codechange: removed some left-behind __NDS__ references
6 years ago
7784d77713
Remove: MorphOS / AmigaOS support
...
In 10 years there is no commit to change how MorphOS works, and we
have no active maintainer for it. It is unlikely it works in its
current state (but not impossible).
With the arrival of SDL2 (and removal of SDL), MorphOS is no longer
support. There is an SDL2 port for MorphOS, but it is not maintained
by upstream SDL2, and nobody can currently test it out.
If anyone wants to re-add MorphOS, please do (revert this patch,
fix the problems, and create a Pull Request). If you need any help
doing so, let us know! It is not that we don't like MorphOS, it is
that we don't have anyone fixing the problems :(
6 years ago
2fdcc52321
Merge branch 'save_ext' into jgrpp
...
# Conflicts:
# Makefile.src.in
# findversion.sh
# projects/determineversion.vbs
# src/lang/dutch.txt
# src/lang/korean.txt
# src/network/network.cpp
# src/network/network_client.cpp
# src/rail.cpp
# src/rail_cmd.cpp
# src/saveload/afterload.cpp
# src/ship_cmd.cpp
# src/toolbar_gui.cpp
# src/vehicle.cpp
6 years ago
466b9a9595
Merge branch 'master' into cpp-11
6 years ago
c0c8fb25fb
Change: Use SlErrorCorrupt() on pool index error when loading a savegame, instead of terminating. ( #7219 )
6 years ago
09c62d6951
Merge branch 'master' into cpp-11
6 years ago
191afd93c1
Merge branch 'save_ext' into jgrpp
...
# Conflicts:
# src/lang/english.txt
# src/lang/german.txt
# src/lang/korean.txt
# src/settings.cpp
# src/station_cmd.cpp
# src/table/settings.ini
# src/vehicle_base.h
# src/widgets/dropdown.cpp
6 years ago
80d6f6c622
Merge branch 'master' into save_ext
...
# Conflicts:
# src/saveload/saveload.cpp
# src/saveload/saveload.h
6 years ago
9d75600ac0
Fix: Round up deltas for smooth scrolling, so target will be reached
6 years ago
e3d167f9f0
Merge branch 'save_ext' into jgrpp
...
# Conflicts:
# config.lib
# src/misc_gui.cpp
# src/network/network_gui.cpp
# src/settings_type.h
# src/smallmap_gui.cpp
# src/smallmap_gui.h
# src/station_cmd.cpp
# src/toolbar_gui.cpp
# src/vehicle_gui.cpp
# src/window.cpp
6 years ago
0bed63b77f
Merge branch 'master' into cpp-11
6 years ago
4fc1b2baae
Fix: Grammar in a bunch of comments ( #7054 )
6 years ago
962a9c5430
Merge branch 'master' into cpp-11
...
# Conflicts:
# config.lib
# projects/openttd_vs100.vcxproj
# projects/openttd_vs100.vcxproj.filters
# projects/openttd_vs80.vcproj
# projects/openttd_vs90.vcproj
# src/saveload/saveload.cpp
6 years ago
4f1d54564e
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/debug.cpp
6 years ago
c540d72445
Fix: [Win32] WIN32 may not be defined, always prefer the compiler predefined macro _WIN32
6 years ago
e735c1a51a
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/aircraft_cmd.cpp
# src/autoreplace_cmd.cpp
# src/pathfinder/follow_track.hpp
# src/pathfinder/yapf/yapf_rail.cpp
# src/saveload/afterload.cpp
# src/saveload/saveload.cpp
# src/script/api/ai/ai_station.hpp.sq
# src/script/api/game/game_station.hpp.sq
# src/script/api/script_station.hpp
# src/track_func.h
# src/vehicle_base.h
6 years ago
18ca3e8660
Fix: [NewGRF] Make VA2 operator 11 (ror) behave well-defined when rotating by 0 bits.
6 years ago
f5b1115039
Doc: Lots and lots of doxymentation fixes
6 years ago
3330e4cef8
Merge branch 'cargo_type_order' into jgrpp
...
# Conflicts:
# src/pathfinder/yapf/yapf_common.hpp
# src/saveload/extended_ver_sl.cpp
# src/saveload/order_sl.cpp
# src/saveload/station_sl.cpp
# src/track_func.h
6 years ago
0ae32838ea
Merge branch 'save_ext' into cargo_type_order
...
# Conflicts:
# src/core/smallstack_type.hpp
6 years ago
373ff3dd4e
Merge branch 'master' into save_ext
...
# Conflicts:
# src/saveload/saveload.cpp
# src/table/settings.h.preamble
6 years ago
5f86e1a390
Codechange: Silence -Wclass-memaccess warnings with GCC8
6 years ago
e1fb35b16f
Fix undefined behaviour when left-shifting negative values by casting to unsigned
...
This silences warning spam from UndefinedBehaviorSanitizer.
6 years ago
fd4d9591c1
Merge branch 'save_ext' into jgrpp
6 years ago
f05ca1ba91
Merge branch 'cpp-11' into save_ext
6 years ago
6862343eb3
Fix wrong type cast in Apple BSWAP64 macro
6 years ago
159909f4b1
Merge branch 'save_ext' into jgrpp
...
# Conflicts:
# src/saveload/saveload.cpp
6 years ago
8404afd40f
Merge branch 'cpp-11' into save_ext
6 years ago
9ca4e915ba
Add 64 bit byte swapping function
6 years ago
fa304cdb75
Merge branch 'master' into save_ext
...
# Conflicts:
# src/saveload/saveload.cpp
6 years ago
ad1c402ad8
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/debug.cpp
# src/saveload/afterload.cpp
# src/saveload/saveload.cpp
# src/settings_type.h
# src/town_cmd.cpp
# src/window.cpp
6 years ago
9959cd9522
Fix 0165fe1: Native OSX doesn't have a __BYTE_ORDER macro but defines a differently named macro.
6 years ago
fa87212a76
Fix: Some spelling errors in printed messages
6 years ago
0165fe1283
Codechange: remove endian_check in favour of __BYTE_ORDER macro (Rubidium) ( #6762 )
6 years ago
1fe0bb76b9
Merge branches 'crashlog_improvements', 'save_ext', 'version_utils' into jgrpp
7 years ago
f42cc19aad
Merge branch 'cpp-11' into crashlog_improvements
...
# Conflicts:
# Makefile.src.in
# src/crashlog.cpp
# src/crashlog.h
7 years ago
b90c5b9618
Merge branch 'master' into cpp-11
...
# Conflicts:
# src/stdafx.h
7 years ago
86012e10ea
Fix: Remove need to instantiate SmallStack's pool object by making it a singleton method
7 years ago
4851feb102
Codechange: Add functions to insert and extract an element at a specific position in a SmallVec.
7 years ago
4bb8106c2a
Adjust typenames of ConvertRect to avoid name collisions
7 years ago
cfa8ed747e
Add a 16-bit Rect type and conversion function
7 years ago
a93cc441a9
Merge branch 'cpp-11' into jgrpp
7 years ago
6f5dc695fa
Add templated versions of CeilDiv and Ceil maths functions
7 years ago
4a6ddb2d50
Merge branch 'cpp-11' into crashlog_improvements
...
# Conflicts:
# config.lib
7 years ago
8317eac918
Merge branch 'save_ext' into jgrpp
...
# Conflicts:
# src/lang/german.txt
# src/lang/korean.txt
# src/lang/traditional_chinese.txt
# src/window.cpp
8 years ago
4e9d4dd80a
Add a PreCleanPool() static method to pool item types.
...
(cherry picked from commit 87142ed840
8 years ago
a3034891a1
Add missing include guard for dyn arena alloc header.
8 years ago
2fb822d392
Fix includes and header guards of container functions.
8 years ago
87142ed840
Add a PreCleanPool() static method to pool item types.
8 years ago
a67ecb4f6e
Merge branch 'cpp-11' into jgrpp
8 years ago
8f3e0c4fe5
Add a custom arena allocator utility.
8 years ago
a71a6ecec2
Fix Pop() method of SmallStack/StationIDStack.
...
Fixes 8deac54c
8 years ago
8e6569c11f
Include tick skip counter in all desync debug output.
...
Change message format to make field identification easier.
Update desync message reader to support tick skip counter.
8 years ago
ae8e19cf9a
Merge branch 'save_ext' into jgrpp
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
0c1f59807d
Merge branch 'enhanced_viewport_overlay' into jgrpp
8 years ago
ea2b04a6be
Add C++11 container utility functions.
8 years ago
a8e0862500
Enable prefetch and bswap buitins for clang.
8 years ago
f7774415f2
Merge branch 'cpp-11' into crashlog_improvements
...
# Conflicts:
# src/stdafx.h
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
5e67582a64
Merge branch 'save_ext' into jgrpp
...
# Conflicts:
# config.lib
# src/saveload/extended_ver_sl.cpp
# src/saveload/saveload.cpp
8 years ago
72a386abe5
Merge branch 'save_ext' into cargo_type_order
8 years ago
8deac54c9f
Remove mutex from SmallStack/StationIDStack.
...
It is only ever used from the main thread.
8 years ago
349cd8a6f0
Where possible use compiler builtins for CountBits and FindFirstBit.
8 years ago
bc08fe7c5f
(svn r27641) -Codechange: Fold the _fios_items file list vector into its own class.
8 years ago
a38cdeccc0
(svn r27641) -Codechange: Fold the _fios_items file list vector into its own class.
8 years ago
cf26d48c9b
Add a "SoftClamp" function which tolerates min > max, use for DrawTrainEngine.
8 years ago
f6d374ade4
Merge branch 'house_placing' into jgrpp
...
This reverts the house picking/placing patch back to v2.
This is to fix house placement/town growth desync issues introduced in v4.
# Conflicts:
# src/settings_gui.cpp
# src/settings_type.h
# src/town_gui.cpp
8 years ago
95b65163e3
Revert back to v2 of house picking/placing patch.
8 years ago
41a06e698f
Merge branch 'house_placing' into jgrpp
...
# Conflicts:
# src/settings_gui.cpp
# src/settings_type.h
# src/town_gui.cpp
9 years ago
0fd34a17a5
Update to v4 of house placing patch.
9 years ago
ec62878758
Merge branch 'crashlog_improvements' into jgrpp
9 years ago
2a2ff30c3f
Fix Pool verbose assertion format string on Windows platforms.
9 years ago
bdca33ee80
Merge branch 'crashlog_improvements' into jgrpp
9 years ago
a703e2ff58
Increase verbosity of Pool assertion failure messages.
9 years ago
ecf5943954
Fix some undefined behaviour: signed overflow and over shift left.
...
Caught by UndefinedBehaviourSanitizer.
9 years ago
66cd454c37
Merge branch 'day_length-sx' into jgrpp
9 years ago
f03cd98d04
Check/print tick skip counter in desync and random logging.
9 years ago
44918010df
(svn r27381) -Fix: Warnings due to C++11 requirements for explicit narrowing conversions in initializer lists.
9 years ago
2b8bb12d62
(svn r27381) -Fix: Warnings due to C++11 requirements for explicit narrowing conversions in initializer lists.
9 years ago
1ad3db76e6
(svn r27049) -Fix (r26482): Fix compilation with --enable-desync-debug.
10 years ago
cea2c3490a
(svn r27049) -Fix (r26482): Fix compilation with --enable-desync-debug.
10 years ago
ee7700ef78
(svn r26685) -Fix: Tighten parameter bound checks on GSCargoMonitor functions, and return -1 on out-of-bound parameters.
10 years ago
8fe8765aaa
(svn r26685) -Fix: Tighten parameter bound checks on GSCargoMonitor functions, and return -1 on out-of-bound parameters.
10 years ago
15c4a7ec1c
(svn r26651) -Fix: make sure an abs is used that supports int64 when using abs on those variables
10 years ago
ab964a6cee
(svn r26651) -Fix: make sure an abs is used that supports int64 when using abs on those variables
10 years ago
2be4215f43
(svn r26482) -Codechange: add an include that allows us to undefine/redefine "unsafe" functions to prevent them from being used, and thus having to care about certain aspects of their return values
11 years ago
0463dbdc9e
(svn r26482) -Codechange: add an include that allows us to undefine/redefine "unsafe" functions to prevent them from being used, and thus having to care about certain aspects of their return values
11 years ago
4b726930f1
(svn r26343) -Fix: Rewrite SmallStack so that it doesn't use a pool and is reentrant.
11 years ago
46590e112e
(svn r26343) -Fix: Rewrite SmallStack so that it doesn't use a pool and is reentrant.
11 years ago
a92bf49191
(svn r26333) -Fix: Compilation without static_assert.
11 years ago
858e80f3dd
(svn r26333) -Fix: Compilation without static_assert.
11 years ago
86ebb981f1
(svn r26331) -Fix: some inconsistencies regarding link graph (job) IDs.
11 years ago
e37656f2e5
(svn r26331) -Fix: some inconsistencies regarding link graph (job) IDs.
11 years ago
73474728e3
(svn r26057) -Fix: a number of possibly uninitialised variables
11 years ago
b3e93d6520
(svn r26057) -Fix: a number of possibly uninitialised variables
11 years ago
e037a8bea9
(svn r25893) -Fix: Document RandomRange and change misleading parameter name 'max' in random functions.
11 years ago
fe550c2db3
(svn r25893) -Fix: Document RandomRange and change misleading parameter name 'max' in random functions.
11 years ago
6f834776e4
(svn r25889) -Codechange: Add forgotten file.
11 years ago
1ed478d433
(svn r25889) -Codechange: Add forgotten file.
11 years ago
85fc5fbedf
(svn r25887) -Fix: Ignore NULL pointers in delete operator of PoolItem.
11 years ago
Michael Lutz
glx
Jonathan G Rennison
Henry Wilson
stormcone
glx22
Charles Pigott
Patric Stout
Niels Martin Hansen
PeterN
btzy
nikolas
frosch
Matthijs Kooijman
alberth
patch-import
michi_cc
peter1138
rubidium
fonsinchen