X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=libpcsxcore%2Fcheat.c;h=e0cf411e081b6a5c0cf54299ffbd0b42830df271;hb=bf58ac4cd633bbd3c40bd7f79f9e00b98e156572;hp=21d88b8e628d1644f2051de64b5f38aa0faf821b;hpb=ef79bbde537d6b9c745a7d86cb9df1d04c35590d;p=pcsx_rearmed.git

diff --git a/libpcsxcore/cheat.c b/libpcsxcore/cheat.c
index 21d88b8e..e0cf411e 100644
--- a/libpcsxcore/cheat.c
+++ b/libpcsxcore/cheat.c
@@ -19,16 +19,17 @@
 #include "psxcommon.h"
 #include "r3000a.h"
 #include "psxmem.h"
+#include "misc.h"
 
 #include "cheat.h"
 
 Cheat *Cheats = NULL;
 int NumCheats = 0;
-static int NumCheatsAllocated = 0;
+int NumCheatsAllocated = 0;
 
 CheatCode *CheatCodes = NULL;
 int NumCodes = 0;
-static int NumCodesAllocated = 0;
+int NumCodesAllocated = 0;
 
 s8 *prevM = NULL;
 u32 *SearchResults = NULL;
@@ -108,6 +109,7 @@ void LoadCheats(const char *filename) {
 				Cheats[NumCheats].Descr = strdup(buf + 1);
 				Cheats[NumCheats].Enabled = 0;
 			}
+			Cheats[NumCheats].WasEnabled = 0;
 
 			Cheats[NumCheats].First = NumCodes;
 
@@ -182,11 +184,15 @@ void SaveCheats(const char *filename) {
 // apply all enabled cheats
 void ApplyCheats() {
 	int		i, j, k, endindex;
+	int		was_enabled;
 
 	for (i = 0; i < NumCheats; i++) {
+		was_enabled = Cheats[i].WasEnabled;
 		if (!Cheats[i].Enabled) {
-			continue;
+			if (!Cheats[i].WasEnabled)
+				continue;
 		}
+		Cheats[i].WasEnabled = Cheats[i].Enabled;
 
 		// process all cheat codes
 		endindex = Cheats[i].First + Cheats[i].n;
@@ -197,6 +203,22 @@ void ApplyCheats() {
 			u16		val = CheatCodes[j].Val;
 			u32		taddr;
 
+			if (!was_enabled) {
+				switch (type) {
+					case CHEAT_CONST16:
+						CheatCodes[j].OldVal = psxMu16(addr);
+						break;
+					case CHEAT_CONST8:
+						CheatCodes[j].OldVal = psxMu8(addr);
+						break;
+				}
+			}
+			else if (!Cheats[i].Enabled) {
+				val = CheatCodes[j].OldVal;
+				if (type != CHEAT_CONST16 && type != CHEAT_CONST8)
+					continue;
+			}
+
 			switch (type) {
 				case CHEAT_CONST8:
 					psxMu8ref(addr) = (u8)val;
@@ -319,8 +341,8 @@ int AddCheat(const char *descr, char *code) {
 		}
 	}
 
-	Cheats[NumCheats].Descr = strdup(descr[0] ? descr : _("(Untitled)"));
 	Cheats[NumCheats].Enabled = 0;
+	Cheats[NumCheats].WasEnabled = 0;
 	Cheats[NumCheats].First = NumCodes;
 	Cheats[NumCheats].n = 0;
 
@@ -370,6 +392,7 @@ int AddCheat(const char *descr, char *code) {
 		return -1;
 	}
 
+	Cheats[NumCheats].Descr = strdup(descr[0] ? descr : _("(Untitled)"));
 	NumCheats++;
 	return 0;
 }
@@ -378,6 +401,7 @@ void RemoveCheat(int index) {
 	assert(index >= 0 && index < NumCheats);
 
 	free(Cheats[index].Descr);
+	Cheats[index].Descr = NULL;
 
 	while (index < NumCheats - 1) {
 		Cheats[index] = Cheats[index + 1];