Have Cheat UI validate via CEnhancement

project64 · Mar 4, 2021 · bc81e04 · bc81e04
1 parent 43a2081
commit bc81e04
Show file tree

Hide file tree

Showing 6 changed files with 71 additions and 236 deletions.
diff --git a/Source/Project64-core/N64System/Enhancement/Enhancement.cpp b/Source/Project64-core/N64System/Enhancement/Enhancement.cpp
@@ -4,6 +4,9 @@
 #include <Project64-core/N64System/SystemGlobals.h>
 #include <Project64-core/N64System/N64Class.h>
 
+const char * CEnhancement::CheatIdent = "Cheat";
+const char * CEnhancement::EnhancementIdent = "Enhancement";
+
 #pragma warning(disable:4996)
 
 static std::string GenerateKeyName(const char * Name, const char * Ident, const char * PostIdent)

diff --git a/Source/Project64-core/N64System/Enhancement/Enhancement.h b/Source/Project64-core/N64System/Enhancement/Enhancement.h
@@ -6,6 +6,9 @@
 class CEnhancement
 {
 public:
+    static const char * CheatIdent;
+    static const char * EnhancementIdent;
+
     struct CodeEntry
     {
         uint32_t Command;
@@ -46,7 +49,6 @@ class CEnhancement
 
 private:
     CEnhancement();
-    CEnhancement& operator=(const CEnhancement&);
 
     void CheckValid();
 

diff --git a/Source/Project64-core/N64System/Enhancement/Enhancements.cpp b/Source/Project64-core/N64System/Enhancement/Enhancements.cpp
@@ -94,7 +94,7 @@ void CEnhancements::UpdateCheats(const CEnhancementList & Cheats)
         {
             m_CheatFiles.erase(CheatFileItr);
         }
-        m_CheatFile = std::make_unique<CEnhancmentFile>(OutFile, "Cheat");
+        m_CheatFile = std::make_unique<CEnhancmentFile>(OutFile, CEnhancement::CheatIdent);
         m_CheatFiles.insert(SectionFiles::value_type(SectionIdent, OutFile));
     }
 
@@ -140,7 +140,7 @@ void CEnhancements::UpdateEnhancements(const CEnhancementList & Enhancements)
         {
             m_EnhancementFiles.erase(EnhancementFileItr);
         }
-        m_EnhancementFile = std::make_unique<CEnhancmentFile>(OutFile, "Enhancement");
+        m_EnhancementFile = std::make_unique<CEnhancmentFile>(OutFile, CEnhancement::EnhancementIdent);
         m_EnhancementFiles.insert(SectionFiles::value_type(SectionIdent, OutFile));
     }
 
@@ -248,8 +248,8 @@ void CEnhancements::Load(CMipsMemoryVM * MMU, CPlugins * Plugins)
     WaitScanDone();
     CGuard Guard(m_CS);
 
-    LoadEnhancements("Cheat", m_CheatFiles, m_CheatFile, m_Cheats);
-    LoadEnhancements("Enhancement", m_EnhancementFiles, m_EnhancementFile, m_Enhancements);
+    LoadEnhancements(CEnhancement::CheatIdent, m_CheatFiles, m_CheatFile, m_Cheats);
+    LoadEnhancements(CEnhancement::EnhancementIdent, m_EnhancementFiles, m_EnhancementFile, m_Enhancements);
 
     ResetCodes(MMU);
     LoadActive(m_Cheats, nullptr);
@@ -582,7 +582,7 @@ void CEnhancements::ScanFileThread(void)
     {
         do
         {
-            CEnhancmentFile EnhancmentFile(File, "Cheat");
+            CEnhancmentFile EnhancmentFile(File, CEnhancement::CheatIdent);
             CEnhancmentFile::SectionList Sections;
             EnhancmentFile.GetSections(Sections);
             for (CEnhancmentFile::SectionList::const_iterator itr = Sections.begin(); itr != Sections.end(); itr++)
@@ -600,7 +600,7 @@ void CEnhancements::ScanFileThread(void)
     {
         do
         {
-            CEnhancmentFile EnhancmentFile(File, "Cheat");
+            CEnhancmentFile EnhancmentFile(File, CEnhancement::CheatIdent);
             CEnhancmentFile::SectionList Sections;
             EnhancmentFile.GetSections(Sections);
             for (CEnhancmentFile::SectionList::const_iterator itr = Sections.begin(); itr != Sections.end(); itr++)