Jonathan G Rennison
|
fdd666f66a
|
Merge tag '14.0-beta1' into jgrpp
# Conflicts:
# src/3rdparty/squirrel/squirrel/sqcompiler.cpp
# src/aircraft.h
# src/animated_tile.h
# src/base_consist.h
# src/cargotype.h
# src/company_gui.cpp
# src/console_cmds.cpp
# src/core/overflowsafe_type.hpp
# src/engine_gui.cpp
# src/industry_gui.cpp
# src/lang/english.txt
# src/music/extmidi.cpp
# src/network/core/network_game_info.cpp
# src/network/network_server.cpp
# src/newgrf.cpp
# src/newgrf_industries.cpp
# src/order_base.h
# src/order_cmd.cpp
# src/order_gui.cpp
# src/order_type.h
# src/os/macosx/misc_osx.cpp
# src/os/windows/crashlog_win.cpp
# src/rail_gui.cpp
# src/rail_gui.h
# src/roadveh.h
# src/roadveh_cmd.cpp
# src/saveload/afterload.cpp
# src/saveload/company_sl.cpp
# src/saveload/saveload.cpp
# src/saveload/saveload.h
# src/saveload/saveload_error.hpp
# src/script/api/script_town.cpp
# src/settingsgen/settingsgen.cpp
# src/ship.h
# src/ship_cmd.cpp
# src/smallmap_gui.cpp
# src/spritecache.cpp
# src/stdafx.h
# src/strgen/strgen.cpp
# src/strgen/strgen.h
# src/table/settings/script_settings.ini
# src/timetable_cmd.cpp
# src/timetable_gui.cpp
# src/town.h
# src/town_cmd.cpp
# src/town_cmd.h
# src/town_gui.cpp
# src/train.h
# src/train_cmd.cpp
# src/tree_cmd.cpp
# src/vehicle.cpp
# src/vehicle_base.h
# src/vehicle_cmd.cpp
# src/vehicle_gui.cpp
# src/vehiclelist.cpp
# src/waypoint_base.h
# src/widget.cpp
|
4 months ago |
|
Jonathan G Rennison
|
97e6f3062e
|
Adding of _t to (u)int types, and WChar to char32_t
See: eaae0bb5e
|
5 months ago |
|
Jonathan G Rennison
|
ea6be942a3
|
Fix assert ifdefs in src/core/poll_func.hpp
|
7 months ago |
Rubidium
|
f74e26ca7e
|
Codechange: replace error/usererror printf variant with fmt variant and rename
|
1 year ago |
Charles Pigott
|
8aea13a85b
|
Codechange: Use fmt for SlErrorCorruptFmt
|
1 year ago |
|
Rubidium
|
4e65ec1dc4
|
Codechange: do not declare functions in blocks
|
1 year ago |
|
Jonathan G Rennison
|
29a1e49c28
|
Change various asserts to not be included in release builds
|
2 years ago |
|
Jonathan G Rennison
|
1e0bea5b8d
|
Replace FindFirstBit/FindFirstBit64 with a single template function
|
3 years ago |
|
Jonathan G Rennison
|
ffef1c9e44
|
Merge branch 'master' into jgrpp-beta
# Conflicts:
# src/saveload/cargopacket_sl.cpp
# src/saveload/cheat_sl.cpp
# src/saveload/company_sl.cpp
# src/saveload/engine_sl.cpp
# src/saveload/map_sl.cpp
# src/saveload/order_sl.cpp
# src/saveload/saveload.cpp
# src/saveload/saveload.h
# src/saveload/station_sl.cpp
# src/saveload/vehicle_sl.cpp
# src/settings.cpp
# src/settings_gui.cpp
# src/settings_internal.h
# src/stdafx.h
# src/table/settings/settings.ini
# src/town_cmd.cpp
# src/vehicle.cpp
|
3 years ago |
|
Jonathan G Rennison
|
97d5982cb5
|
Fix various compiler warnings
See: #267
|
3 years ago |
Patric Stout
|
28e90769f7
|
Codechange: use "[[maybe_unused]]" instead of a wide variety of other ways we had
While at it, replace OTTD_ASSERT with WITH_ASSERT, as this
is always set if assert() is valid. No matter if NDEBUG is set
or not.
|
3 years ago |
|
Jonathan G Rennison
|
b7ddd486cf
|
Merge branch 'master' into jgrpp
# Conflicts:
# cmake/CompileFlags.cmake
# src/aircraft_cmd.cpp
# src/blitter/32bpp_anim.cpp
# src/cargopacket.cpp
# src/cheat_gui.cpp
# src/company_cmd.cpp
# src/company_gui.cpp
# src/core/pool_func.hpp
# src/date.cpp
# src/economy.cpp
# src/error_gui.cpp
# src/ground_vehicle.cpp
# src/ground_vehicle.hpp
# src/group_gui.cpp
# src/industry_cmd.cpp
# src/lang/dutch.txt
# src/lang/french.txt
# src/lang/german.txt
# src/linkgraph/linkgraph_gui.cpp
# src/linkgraph/mcf.cpp
# src/network/network_content.cpp
# src/network/network_server.cpp
# src/network/network_udp.cpp
# src/newgrf_engine.cpp
# src/newgrf_station.cpp
# src/order_cmd.cpp
# src/order_gui.cpp
# src/pathfinder/follow_track.hpp
# src/pathfinder/yapf/yapf_common.hpp
# src/saveload/saveload.cpp
# src/settings_gui.cpp
# src/station_cmd.cpp
# src/station_kdtree.h
# src/string_func.h
# src/table/settings.ini
# src/tgp.cpp
# src/timetable_cmd.cpp
# src/timetable_gui.cpp
# src/toolbar_gui.cpp
# src/town_cmd.cpp
# src/train_cmd.cpp
# src/train_gui.cpp
# src/tree_gui.cpp
# src/tunnelbridge_cmd.cpp
# src/vehicle.cpp
# src/vehicle_gui.cpp
# src/video/sdl2_v.cpp
# src/video/sdl_v.cpp
# src/video/win32_v.cpp
# src/viewport.cpp
# src/viewport_sprite_sorter_sse4.cpp
# src/window.cpp
|
3 years ago |
|
Charles Pigott
|
9b800a96ed
|
Codechange: Remove min/max functions in favour of STL variants (#8502)
|
3 years ago |
|
Jonathan G Rennison
|
cbdd9f84d8
|
Merge branch 'master' into jgrpp
# Conflicts:
# src/console_gui.cpp
# src/lang/korean.txt
# src/video/sdl2_v.cpp
# src/video/sdl2_v.h
# src/window.cpp
# src/window_gui.h
|
5 years ago |
S. D. Cloudt
|
13cc8a0cee
|
Cleanup: Removed SVN headers
|
5 years ago |
|
Jonathan G Rennison
|
627cdf83eb
|
Pool: Add a free bitmap, use for finding free slots
|
5 years ago |
|
Jonathan G Rennison
|
674732cd68
|
Merge: Codechange: Use null pointer literal instead of the NULL macro
|
5 years ago |
Henry Wilson
|
7c8e7c6b6e
|
Codechange: Use null pointer literal instead of the NULL macro
|
5 years ago |
|
Jonathan G Rennison
|
466b9a9595
|
Merge branch 'master' into cpp-11
|
5 years ago |
PeterN
|
c0c8fb25fb
|
Change: Use SlErrorCorrupt() on pool index error when loading a savegame, instead of terminating. (#7219)
|
5 years ago |
|
Jonathan G Rennison
|
4e9d4dd80a
|
Add a PreCleanPool() static method to pool item types.
(cherry picked from commit 87142ed840)
|
7 years ago |
michi_cc
|
2b8bb12d62
|
(svn r27381) -Fix: Warnings due to C++11 requirements for explicit narrowing conversions in initializer lists.
|
9 years ago |
|
michi_cc
|
44918010df
|
(svn r27381) -Fix: Warnings due to C++11 requirements for explicit narrowing conversions in initializer lists.
|
9 years ago |
|
rubidium
|
b3e93d6520
|
(svn r26057) -Fix: a number of possibly uninitialised variables
|
11 years ago |
|
rubidium
|
73474728e3
|
(svn r26057) -Fix: a number of possibly uninitialised variables
|
11 years ago |
planetmaker
|
c24374f99c
|
(svn r24900) -Fix [FS#5389]: Comments with typos (most fixes supplied by Eagle_rainbow)
|
12 years ago |
|
planetmaker
|
f00d9976f9
|
(svn r24900) -Fix [FS#5389]: Comments with typos (most fixes supplied by Eagle_rainbow)
|
12 years ago |
smatz
|
b5525fd33d
|
(svn r23941) -Add: support for clang
|
13 years ago |
|
smatz
|
bb9b240a86
|
(svn r23941) -Add: support for clang
|
13 years ago |
|
rubidium
|
fb5ecb9499
|
(svn r22411) -Document: another bunch of bits
|
13 years ago |
|
rubidium
|
9fc2798baf
|
(svn r22411) -Document: another bunch of bits
|
13 years ago |
|
smatz
|
756cc6cf65
|
(svn r22116) -Codechange: use PoolBase::Clean() at more places
|
14 years ago |
|
smatz
|
c85e1c3089
|
(svn r22116) -Codechange: use PoolBase::Clean() at more places
|
14 years ago |
|
smatz
|
fbfb0ffbf2
|
(svn r22041) -Codechange: add a check that we called PoolItem::CanAllocateItem() before actually allocating it
|
14 years ago |
|
smatz
|
817392c9b0
|
(svn r22041) -Codechange: add a check that we called PoolItem::CanAllocateItem() before actually allocating it
|
14 years ago |
|
rubidium
|
eb299736c1
|
(svn r21886) -Codechange: move documentation towards the code to make it more likely to be updated [n].
|
14 years ago |
|
rubidium
|
43c8073551
|
(svn r21886) -Codechange: move documentation towards the code to make it more likely to be updated [n].
|
14 years ago |
|
rubidium
|
1528b64a68
|
(svn r17839) -Codechange: implement the concept of 'caching' pool items to pools, that is instead of 'free' push the unused items in a linked list and use them on 'malloc'. Also add the concept of zeroing, or actually not zeroing, on new for pool items.
|
15 years ago |
|
rubidium
|
5ce38e4fdd
|
(svn r17839) -Codechange: implement the concept of 'caching' pool items to pools, that is instead of 'free' push the unused items in a linked list and use them on 'malloc'. Also add the concept of zeroing, or actually not zeroing, on new for pool items.
|
15 years ago |
|
rubidium
|
7fbc33dae1
|
(svn r17248) -Fix: add GPL license notice where appropriate
|
15 years ago |
|
rubidium
|
99d46e0ad7
|
(svn r17248) -Fix: add GPL license notice where appropriate
|
15 years ago |
|
smatz
|
c861d9b64b
|
(svn r16745) -Fix [FS#3011]: invalidate JoinStation window after removing item from the pool
|
15 years ago |
|
smatz
|
aa4ccab6a8
|
(svn r16745) -Fix [FS#3011]: invalidate JoinStation window after removing item from the pool
|
15 years ago |
|
smatz
|
56a7b70591
|
(svn r16380) -Codechange: rename pool.hpp to pool_type.hpp
|
15 years ago |
|
smatz
|
3793b966c3
|
(svn r16380) -Codechange: rename pool.hpp to pool_type.hpp
|
15 years ago |
|
smatz
|
62a7948af0
|
(svn r16378) -Codechange: replace OldPool with simpler Pool. Compilation time, binary size and run time (with asserts disabled) should be improved
|
15 years ago |
|
smatz
|
50624d5c0f
|
(svn r16378) -Codechange: replace OldPool with simpler Pool. Compilation time, binary size and run time (with asserts disabled) should be improved
|
15 years ago |