#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;
Cheats[NumCheats].Descr = strdup(buf + 1);
Cheats[NumCheats].Enabled = 0;
}
+ Cheats[NumCheats].WasEnabled = 0;
Cheats[NumCheats].First = NumCodes;
// 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;
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;
}
}
- Cheats[NumCheats].Descr = strdup(descr[0] ? descr : _("(Untitled)"));
Cheats[NumCheats].Enabled = 0;
+ Cheats[NumCheats].WasEnabled = 0;
Cheats[NumCheats].First = NumCodes;
Cheats[NumCheats].n = 0;
return -1;
}
+ Cheats[NumCheats].Descr = strdup(descr[0] ? descr : _("(Untitled)"));
NumCheats++;
return 0;
}
assert(index >= 0 && index < NumCheats);
free(Cheats[index].Descr);
+ Cheats[index].Descr = NULL;
while (index < NumCheats - 1) {
Cheats[index] = Cheats[index + 1];