From 5ec802a3d4fc23c2ad7ca487501a5814dbbea350 Mon Sep 17 00:00:00 2001 From: Jonathan G Rennison Date: Sat, 30 Jul 2022 21:17:00 +0100 Subject: [PATCH] VarAction2: Allow substituting perm store loads through temp store --- src/newgrf.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/newgrf.cpp b/src/newgrf.cpp index 72352725c4..e25334f662 100644 --- a/src/newgrf.cpp +++ b/src/newgrf.cpp @@ -7912,9 +7912,7 @@ static std::bitset<256> HandleVarAction2DeadStoreElimination(DeterministicSprite bool inverted = false; const DeterministicSpriteGroupAdjust *var_src = GetVarAction2PreviousSingleLoadAdjust(group->adjusts, prev_load_index, &inverted); - if (var_src != nullptr && var_src->variable != 0x7C) { - /* Don't use variable 7C as we're not checking for store perms which may clobber the value here */ - + if (var_src != nullptr) { if (TryCombineTempStoreLoadWithStoreSourceAdjust(target, var_src, inverted)) return true; } return false;