From e22eb89b92bcb7c714a3dc427f429c9fdd3bc2a1 Mon Sep 17 00:00:00 2001 From: Peter Nelson Date: Wed, 10 Jul 2024 20:20:54 +0100 Subject: [PATCH] Codechange: Call BSWAP32() in the default_grf_overrides initializer. This causes the BSWAP32 calls to happen only on first initialisation (BSWAP32 is not constexpr), instead of every time GRFs are reloaded. --- src/newgrf.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/newgrf.cpp b/src/newgrf.cpp index e78d15af51..3458535b18 100644 --- a/src/newgrf.cpp +++ b/src/newgrf.cpp @@ -10076,12 +10076,12 @@ void LoadNewGRF(uint load_index, uint num_baseset) if (stage == GLS_RESERVE) { static const std::pair default_grf_overrides[] = { - { 0x44442202, 0x44440111 }, // UKRS addons modifies UKRS - { 0x6D620402, 0x6D620401 }, // DBSetXL ECS extension modifies DBSetXL - { 0x4D656f20, 0x4D656F17 }, // LV4cut modifies LV4 + { BSWAP32(0x44442202), BSWAP32(0x44440111) }, // UKRS addons modifies UKRS + { BSWAP32(0x6D620402), BSWAP32(0x6D620401) }, // DBSetXL ECS extension modifies DBSetXL + { BSWAP32(0x4D656f20), BSWAP32(0x4D656F17) }, // LV4cut modifies LV4 }; for (const auto &grf_override : default_grf_overrides) { - SetNewGRFOverride(BSWAP32(grf_override.first), BSWAP32(grf_override.second)); + SetNewGRFOverride(grf_override.first, grf_override.second); } }