Modernize cheat stuff.

snes9xgit · Mar 7, 2023 · 2e39f2f · 2e39f2f
1 parent 9ed560d
commit 2e39f2f
Show file tree

Hide file tree

Showing 8 changed files with 338 additions and 468 deletions.
diff --git a/cheats.cpp b/cheats.cpp
@@ -37,112 +37,6 @@
 	 (s) == S9X_24_BITS ? (((int32) ((*((m) + (o)) + (*((m) + (o) + 1) << 8) + (*((m) + (o) + 2) << 16)) << 8)) >> 8): \
                            ((int32)  (*((m) + (o)) + (*((m) + (o) + 1) << 8) + (*((m) + (o) + 2) << 16) + (*((m) + (o) + 3) << 24))))
 
-static bool8 S9xAllHex (const char *, int);
-
-
-static bool8 S9xAllHex (const char *code, int len)
-{
-	for (int i = 0; i < len; i++)
-		if ((code[i] < '0' || code[i] > '9') && (code[i] < 'a' || code[i] > 'f') && (code[i] < 'A' || code[i] > 'F'))
-			return (FALSE);
-
-	return (TRUE);
-}
-
-const char * S9xProActionReplayToRaw (const char *code, uint32 &address, uint8 &byte)
-{
-	uint32	data = 0;
-
-	if (strlen(code) != 8 || !S9xAllHex(code, 8) || sscanf(code, "%x", &data) != 1)
-		return ("Invalid Pro Action Replay code - should be 8 hex digits in length.");
-
-	address = data >> 8;
-	byte = (uint8) data;
-
-	return (NULL);
-}
-
-const char * S9xGoldFingerToRaw (const char *code, uint32 &address, bool8 &sram, uint8 &num_bytes, uint8 bytes[3])
-{
-	char	tmp[15];
-	int		i;
-
-	if (strlen(code) != 14)
-		return ("Invalid Gold Finger code - should be 14 hex digits in length.");
-
-	strncpy(tmp, code, 5);
-	tmp[5] = 0;
-	if (sscanf(tmp, "%x", &address) != 1)
-		return ("Invalid Gold Finger code.");
-
-	// Correct GoldFinger Address
-	address = (address & 0x7FFF) | ((address & 0x7F8000) << 1) | 0x8000;
-
-	for (i = 0; i < 3; i++)
-	{
-		unsigned int	byte;
-
-		strncpy(tmp, code + 5 + i * 2, 2);
-		tmp[2] = 0;
-		if (sscanf(tmp, "%x", &byte) != 1)
-			break;
-		bytes[i] = (uint8) byte;
-	}
-
-	num_bytes = i;
-	sram = code[13] == '1';
-
-	return (NULL);
-}
-
-const char * S9xGameGenieToRaw (const char *code, uint32 &address, uint8 &byte)
-{
-	char	new_code[12];
-
-	if (strlen(code) != 9 || *(code + 4) != '-' || !S9xAllHex(code, 4) || !S9xAllHex(code + 5, 4))
-		return ("Invalid Game Genie(tm) code - should be 'xxxx-xxxx'.");
-
-	strcpy(new_code, "0x");
-	strncpy(new_code + 2, code, 4);
-	strcpy(new_code + 6, code + 5);
-
-	static const char	*real_hex  = "0123456789ABCDEF";
-	static const char	*genie_hex = "DF4709156BC8A23E";
-
-	for (int i = 2; i < 10; i++)
-	{
-		if (islower(new_code[i]))
-			new_code[i] = toupper(new_code[i]);
-
-		int j;
-		for (j = 0; j < 16; j++)
-		{
-			if (new_code[i] == genie_hex[j])
-			{
-				new_code[i] = real_hex[j];
-				break;
-			}
-		}
-
-		if (j == 16)
-			return ("Invalid hex-character in Game Genie(tm) code.");
-	}
-
-	uint32	data = 0;
-	sscanf(new_code, "%x", &data);
-	byte = (uint8) (data >> 24);
-	address = data & 0xffffff;
-	address = ((address & 0x003c00) << 10) +
-			  ((address & 0x00003c) << 14) +
-			  ((address & 0xf00000) >>  8) +
-			  ((address & 0x000003) << 10) +
-			  ((address & 0x00c000) >>  6) +
-			  ((address & 0x0f0000) >> 12) +
-			  ((address & 0x0003c0) >>  6);
-
-	return (NULL);
-}
-
 void S9xStartCheatSearch (SCheatData *d)
 {
 	memmove(d->CWRAM, d->RAM, 0x20000);

diff --git a/cheats.h b/cheats.h
@@ -23,14 +23,14 @@ struct SCheat
 
 struct SCheatGroup
 {
-	char *name;
+	std::string name;
 	bool8 enabled;
-	std::vector<struct SCheat> c;
+	std::vector<struct SCheat> cheat;
 };
 
 struct SCheatData
 {
-	std::vector<struct SCheatGroup> g;
+	std::vector<struct SCheatGroup> group;
 	bool8	enabled;
 	uint8	CWRAM[0x20000];
 	uint8	CSRAM[0x80000];
@@ -73,20 +73,20 @@ typedef enum
 extern SCheatData	Cheat;
 extern Watch		watches[16];
 
-int S9xAddCheatGroup (const char *name, const char *cheat);
-int S9xModifyCheatGroup (uint32 index, const char *name, const char *cheat);
-void S9xEnableCheatGroup (uint32 index);
-void S9xDisableCheatGroup (uint32 index);
-void S9xDeleteCheats (void);
-char *S9xCheatGroupToText (uint32 index);
-void S9xDeleteCheatGroup (uint32 index);
-bool8 S9xLoadCheatFile (const char *filename);
-bool8 S9xSaveCheatFile (const char *filename);
-void S9xUpdateCheatsInMemory (void);
-int S9xImportCheatsFromDatabase(const char *filename);
-void S9xCheatsDisable (void);
-void S9xCheatsEnable (void);
-char *S9xCheatValidate (const char *cheat);
+int S9xAddCheatGroup(const std::string &name, const std::string &cheat);
+int S9xModifyCheatGroup(uint32 index, const std::string &name, const std::string &cheat);
+void S9xEnableCheatGroup(uint32 index);
+void S9xDisableCheatGroup(uint32 index);
+void S9xDeleteCheats(void);
+std::string S9xCheatGroupToText(uint32 index);
+void S9xDeleteCheatGroup(uint32 index);
+bool8 S9xLoadCheatFile(const std::string &filename);
+bool8 S9xSaveCheatFile(const std::string &filename);
+void S9xUpdateCheatsInMemory(void);
+int S9xImportCheatsFromDatabase(const std::string &filename);
+void S9xCheatsDisable(void);
+void S9xCheatsEnable(void);
+std::string S9xCheatValidate(const std::string &cheat);
 
 void S9xInitCheatData (void);
 void S9xInitWatchedAddress (void);
@@ -96,8 +96,4 @@ void S9xSearchForValue (SCheatData *, S9xCheatComparisonType, S9xCheatDataSize,
 void S9xSearchForAddress (SCheatData *, S9xCheatComparisonType, S9xCheatDataSize, uint32, bool8);
 void S9xOutputCheatSearchResults (SCheatData *);
 
-const char * S9xGameGenieToRaw (const char *, uint32 &, uint8 &);
-const char * S9xProActionReplayToRaw (const char *, uint32 &, uint8 &);
-const char * S9xGoldFingerToRaw (const char *, uint32 &, bool8 &, uint8 &, uint8 bytes[3]);
-
 #endif