From 57701cd988c3c88cc0a9295f2ad2c55c5b29dc82 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Mon, 27 May 2019 12:33:46 -0400 Subject: [PATCH] UICommon/ResourcePack: Make TEXTURE_PATH a regular array Same behavior, only it doesn't unnecessarily store a pointer in the executable. While we're at it, make it constexpr and move it into the namespace. --- Source/Core/UICommon/ResourcePack/ResourcePack.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Core/UICommon/ResourcePack/ResourcePack.cpp b/Source/Core/UICommon/ResourcePack/ResourcePack.cpp index e52034f508..4f4169d053 100644 --- a/Source/Core/UICommon/ResourcePack/ResourcePack.cpp +++ b/Source/Core/UICommon/ResourcePack/ResourcePack.cpp @@ -15,10 +15,10 @@ #include "UICommon/ResourcePack/Manager.h" #include "UICommon/ResourcePack/Manifest.h" -static const char* TEXTURE_PATH = "Load/Textures/"; - namespace ResourcePack { +constexpr char TEXTURE_PATH[] = "Load/Textures/"; + // Since minzip doesn't provide a way to unzip a file of a length > 65535, we have to implement // this ourselves static bool ReadCurrentFileUnlimited(unzFile file, std::vector& destination)