From 2c3041081d3261452fbc9fd71170b8462a19837e Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Tue, 15 Sep 2020 21:17:08 +0200 Subject: [PATCH] - remove indirection in picanm access. --- source/core/textures/buildtiles.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/core/textures/buildtiles.cpp b/source/core/textures/buildtiles.cpp index c4c36bed3..8d256bbc2 100644 --- a/source/core/textures/buildtiles.cpp +++ b/source/core/textures/buildtiles.cpp @@ -1104,7 +1104,7 @@ void tileImport(FScriptPosition& pos, TileImport& imp) if (imp.fn.IsNotEmpty() && tileImportFromTexture(imp.fn, imp.tile, imp.alphacut, imp.istexture) < 0) return; - picanm[imp.tile].sf |= imp.flags; + TileFiles.tiledata[imp.tile].picanm.sf |= imp.flags; // This is not quite the same as originally, for two reasons: // 1: Since these are texture properties now, there's no need to clear them. // 2: The original code assumed that an imported texture cannot have an offset. But this can import Doom patches and PNGs with grAb, so the situation is very different. @@ -1113,7 +1113,7 @@ void tileImport(FScriptPosition& pos, TileImport& imp) auto tex = tileGetTexture(imp.tile); if (tex) tex->SetOffsets(imp.xoffset, imp.yoffset); - if (imp.extra != INT_MAX) picanm[imp.tile].extra = imp.extra; + if (imp.extra != INT_MAX) TileFiles.tiledata[imp.tile].picanm.extra = imp.extra; } TileSiz tilesiz;