mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-28 01:04:50 +01:00
Code Issues Releases Wiki Activity

Replace custom BitCount implementation with std::popcount (C++20)

Browse Source
This commit is contained in:
Aaron van Geffen
2024-07-12 14:30:55 +02:00
parent 6072545c0c
commit 6bea2e8190
4 changed files with 8 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/openrct2/peep/GuestPathfinding.cpp
View File

@@ -22,6 +22,7 @@
#include "../world/Entrance.h"
#include "../world/Footpath.h"
#include <bit>
#include <bitset>
#include <cstring>
@@ -848,7 +849,7 @@ namespace OpenRCT2::PathFinding
searchResult = PathSearchResult::Thin;
uint8_t numEdges = BitCount(tileElement->AsPath()->GetEdges());
uint8_t numEdges = std::popcount(tileElement->AsPath()->GetEdges());
if (numEdges < 2)
{
@@ -1371,7 +1372,7 @@ namespace OpenRCT2::PathFinding
* edge that gives the best (i.e. smallest) value (best_score)
* or for different edges with equal value, the edge with the
* least steps (best_sub). */
int32_t numEdges = BitCount(edges);
int32_t numEdges = std::popcount(edges);
for (int32_t testEdge = chosenEdge; testEdge != -1; testEdge = UtilBitScanForward(edges))
{
edges &= ~(1 << testEdge);
@@ -1994,7 +1995,7 @@ namespace OpenRCT2::PathFinding
if (peep.HasItem(ShopItem::Map))
{
// If at least 2 directions consult map
if (BitCount(edges) >= 2)
if (std::popcount(edges) >= 2)
{
uint16_t probability = 1638;
if (peep.HeadingForRideOrParkExit())