From cd89e90664d5e56611e1facc6a75eb8e902cba18 Mon Sep 17 00:00:00 2001 From: Benjamin Moir Date: Sun, 21 Apr 2024 14:58:46 +1000 Subject: [PATCH] SaveState: Remove SavestateEntry_EmotionExtraMemory --- pcsx2/SaveState.cpp | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/pcsx2/SaveState.cpp b/pcsx2/SaveState.cpp index e659476fe47f8b..44b051327eb7bc 100644 --- a/pcsx2/SaveState.cpp +++ b/pcsx2/SaveState.cpp @@ -510,7 +510,7 @@ class SavestateEntry_EmotionMemory final : public MemorySavestateEntry const char* GetFilename() const override { return "eeMemory.bin"; } u8* GetDataPtr() const override { return eeMem->Main; } - uint GetDataSize() const override { return sizeof(eeMem->Main); } + uint GetDataSize() const override { return CHECK_EXTRAMEM ? Ps2MemSize::TotalRam : sizeof(eeMem->Main); } virtual bool FreezeIn(zip_file_t* zf) const override { @@ -518,17 +518,6 @@ class SavestateEntry_EmotionMemory final : public MemorySavestateEntry } }; -class SavestateEntry_EmotionExtraMemory final : public MemorySavestateEntry -{ -public: - ~SavestateEntry_EmotionExtraMemory() override = default; - - const char* GetFilename() const override { return "eeExtraMem.bin"; } - u8* GetDataPtr() const override { return eeMem->ExtraMemory; } - uint GetDataSize() const override { return sizeof(eeMem->ExtraMemory); } - virtual bool IsRequired() const override { return CHECK_EXTRAMEM; } -}; - class SavestateEntry_IopMemory final : public MemorySavestateEntry { public: @@ -701,7 +690,6 @@ class SaveStateEntry_Achievements final : public BaseSavestateEntry static const std::unique_ptr SavestateEntries[] = { std::unique_ptr(new SavestateEntry_EmotionMemory), - std::unique_ptr(new SavestateEntry_EmotionExtraMemory), std::unique_ptr(new SavestateEntry_IopMemory), std::unique_ptr(new SavestateEntry_HwRegs), std::unique_ptr(new SavestateEntry_IopHwRegs),