Jonathan G Rennison
|
0e76f774eb
|
Merge branch 'master' into jgrpp
# Conflicts:
# src/landscape.cpp
# src/landscape.h
# src/misc_gui.cpp
# src/newgrf_commons.cpp
# src/order_cmd.cpp
# src/pathfinder/yapf/yapf_base.hpp
# src/station_cmd.cpp
# src/tunnelbridge_cmd.cpp
# src/vehicle.cpp
# src/water_cmd.cpp
# src/window.cpp
|
7 months ago |
Michael Lutz
|
8dda387f82
|
Codechange: Use std::tuple for slope functions with two return values
|
7 months ago |
Jonathan G Rennison
|
97e6f3062e
|
Adding of _t to (u)int types, and WChar to char32_t
See: eaae0bb5e
|
9 months ago |
Jonathan G Rennison
|
f034714559
|
Use StringBuilder for GetString/GetStringWithArgs, as per upstream
Update dependent code as required
|
9 months ago |
Rubidium
|
eaae0bb5e7
|
Codechange: automatic adding of _t to (u)int types, and WChar to char32_t
for i in `find src -type f|grep -v 3rdparty/fmt|grep -v 3rdparty/catch2|grep -v 3rdparty/opengl|grep -v stdafx.h`; do sed 's/uint16& /uint16 \&/g;s/int8\([ >*),;[]\)/int8_t\1/g;s/int16\([ >*),;[]\)/int16_t\1/g;s/int32\([ >*),;[]\)/int32_t\1/g;s/int64\([ >*),;[]\)/int64_t\1/g;s/ uint32(/ uint32_t(/g;s/_uint8_t/_uint8/;s/Uint8_t/Uint8/;s/ft_int64_t/ft_int64/g;s/uint64$/uint64_t/;s/WChar/char32_t/g;s/char32_t char32_t/char32_t WChar/' -i $i; done
|
1 year ago |
Jonathan G Rennison
|
3a47b421b0
|
Merge branch 'master' into jgrpp
# Conflicts:
# src/company_cmd.cpp
# src/core/overflowsafe_type.hpp
# src/economy.cpp
# src/engine_base.h
# src/ground_vehicle.cpp
# src/group_gui.cpp
# src/industry_cmd.cpp
# src/industry_gui.cpp
# src/newgrf_commons.cpp
# src/newgrf_engine.cpp
# src/newgrf_industries.cpp
# src/newgrf_object.cpp
# src/newgrf_roadstop.cpp
# src/newgrf_station.cpp
# src/rail_gui.cpp
# src/road_cmd.h
# src/road_gui.cpp
# src/saveload/afterload.cpp
# src/script/api/script_log.cpp
# src/script/api/script_log.hpp
# src/settings_gui.cpp
# src/settingsgen/settingsgen.cpp
# src/station_cmd.cpp
# src/station_cmd.h
# src/station_gui.cpp
# src/strgen/strgen.cpp
# src/string_func.h
# src/string_type.h
# src/table/settings/network_private_settings.ini
# src/tests/math_func.cpp
# src/textfile_gui.cpp
# src/timetable_gui.cpp
# src/town_cmd.cpp
# src/vehicle.cpp
# src/waypoint_cmd.cpp
# src/waypoint_cmd.h
# src/widgets/dropdown.cpp
|
1 year ago |
Jonathan G Rennison
|
fd4d4d341d
|
Merge branch 'master' into jgrpp
# Conflicts:
# src/animated_tile.cpp
# src/cargopacket.h
# src/cheat_gui.cpp
# src/company_cmd.cpp
# src/company_gui.cpp
# src/date.cpp
# src/disaster_vehicle.cpp
# src/dock_gui.cpp
# src/economy.cpp
# src/engine.cpp
# src/error_gui.cpp
# src/fontcache/spritefontcache.cpp
# src/game/game_gui.cpp
# src/game/game_text.cpp
# src/gfx.cpp
# src/graph_gui.cpp
# src/highscore_gui.cpp
# src/industry_cmd.cpp
# src/lang/dutch.txt
# src/lang/english_AU.txt
# src/lang/english_US.txt
# src/lang/finnish.txt
# src/lang/french.txt
# src/lang/italian.txt
# src/lang/portuguese.txt
# src/lang/russian.txt
# src/lang/turkish.txt
# src/lang/vietnamese.txt
# src/main_gui.cpp
# src/misc_gui.cpp
# src/network/network_gui.cpp
# src/network/network_server.cpp
# src/newgrf.cpp
# src/newgrf.h
# src/newgrf_generic.cpp
# src/news_gui.cpp
# src/openttd.cpp
# src/os/unix/unix.cpp
# src/os/windows/font_win32.cpp
# src/os/windows/win32.cpp
# src/rail_gui.cpp
# src/road_gui.cpp
# src/saveload/afterload.cpp
# src/saveload/misc_sl.cpp
# src/saveload/oldloader_sl.cpp
# src/saveload/saveload.cpp
# src/saveload/saveload.h
# src/script/script_gui.cpp
# src/settings_table.cpp
# src/signs_gui.cpp
# src/smallmap_gui.cpp
# src/smallmap_gui.h
# src/spritecache.cpp
# src/spritecache.h
# src/spriteloader/grf.cpp
# src/station_cmd.cpp
# src/statusbar_gui.cpp
# src/stdafx.h
# src/strgen/strgen_base.cpp
# src/subsidy.cpp
# src/table/settings/difficulty_settings.ini
# src/texteff.cpp
# src/timetable_cmd.cpp
# src/timetable_gui.cpp
# src/toolbar_gui.cpp
# src/town_cmd.cpp
# src/town_gui.cpp
# src/townname.cpp
# src/vehicle.cpp
# src/waypoint_cmd.cpp
# src/widgets/dropdown.cpp
# src/window.cpp
|
1 year ago |
Rubidium
|
1a179cb297
|
Codechange: use GetString + StrMakeValid to pass string without colours/font sizes to Debug
|
1 year ago |
Rubidium
|
fb856e16c1
|
Codechange: replace some min/clamp constructs to ClampTo
|
1 year ago |
Peter Nelson
|
912eb68981
|
Change: Extend entity override manager and station spec lists to support 16 bit IDs.
|
1 year ago |
Peter Nelson
|
370a8d77a4
|
Codechange: Use simple assignment to assign specs.
|
1 year ago |
Rubidium
|
7088f5b7c7
|
Codechange: use string/fmt instead of printf for grfmsg
|
1 year ago |
Peter Nelson
|
1f46f080f0
|
Codechange: Store objectspecs in std::vector instead of flat array.
|
2 years ago |
Peter Nelson
|
93197f58b7
|
Codechange: Bind objectspecs to classes once all finalised.
|
2 years ago |
Peter Nelson
|
74e4556a85
|
Codechange: Store objectspecs in std::vector instead of flat array.
(cherry picked from commit 1ae263c5467105820e4d770b3d57d25ba01e22b1)
|
2 years ago |
Peter Nelson
|
d34e1bbbc1
|
Codechange: Bind objectspecs to classes once all finalised.
(cherry picked from commit 5f4a8f730b8982cbec7eec5e2331f0bc9217e69e)
|
2 years ago |
Jonathan G Rennison
|
43d58ce6c8
|
GRF: Extend EntityIDMapping/OverrideManagerBase to 16 bit entity IDs
|
2 years ago |
Jonathan G Rennison
|
32fe84cfdd
|
Merge branch 'master' into jgrpp
# Conflicts:
# src/clear_cmd.cpp
# src/main_gui.cpp
# src/saveload/newgrf_sl.cpp
# src/water_cmd.cpp
|
2 years ago |
Peter Nelson
|
ede1201b6a
|
Codechange: Rename override manager variables.
|
2 years ago |
Peter Nelson
|
bcc53c5ad5
|
Codechange: Add missing `this->` in override manager.
Variable scope is also tweaked in a couple of cases reducing line count.
|
2 years ago |
Peter Nelson
|
eedb786872
|
Codechange: Use vector for NewGRF spec overrides.
This replaces C-style memory management.
|
2 years ago |
Rubidium
|
de6bc8e692
|
Codechange: move TILE_MASK to Map::WrapToMap
|
2 years ago |
Jonathan G Rennison
|
2663cc3fdc
|
VarAction2: Adjust masking in GetNearbyTileInformation
|
2 years ago |
Jonathan G Rennison
|
8eb86fa6c7
|
GRF: Use access mask when evaluating get nearby tile information variable
|
2 years ago |
Jonathan G Rennison
|
1084bb8566
|
Initial support for NewGRF road stops (bus and lorry stops)
|
3 years ago |
Jonathan G Rennison
|
afccf04188
|
Report road waypoint tiles as road to GRFs
|
3 years ago |
rubidium42
|
55a11710a6
|
Codechange: convert printf DEBUG statements to fmt Debug statements
|
3 years ago |
rubidium42
|
44ca7d9377
|
Change: Use gender-neutral pronouns
|
3 years ago |
Michael Lutz
|
79240eab1e
|
Codechange: Make use of the improved C++17 emplace_back function.
|
4 years ago |
S. D. Cloudt
|
13cc8a0cee
|
Cleanup: Removed SVN headers
|
5 years ago |
Niels Martin Hansen
|
53f8d0b815
|
Codechange: Use std::vector for industry tile layouts
|
5 years ago |
JMcKiern
|
04f659e768
|
Fix: Some typos found using codespell
|
5 years ago |
Henry Wilson
|
7c8e7c6b6e
|
Codechange: Use null pointer literal instead of the NULL macro
|
6 years ago |
Henry Wilson
|
c01a2e2a81
|
Codechange: Removed SmallVector completely
|
6 years ago |
Henry Wilson
|
ab711e6942
|
Codechange: Replaced SmallVector::[Begin|End]() with std alternatives
|
6 years ago |
Henry Wilson
|
a0f36a50e6
|
Codechange: Replaced SmallVector::Append() with std::vector::[push|emplace]_back()
|
6 years ago |
Henry Wilson
|
bfd79e59dc
|
Codechange: Replace SmallVector::Clear() with std::vector::clear()
|
6 years ago |
rubidium
|
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 |
frosch
|
ba1779b978
|
(svn r26241) -Codechange: Remember the GRFFile which filled the TextRefStack in the TextRefStack.
|
11 years ago |
frosch
|
73c6565cf2
|
(svn r26240) -Codechange: Pass the GRFFile to GetErrorMessageFromLocationCallbackResult instead of the GRFID.
|
11 years ago |
planetmaker
|
c24374f99c
|
(svn r24900) -Fix [FS#5389]: Comments with typos (most fixes supplied by Eagle_rainbow)
|
12 years ago |
rubidium
|
6d6be50ae0
|
(svn r23740) -Codechange: remove some 300 unneeded includes from the .cpp files
|
13 years ago |
alberth
|
4af8c2d5e1
|
(svn r23704) -Doc: Doxygen comment fixes and additions.
|
13 years ago |
rubidium
|
58423b26d1
|
(svn r23474) -Codechange: move the declaration error related functions to error.h
|
13 years ago |
frosch
|
8f4c6d42f9
|
(svn r23154) -Change: [NewGRF v8] Use heightlevel units in nearby tile info variables. (rubidium)
|
13 years ago |
frosch
|
30874b5e81
|
(svn r23147) -Change: [NewGRF v8] Unify the return values of boolean callbacks, and check the results for validity.
|
13 years ago |
frosch
|
d8f8909f85
|
(svn r23142) -Change: [NewGRF v8] Unify the return values of callbacks returning D0xx texts.
|
13 years ago |
frosch
|
56e5144f71
|
(svn r23140) -Add: ErrorUnknownCallbackResult()
|
13 years ago |
rubidium
|
19eabdba2c
|
(svn r23106) -Codechange: pass int* to GetTileSlope and friends
|
13 years ago |
rubidium
|
69162621d8
|
(svn r23096) -Codechange: remove useless divisions and multiplications by TILE_HEIGHT for the snow line code
|
13 years ago |