From 873fff25136953f2da9a0427b2f168510ede49e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=CE=B6eh=20Matt?= <5415177+ZehMatt@users.noreply.github.com>
Date: Tue, 27 Jun 2023 22:45:19 +0300
Subject: [PATCH] Remove BitCountInit and handle that with static
 initialization

---
 src/openrct2/platform/Platform.Common.cpp | 1 -
 src/openrct2/util/Util.cpp                | 7 +------
 src/openrct2/util/Util.h                  | 1 -
 3 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/src/openrct2/platform/Platform.Common.cpp b/src/openrct2/platform/Platform.Common.cpp
index 5f094ac6d8..83b4e13fa9 100644
--- a/src/openrct2/platform/Platform.Common.cpp
+++ b/src/openrct2/platform/Platform.Common.cpp
@@ -48,7 +48,6 @@ namespace Platform
             Platform::AndroidInitClassLoader();
 #endif // __ANDROID__
 
-            BitCountInit();
             MaskInit();
         }
     }
diff --git a/src/openrct2/util/Util.cpp b/src/openrct2/util/Util.cpp
index b8a0806d15..7979d9a75f 100644
--- a/src/openrct2/util/Util.cpp
+++ b/src/openrct2/util/Util.cpp
@@ -204,12 +204,7 @@ static int32_t BitCountLut(uint32_t source)
         + BitsSetTable256[source >> 24];
 }
 
-static int32_t (*BitCountFn)(uint32_t);
-
-void BitCountInit()
-{
-    BitCountFn = BitCountPopcntAvailable() ? BitCountPopcnt : BitCountLut;
-}
+static const auto BitCountFn = BitCountPopcntAvailable() ? BitCountPopcnt : BitCountLut;
 
 int32_t BitCount(uint32_t source)
 {
diff --git a/src/openrct2/util/Util.h b/src/openrct2/util/Util.h
index 5ec8b7e6fb..ef3809a0b2 100644
--- a/src/openrct2/util/Util.h
+++ b/src/openrct2/util/Util.h
@@ -28,7 +28,6 @@ bool AVX2Available();
 
 int32_t UtilBitScanForward(int32_t source);
 int32_t UtilBitScanForward(int64_t source);
-void BitCountInit();
 int32_t BitCount(uint32_t source);
 int32_t StrLogicalCmp(char const* a, char const* b);
 char* SafeStrCpy(char* destination, const char* source, size_t num);