From 52259574da28113f9e09c4d26f0bc34aa8545e0a Mon Sep 17 00:00:00 2001
From: MetricExpansion <>
Date: Tue, 27 Oct 2020 23:39:10 -0700
Subject: [PATCH] More fixup of Outfit System code

---
 SkyrimOutfitSystemSE.vcxproj        |  4 ++--
 include/ArmorAddonOverrideService.h |  2 +-
 src/OutfitSystem.cpp                | 10 +++++-----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/SkyrimOutfitSystemSE.vcxproj b/SkyrimOutfitSystemSE.vcxproj
index e172e7d..5ab3908 100644
--- a/SkyrimOutfitSystemSE.vcxproj
+++ b/SkyrimOutfitSystemSE.vcxproj
@@ -76,7 +76,7 @@
       <LanguageStandard>stdcpp17</LanguageStandard>
       <UseFullPaths>false</UseFullPaths>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <ConformanceMode>true</ConformanceMode>
+      <ConformanceMode>false</ConformanceMode>
       <SDLCheck>false</SDLCheck>
       <AdditionalOptions>/experimental:external /external:anglebrackets /external:W0 /Zc:alignedNew /Zc:auto /Zc:char8_t /Zc:__cplusplus /Zc:externC /Zc:externConstexpr /Zc:forScope /Zc:hiddenFriend /Zc:implicitNoexcept /Zc:lambda /Zc:noexceptTypes /Zc:preprocessor /Zc:referenceBinding /Zc:rvalueCast /Zc:sizedDealloc /Zc:strictStrings /Zc:ternary /Zc:threadSafeInit /Zc:tlsGuards /Zc:trigraphs /Zc:wchar_t  /Zc:twoPhase- %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
@@ -121,7 +121,7 @@
       <CompileAs>CompileAsCpp</CompileAs>
       <LanguageStandard>stdcpp17</LanguageStandard>
       <UseFullPaths>false</UseFullPaths>
-      <ConformanceMode>true</ConformanceMode>
+      <ConformanceMode>false</ConformanceMode>
       <SDLCheck>false</SDLCheck>
       <AdditionalOptions>/experimental:external /external:anglebrackets /external:W0 /Zc:alignedNew /Zc:auto /Zc:char8_t /Zc:__cplusplus /Zc:externC /Zc:externConstexpr /Zc:forScope /Zc:hiddenFriend /Zc:implicitNoexcept /Zc:lambda /Zc:noexceptTypes /Zc:preprocessor /Zc:referenceBinding /Zc:rvalueCast /Zc:sizedDealloc /Zc:strictStrings /Zc:ternary /Zc:threadSafeInit /Zc:tlsGuards /Zc:trigraphs /Zc:wchar_t  /Zc:twoPhase- %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
diff --git a/include/ArmorAddonOverrideService.h b/include/ArmorAddonOverrideService.h
index f278d15..d1a2681 100644
--- a/include/ArmorAddonOverrideService.h
+++ b/include/ArmorAddonOverrideService.h
@@ -26,7 +26,7 @@ struct Outfit {
    void load(SKSESerializationInterface* intfc, UInt32 version); // can throw ArmorAddonOverrideService::load_error
    void save(SKSESerializationInterface*) const; // can throw ArmorAddonOverrideService::save_error
 };
-constexpr char* g_noOutfitName = "";
+const char* g_noOutfitName = "";
 static Outfit g_noOutfit(g_noOutfitName); // can't be const; prevents us from assigning it to Outfit&s
 
 class ArmorAddonOverrideService {
diff --git a/src/OutfitSystem.cpp b/src/OutfitSystem.cpp
index d282ce0..d63226c 100644
--- a/src/OutfitSystem.cpp
+++ b/src/OutfitSystem.cpp
@@ -6,11 +6,11 @@
 
 #include "skse64/GameRTTI.h"
 
-#include "RE/TESObjectARMO.h"
-#include "RE/TESDataHandler.h"
-#include "RE/Actor.h"
-#include "RE/InventoryChanges.h"
-#include "RE/InventoryEntryData.h"
+#include "RE/FormComponents/TESForm/TESObject/TESBoundObject/TESObjectARMO.h"
+#include "RE/FileIO/TESDataHandler.h"
+#include "RE/FormComponents/TESForm/TESObjectREFR/Actor/Actor.h"
+#include "RE/Inventory/InventoryChanges.h"
+#include "RE/Inventory/InventoryEntryData.h"
 #include "ArmorAddonOverrideService.h"
 
 #include "cobb/strings.h"