Jonathan G Rennison
|
822ecae85d
|
Merge branch 'master' into jgrpp
# Conflicts:
# src/cargotype.h
# src/core/CMakeLists.txt
# src/core/span_type.hpp
# src/fileio.cpp
# src/fios.cpp
# src/misc/endian_buffer.hpp
# src/misc_gui.cpp
# src/saveload/saveload.h
# src/saveload/vehicle_sl.cpp
# src/screenshot.cpp
# src/settings.cpp
# src/settings_internal.h
# src/stdafx.h
# src/string_func.h
# src/strings.cpp
# src/strings_func.h
# src/strings_internal.h
|
4 months ago |
Rubidium
|
47c0184a0b
|
Codechange: replace ROR/ROL with std::rotr/rotl
|
5 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
|
55d78a23be
|
Merge branch 'master' into jgrpp
# Conflicts:
# src/3rdparty/squirrel/include/squirrel.h
# src/blitter/32bpp_sse_func.hpp
# src/bridge_map.h
# src/clear_map.h
# src/company_manager_face.h
# src/console_func.h
# src/core/bitmath_func.hpp
# src/core/endian_func.hpp
# src/core/random_func.hpp
# src/depot_map.h
# src/elrail_func.h
# src/fontcache.h
# src/industry_map.h
# src/map_func.h
# src/newgrf_spritegroup.h
# src/object_map.h
# src/rail.h
# src/rail_map.h
# src/road_func.h
# src/road_map.h
# src/saveload/saveload.h
# src/saveload/saveload_error.hpp
# src/settings_gui.cpp
# src/sl/oldloader.h
# src/sprite.h
# src/spritecache.h
# src/station_func.h
# src/station_map.h
# src/story_base.h
# src/strings_func.h
# src/tile_cmd.h
# src/tile_map.h
# src/tile_type.h
# src/town.h
# src/town_map.h
# src/tree_map.h
# src/tunnel_map.h
# src/tunnelbridge_map.h
# src/vehicle_func.h
# src/viewport_func.h
# src/void_map.h
# src/water.h
# src/water_map.h
# src/widget_type.h
|
5 months ago |
|
Rubidium
|
3a676a5af0
|
Codechange: replace static inline with static for non-class functions
|
5 months ago |
|
Jonathan G Rennison
|
88670a230f
|
Merge branch 'master' into jgrpp
# Conflicts:
# src/articulated_vehicles.cpp
# src/articulated_vehicles.h
# src/base_media_base.h
# src/base_media_func.h
# src/build_vehicle_gui.cpp
# src/dock_gui.cpp
# src/main_gui.cpp
# src/music_gui.cpp
# src/network/network_chat_gui.cpp
# src/network/network_content.cpp
# src/newgrf.cpp
# src/newgrf_roadstop.cpp
# src/os/windows/string_uniscribe.h
# src/os/windows/win32.cpp
# src/rail_gui.cpp
# src/road.cpp
# src/road_gui.cpp
# src/settings.cpp
# src/settings_gui.cpp
# src/smallmap_gui.cpp
# src/strings.cpp
# src/terraform_gui.cpp
# src/tests/test_script_admin.cpp
# src/tests/test_window_desc.cpp
# src/timer/timer_game_calendar.h
# src/vehicle.cpp
# src/vehicle_base.h
# src/viewport.cpp
# src/widget_type.h
# src/window.cpp
# src/window_gui.h
|
6 months ago |
|
Rubidium
|
c6411168d8
|
Cleanup: missing spaces before continuation * in some comments
|
7 months ago |
|
Jonathan G Rennison
|
a48a3ac07b
|
Fix 87911bdf: Fix FindLastBit for unsigned long long (uint64 on Windows)
See: #594
|
9 months ago |
|
Jonathan G Rennison
|
87911bdf47
|
Use bitmath builtins for FindLastBit
|
10 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
|
11 months ago |
|
Jonathan G Rennison
|
9521e7ef2b
|
Merge branch 'master' into jgrpp
# Conflicts:
# src/elrail.cpp
# src/ground_vehicle.hpp
# src/landscape.cpp
# src/saveload/afterload.cpp
# src/saveload/saveload.h
# src/tile_cmd.h
# src/town_cmd.cpp
# src/tunnelbridge_cmd.cpp
|
1 year ago |
|
Rubidium
|
41ef7c88af
|
Codechange: make a numer of Slope related functions constexpr
|
1 year ago |
|
Jonathan G Rennison
|
483e3172af
|
Merge branch 'master' into jgrpp
# Conflicts:
# src/core/strong_typedef_type.hpp
# src/gfx.cpp
# src/group_cmd.cpp
# src/industry_cmd.cpp
# src/map_func.h
# src/newgrf_debug_gui.cpp
# src/order_cmd.cpp
# src/pathfinder/follow_track.hpp
# src/rail_cmd.cpp
# src/road_cmd.cpp
# src/road_gui.cpp
# src/saveload/saveload.cpp
# src/screenshot.cpp
# src/smallmap_gui.cpp
# src/station_cmd.cpp
# src/strings.cpp
# src/tile_type.h
# src/timetable_gui.cpp
# src/town_cmd.cpp
# src/train_cmd.cpp
# src/viewport.cpp
|
1 year ago |
|
Rubidium
|
b7a5d8e296
|
Codechange: add annotation to selectively force inlining in debug build
|
1 year ago |
|
Jonathan G Rennison
|
29521ef883
|
Fix SB function when using sizes greater than 32 bits
|
2 years ago |
frosch
|
bc22e9333e
|
Fix: if vehicles only refit to cargo-slots >= 32, the default cargo was wrong. (#9744)
|
3 years ago |
|
Jonathan G Rennison
|
c6bd01b2f2
|
Add an IsOddParity bitmath function
|
3 years ago |
|
Jonathan G Rennison
|
914da4bdb9
|
Fix 1e0bea5b: Incorrect extern declarations
|
3 years ago |
|
Jonathan G Rennison
|
de5de583e3
|
Rationalise FIND_FIRST_BIT/FindFirstBit2x64
Use builtins for FindFirstBit2x64.
Apply and masks to prevent undefined behaviour if inputs out of range
|
3 years ago |
|
Jonathan G Rennison
|
1e0bea5b8d
|
Replace FindFirstBit/FindFirstBit64 with a single template function
|
3 years ago |
|
Jonathan G Rennison
|
d585ce75dd
|
Use bitmath builtins for SetBitIterator when available
|
3 years ago |
|
Jonathan G Rennison
|
f54d69a60a
|
Merge branch 'master' into jgrpp-beta
# Conflicts:
# src/economy.cpp
# src/elrail.cpp
# src/graph_gui.cpp
# src/linkgraph/linkgraph_gui.cpp
# src/network/core/game_info.cpp
# src/newgrf_station.cpp
# src/saveload/saveload.cpp
# src/settings.cpp
# src/station_cmd.cpp
# src/station_gui.cpp
# src/strings_func.h
# src/table/settings/network_settings.ini
# src/table/settings/settings.ini
|
3 years ago |
glx22
|
ce813ce644
|
Cleanup: Remove now unused FOR_EACH_SET_BIT_EX macro
|
3 years ago |
|
glx22
|
89ab8b79a5
|
Codechange: Remove FOR_EACH_SET_BIT
|
3 years ago |
|
Jonathan G Rennison
|
563037e401
|
Add brackets around bitmath macro definitions
|
4 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 |
Nikolas Nyby
|
28e11623bd
|
Codechange: math functions - use cpp-style casts
|
5 years ago |
|
Jonathan G Rennison
|
62713ad106
|
Fix missing declaration in c8a37d82
|
5 years ago |
|
Jonathan G Rennison
|
4b9a4ae695
|
Use consistent casts/types for byte swap functions
|
5 years ago |
|
Jonathan G Rennison
|
c8a37d8292
|
Add 64 bit FindFirstBit function
|
5 years ago |
|
Jonathan G Rennison
|
326b3aa66a
|
Merge branch 'save_ext' into jgrpp
|
5 years ago |
|
Jonathan G Rennison
|
43ddaf4c5c
|
Fix incorrect implementation of non-builtin BSWAP64
|
5 years ago |
|
Jonathan G Rennison
|
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
|
5 years ago |
|
Jonathan G Rennison
|
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 |
|
frosch
|
18ca3e8660
|
Fix: [NewGRF] Make VA2 operator 11 (ror) behave well-defined when rotating by 0 bits.
|
6 years ago |
|
Jonathan G Rennison
|
fd4d9591c1
|
Merge branch 'save_ext' into jgrpp
|
6 years ago |
|
Jonathan G Rennison
|
6862343eb3
|
Fix wrong type cast in Apple BSWAP64 macro
|
6 years ago |
|
Jonathan G Rennison
|
159909f4b1
|
Merge branch 'save_ext' into jgrpp
# Conflicts:
# src/saveload/saveload.cpp
|
6 years ago |
|
Jonathan G Rennison
|
9ca4e915ba
|
Add 64 bit byte swapping function
|
6 years ago |
|
Jonathan G Rennison
|
0bd33eff1e
|
Fixes use of builtins in CountBits for small and/or signed input types.
|
8 years ago |
|
Jonathan G Rennison
|
a8e0862500
|
Enable prefetch and bswap buitins for clang.
|
8 years ago |
|
Jonathan G Rennison
|
349cd8a6f0
|
Where possible use compiler builtins for CountBits and FindFirstBit.
|
8 years ago |
michi_cc
|
8bb76958fa
|
(svn r25685) -Codechange: [OSX] Use non-deprecated functions for byte swapping.
|
11 years ago |
|
michi_cc
|
de097dd989
|
(svn r25685) -Codechange: [OSX] Use non-deprecated functions for byte swapping.
|
11 years ago |
|
rubidium
|
13c769ff00
|
(svn r24959) -Doc [FS#5459]: that certain parameters need to be within certain boundaries
|
11 years ago |
|
rubidium
|
6be79c424d
|
(svn r24959) -Doc [FS#5459]: that certain parameters need to be within certain boundaries
|
11 years ago |
alberth
|
19adc87262
|
(svn r24776) -Doc: Typo fixes, additions, and additional dots collected from various sources (including Eagle_rainbow, MinchinWeb)
|
12 years ago |
|
alberth
|
732e073261
|
(svn r24776) -Doc: Typo fixes, additions, and additional dots collected from various sources (including Eagle_rainbow, MinchinWeb)
|
12 years ago |
truebrain
|
aa1a0053b0
|
(svn r23640) -Fix: stop using FORCEINLINE (1/3rd of the instances were, the others were still regular inline), but make sure inline is always a 'forced' inline (I am looking at you MSVC)
|
13 years ago |