dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into jgrpp

Browse Source 
# Conflicts:
#	src/core/bitmath_func.cpp
#	src/core/bitmath_func.hpp
#	src/core/geometry_type.hpp
#	src/game/game_text.hpp
#	src/graph_gui.cpp
#	src/pathfinder/npf/npf.cpp
#	src/script/api/script_text.cpp
#	src/spritecache.cpp
#	src/track_func.h
This commit is contained in:
Jonathan G Rennison
2024-01-25 18:45:22 +00:00
parent 78e08fdd18 6b21368bc2
commit 5404be172c
46 changed files with 311 additions and 448 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/tests/bitmath_func.cpp
View File

@@ -21,7 +21,6 @@ TEST_CASE("FindLastBit tests")
CHECK(FindLastBit<uint16_t>(0) == 0);
CHECK(FindLastBit<uint32_t>(0) == 0);
CHECK(FindLastBit<uint64_t>(0) == 0);
CHECK(FindLastBit64(0) == 0);
for (uint i = 0; i < 8; i++) {
uint8_t t = (uint8_t)(1 << i);
@@ -29,7 +28,6 @@ TEST_CASE("FindLastBit tests")
CHECK(FindLastBit<uint16_t>(t) == i);
CHECK(FindLastBit<uint32_t>(t) == i);
CHECK(FindLastBit<uint64_t>(t) == i);
CHECK(FindLastBit64(t) == i);
}
for (uint i = 8; i < 16; i++) {
@@ -37,22 +35,19 @@ TEST_CASE("FindLastBit tests")
CHECK(FindLastBit<uint16_t>(t) == i);
CHECK(FindLastBit<uint32_t>(t) == i);
CHECK(FindLastBit<uint64_t>(t) == i);
CHECK(FindLastBit64(t) == i);
}
for (uint i = 16; i < 32; i++) {
uint32_t t = (1 << i);
CHECK(FindLastBit<uint32_t>(t) == i);
CHECK(FindLastBit<uint64_t>(t) == i);
CHECK(FindLastBit64(t) == i);
}
for (uint i = 32; i < 64; i++) {
uint64_t t = (((uint64_t)1) << i);
CHECK(FindLastBit<uint64_t>(t) == i);
CHECK(FindLastBit64(t) == i);
}
CHECK(FindLastBit(0x42) == FindLastBit(0x40));
CHECK(FindLastBit(0xAAAA) == FindLastBit(0x8000));
CHECK(FindLastBit(0x42U) == FindLastBit(0x40U));
CHECK(FindLastBit(0xAAAAU) == FindLastBit(0x8000U));
}