From 3e07e88e43cd5bce61df33d6d0bee084c32110aa Mon Sep 17 00:00:00 2001 From: The Dax Date: Thu, 28 Nov 2013 16:28:25 -0500 Subject: [PATCH] Don't break savestates made by HD Remasters. --- Core/MemMap.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Core/MemMap.cpp b/Core/MemMap.cpp index 80d28d0da7..1f5c1773f1 100644 --- a/Core/MemMap.cpp +++ b/Core/MemMap.cpp @@ -106,14 +106,15 @@ void DoState(PointerWrap &p) return; if (s < 2) { - g_MemorySize = RAM_NORMAL_SIZE; + if (!g_RemasterMode) + g_MemorySize = RAM_NORMAL_SIZE; g_PSPModel = PSP_MODEL_FAT; } else { p.Do(g_PSPModel); p.DoMarker("PSPModel"); - - g_MemorySize = g_PSPModel == PSP_MODEL_FAT ? RAM_NORMAL_SIZE : RAM_DOUBLE_SIZE; + if (!g_RemasterMode) + g_MemorySize = g_PSPModel == PSP_MODEL_FAT ? RAM_NORMAL_SIZE : RAM_DOUBLE_SIZE; } p.DoArray(m_pRAM, g_MemorySize);