From e47082bf7b77eaec0c2f7fbbaa242f9dd2e09fae Mon Sep 17 00:00:00 2001 From: Peter Nelson Date: Fri, 21 Mar 2025 18:13:31 +0000 Subject: [PATCH] Codefix: Don't look up NewGRF Action 6-modified data twice. (#13863) --- src/newgrf.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/newgrf.cpp b/src/newgrf.cpp index 0e2a85d0c3..8bc8971df7 100644 --- a/src/newgrf.cpp +++ b/src/newgrf.cpp @@ -9860,16 +9860,14 @@ static void DecodeSpecialSprite(uint8_t *buf, uint num, GrfLoadingStage stage) /* 0x14 */ { StaticGRFInfo, nullptr, nullptr, nullptr, nullptr, nullptr, }, }; - GRFLocation location(_cur.grfconfig->ident.grfid, _cur.nfo_line); - - GRFLineToSpriteOverride::iterator it = _grf_line_to_action6_sprite_override.find(location); + auto it = _grf_line_to_action6_sprite_override.find({_cur.grfconfig->ident.grfid, _cur.nfo_line}); if (it == _grf_line_to_action6_sprite_override.end()) { /* No preloaded sprite to work with; read the * pseudo sprite content. */ _cur.file->ReadBlock(buf, num); } else { /* Use the preloaded sprite data. */ - buf = _grf_line_to_action6_sprite_override[location].data(); + buf = it->second.data(); GrfMsg(7, "DecodeSpecialSprite: Using preloaded pseudo sprite data"); /* Skip the real (original) content of this action. */