From bdda16a4f05926a003df59b018312008a0ebe228 Mon Sep 17 00:00:00 2001 From: Magnus Norddahl Date: Thu, 7 Dec 2023 13:07:08 +0100 Subject: [PATCH] Fixes that got lost in the rebase --- src/maploader/maploader.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/maploader/maploader.cpp b/src/maploader/maploader.cpp index e974655a6..983712440 100644 --- a/src/maploader/maploader.cpp +++ b/src/maploader/maploader.cpp @@ -2995,15 +2995,16 @@ void MapLoader::InitLevelMesh(MapData* map) for (unsigned int i = 0; i < Level->sides.Size(); i++) { auto& side = Level->sides[i]; - side.surface = &Level->Surfaces[offset]; - offset += 4 + side.sector->e->XFloor.ffloors.Size(); + int count = 4 + side.sector->e->XFloor.ffloors.Size(); + side.surface = TArrayView(&Level->Surfaces[offset], count); + offset += count; } for (unsigned int i = 0; i < Level->subsectors.Size(); i++) { auto& subsector = Level->subsectors[i]; unsigned int count = 1 + subsector.sector->e->XFloor.ffloors.Size(); - subsector.surface[0] = &Level->Surfaces[offset]; - subsector.surface[1] = &Level->Surfaces[offset + count]; + subsector.surface[0] = TArrayView(&Level->Surfaces[offset], count); + subsector.surface[1] = TArrayView(&Level->Surfaces[offset + count], count); offset += count * 2; }