apply a facelift

1 files changed, 169 insertions, 166 deletions

diff --git a/source/cheats2.c b/source/cheats2.c
index 845918d..8118552 100644
--- a/source/cheats2.c
+++ b/source/cheats2.c
@@ -1,6 +1,6 @@
 /*******************************************************************************
   Snes9x - Portable Super Nintendo Entertainment System (TM) emulator.
- 
+
   (c) Copyright 1996 - 2002 Gary Henderson (gary.henderson@ntlworld.com) and
                             Jerremy Koot (jkoot@snes9x.com)
 
@@ -43,46 +43,46 @@
   S-DD1 C emulator code
   (c) Copyright 2003 Brad Jorsch with research by
                      Andreas Naive and John Weidman
- 
+
   S-RTC C emulator code
   (c) Copyright 2001 John Weidman
-  
+
   ST010 C++ emulator code
   (c) Copyright 2003 Feather, Kris Bleakley, John Weidman and Matthew Kendora
 
-  Super FX x86 assembler emulator code 
-  (c) Copyright 1998 - 2003 zsKnight, _Demo_, and pagefault 
+  Super FX x86 assembler emulator code
+  (c) Copyright 1998 - 2003 zsKnight, _Demo_, and pagefault
 
-  Super FX C emulator code 
+  Super FX C emulator code
   (c) Copyright 1997 - 1999 Ivar, Gary Henderson and John Weidman
 
 
   SH assembler code partly based on x86 assembler code
-  (c) Copyright 2002 - 2004 Marcus Comstedt (marcus@mc.pp.se) 
+  (c) Copyright 2002 - 2004 Marcus Comstedt (marcus@mc.pp.se)
+
 
- 
   Specific ports contains the works of other authors. See headers in
   individual files.
- 
+
   Snes9x homepage: http://www.snes9x.com
- 
+
   Permission to use, copy, modify and distribute Snes9x in both binary and
   source form, for non-commercial purposes, is hereby granted without fee,
   providing that this license information and copyright notice appear with
   all copies and any derived work.
- 
+
   This software is provided 'as-is', without any express or implied
   warranty. In no event shall the authors be held liable for any damages
   arising from the use of this software.
- 
+
   Snes9x is freeware for PERSONAL USE only. Commercial users should
   seek permission of the copyright holders first. Commercial use includes
   charging money for Snes9x or software derived from Snes9x.
- 
+
   The copyright holders request that bug fixes and improvements to the code
   should be forwarded to them so everyone can benefit from the modifications
   in future versions.
- 
+
   Super NES and Super Nintendo Entertainment System are trademarks of
   Nintendo Co., Limited and its subsidiary companies.
 *******************************************************************************/
@@ -95,193 +95,196 @@
 
 extern SCheatData Cheat;
 
-void S9xInitCheatData ()
+void S9xInitCheatData()
 {
-    Cheat.RAM = Memory.RAM;
-    Cheat.SRAM = Memory.SRAM;
-    Cheat.FillRAM = Memory.FillRAM;
+   Cheat.RAM = Memory.RAM;
+   Cheat.SRAM = Memory.SRAM;
+   Cheat.FillRAM = Memory.FillRAM;
 }
 
-void S9xAddCheat (bool8 enable, bool8 save_current_value, 
-		  uint32 address, uint8 byte)
+void S9xAddCheat(bool8 enable, bool8 save_current_value,
+                 uint32 address, uint8 byte)
 {
-    if (Cheat.num_cheats < sizeof (Cheat.c) / sizeof (Cheat.c [0]))
-    {
-	Cheat.c [Cheat.num_cheats].address = address;
-	Cheat.c [Cheat.num_cheats].byte = byte;
-	Cheat.c [Cheat.num_cheats].enabled = enable;
-	if (save_current_value)
-	{
-	    Cheat.c [Cheat.num_cheats].saved_byte = S9xGetByte (address);
-	    Cheat.c [Cheat.num_cheats].saved = TRUE;
-	}
-	Cheat.num_cheats++;
-	if (enable)
-		S9xApplyCheat(Cheat.num_cheats - 1);
-    }
+   if (Cheat.num_cheats < sizeof(Cheat.c) / sizeof(Cheat.c [0]))
+   {
+      Cheat.c [Cheat.num_cheats].address = address;
+      Cheat.c [Cheat.num_cheats].byte = byte;
+      Cheat.c [Cheat.num_cheats].enabled = enable;
+      if (save_current_value)
+      {
+         Cheat.c [Cheat.num_cheats].saved_byte = S9xGetByte(address);
+         Cheat.c [Cheat.num_cheats].saved = TRUE;
+      }
+      Cheat.num_cheats++;
+      if (enable)
+         S9xApplyCheat(Cheat.num_cheats - 1);
+   }
 }
 
-void S9xDeleteCheat (uint32 which1)
+void S9xDeleteCheat(uint32 which1)
 {
-    if (which1 < Cheat.num_cheats)
-    {
-	if (Cheat.c [which1].enabled)
-	    S9xRemoveCheat (which1);
-
-	// memmove required: Overlapping addresses [Neb]
-	memmove (&Cheat.c [which1], &Cheat.c [which1 + 1],
-		 sizeof (Cheat.c [0]) * (Cheat.num_cheats - which1 - 1));
-	Cheat.num_cheats--; //MK: This used to set it to 0??
-    }
+   if (which1 < Cheat.num_cheats)
+   {
+      if (Cheat.c [which1].enabled)
+         S9xRemoveCheat(which1);
+
+      // memmove required: Overlapping addresses [Neb]
+      memmove(&Cheat.c [which1], &Cheat.c [which1 + 1],
+              sizeof(Cheat.c [0]) * (Cheat.num_cheats - which1 - 1));
+      Cheat.num_cheats--; //MK: This used to set it to 0??
+   }
 }
 
-void S9xDeleteCheats ()
+void S9xDeleteCheats()
 {
-    S9xRemoveCheats ();
-    Cheat.num_cheats = 0;
+   S9xRemoveCheats();
+   Cheat.num_cheats = 0;
 }
 
-void S9xEnableCheat (uint32 which1)
+void S9xEnableCheat(uint32 which1)
 {
-    if (which1 < Cheat.num_cheats && !Cheat.c [which1].enabled)
-    {
-	Cheat.c [which1].enabled = TRUE;
-	S9xApplyCheat (which1);
-    }
+   if (which1 < Cheat.num_cheats && !Cheat.c [which1].enabled)
+   {
+      Cheat.c [which1].enabled = TRUE;
+      S9xApplyCheat(which1);
+   }
 }
 
-void S9xDisableCheat (uint32 which1)
+void S9xDisableCheat(uint32 which1)
 {
-    if (which1 < Cheat.num_cheats && Cheat.c [which1].enabled)
-    {
-	S9xRemoveCheat (which1);
-	Cheat.c [which1].enabled = FALSE;
-    }
+   if (which1 < Cheat.num_cheats && Cheat.c [which1].enabled)
+   {
+      S9xRemoveCheat(which1);
+      Cheat.c [which1].enabled = FALSE;
+   }
 }
 
-void S9xRemoveCheat (uint32 which1)
+void S9xRemoveCheat(uint32 which1)
 {
-    if (Cheat.c [which1].saved)
-    {
-	uint32 address = Cheat.c [which1].address;
-
-	int block = (address >> MEMMAP_SHIFT) & MEMMAP_MASK;
-	uint8 *ptr = Memory.Map [block];
-	    
-   if (ptr >= (uint8 *) MAP_LAST)
-	    *(ptr + (address & 0xffff)) = Cheat.c [which1].saved_byte;
-	else
-	    S9xSetByte (Cheat.c [which1].saved_byte, address);
-	// Unsave the address for the next call to S9xRemoveCheat.
-	Cheat.c [which1].saved = FALSE;
-    }
+   if (Cheat.c [which1].saved)
+   {
+      uint32 address = Cheat.c [which1].address;
+
+      int block = (address >> MEMMAP_SHIFT) & MEMMAP_MASK;
+      uint8* ptr = Memory.Map [block];
+
+      if (ptr >= (uint8*) MAP_LAST)
+         *(ptr + (address & 0xffff)) = Cheat.c [which1].saved_byte;
+      else
+         S9xSetByte(Cheat.c [which1].saved_byte, address);
+      // Unsave the address for the next call to S9xRemoveCheat.
+      Cheat.c [which1].saved = FALSE;
+   }
 }
 
-void S9xApplyCheat (uint32 which1)
+void S9xApplyCheat(uint32 which1)
 {
-    uint32 address = Cheat.c [which1].address;
-
-    if (!Cheat.c [which1].saved)
-	Cheat.c [which1].saved_byte = S9xGetByte (address);
-
-    int block = (address >> MEMMAP_SHIFT) & MEMMAP_MASK;
-    uint8 *ptr = Memory.Map [block];
-    
-    if (ptr >= (uint8 *) MAP_LAST)
-	*(ptr + (address & 0xffff)) = Cheat.c [which1].byte;
-    else
-	S9xSetByte (Cheat.c [which1].byte, address);
-    Cheat.c [which1].saved = TRUE;
+   uint32 address = Cheat.c [which1].address;
+
+   if (!Cheat.c [which1].saved)
+      Cheat.c [which1].saved_byte = S9xGetByte(address);
+
+   int block = (address >> MEMMAP_SHIFT) & MEMMAP_MASK;
+   uint8* ptr = Memory.Map [block];
+
+   if (ptr >= (uint8*) MAP_LAST)
+      *(ptr + (address & 0xffff)) = Cheat.c [which1].byte;
+   else
+      S9xSetByte(Cheat.c [which1].byte, address);
+   Cheat.c [which1].saved = TRUE;
 }
 
-void S9xApplyCheats ()
+void S9xApplyCheats()
 {
-    uint32 i;
-    if (Settings.ApplyCheats)
-    {
-        for (i = 0; i < Cheat.num_cheats; i++)
-            if (Cheat.c [i].enabled)
-                S9xApplyCheat (i);
-    }
+   uint32 i;
+   if (Settings.ApplyCheats)
+   {
+      for (i = 0; i < Cheat.num_cheats; i++)
+         if (Cheat.c [i].enabled)
+            S9xApplyCheat(i);
+   }
 }
 
-void S9xRemoveCheats ()
+void S9xRemoveCheats()
 {
    uint32 i;
    for (i = 0; i < Cheat.num_cheats; i++)
       if (Cheat.c [i].enabled)
-         S9xRemoveCheat (i);
+         S9xRemoveCheat(i);
 }
 
-bool8 S9xLoadCheatFile (const char *filename)
+bool8 S9xLoadCheatFile(const char* filename)
 {
-    Cheat.num_cheats = 0;
-
-    FILE *fs = fopen (filename, "rb");
-    uint8 data [8 + MAX_SFCCHEAT_NAME];
-
-    if (!fs)
-	return (FALSE);
-
-    while (fread ((void *) data, 1, 8 + MAX_SFCCHEAT_NAME, fs) == 8 + MAX_SFCCHEAT_NAME)
-    {
-	if (data[6] != 254 || data[7] != 252) {
-		fclose (fs);
-		return (FALSE);
-	}
-	Cheat.c [Cheat.num_cheats].enabled = (data [0] & 4) == 0;
-	Cheat.c [Cheat.num_cheats].byte = data [1];
-	Cheat.c [Cheat.num_cheats].address = data [2] | (data [3] << 8) |  (data [4] << 16);
-	Cheat.c [Cheat.num_cheats].saved_byte = data [5];
-	Cheat.c [Cheat.num_cheats].saved = (data [0] & 8) != 0;
-	memcpy (Cheat.c [Cheat.num_cheats].name, &data [8], MAX_SFCCHEAT_NAME - 1);
-	Cheat.c [Cheat.num_cheats++].name [MAX_SFCCHEAT_NAME - 1] = 0;
-    }
-    fclose (fs);
-
-    return (TRUE);
+   Cheat.num_cheats = 0;
+
+   FILE* fs = fopen(filename, "rb");
+   uint8 data [8 + MAX_SFCCHEAT_NAME];
+
+   if (!fs)
+      return (FALSE);
+
+   while (fread((void*) data, 1, 8 + MAX_SFCCHEAT_NAME,
+                fs) == 8 + MAX_SFCCHEAT_NAME)
+   {
+      if (data[6] != 254 || data[7] != 252)
+      {
+         fclose(fs);
+         return (FALSE);
+      }
+      Cheat.c [Cheat.num_cheats].enabled = (data [0] & 4) == 0;
+      Cheat.c [Cheat.num_cheats].byte = data [1];
+      Cheat.c [Cheat.num_cheats].address = data [2] | (data [3] << 8) |
+                                           (data [4] << 16);
+      Cheat.c [Cheat.num_cheats].saved_byte = data [5];
+      Cheat.c [Cheat.num_cheats].saved = (data [0] & 8) != 0;
+      memcpy(Cheat.c [Cheat.num_cheats].name, &data [8], MAX_SFCCHEAT_NAME - 1);
+      Cheat.c [Cheat.num_cheats++].name [MAX_SFCCHEAT_NAME - 1] = 0;
+   }
+   fclose(fs);
+
+   return (TRUE);
 }
 
-bool8 S9xSaveCheatFile (const char *filename)
+bool8 S9xSaveCheatFile(const char* filename)
 {
-    if (Cheat.num_cheats == 0)
-    {
-	(void) remove (filename);
-	return (TRUE);
-    }
-
-    FILE *fs = fopen (filename, "wb");
-    uint8 data [8 + MAX_SFCCHEAT_NAME];
-
-    if (!fs)
-	return (FALSE);
-
-    uint32 i;
-    for (i = 0; i < Cheat.num_cheats; i++)
-    {
-	memset (data, 0, 8 + MAX_SFCCHEAT_NAME);
-	data [6] = 254;
-	data [7] = 252;
-	if (!Cheat.c [i].enabled)
-	    data [0] |= 4;
-
-	if (Cheat.c [i].saved)
-	    data [0] |= 8;
-
-	data [1] = Cheat.c [i].byte;
-	data [2] = (uint8) Cheat.c [i].address;
-	data [3] = (uint8) (Cheat.c [i].address >> 8);
-	data [4] = (uint8) (Cheat.c [i].address >> 16);
-	data [5] = Cheat.c [i].saved_byte;
-
-	memcpy (&data [8], Cheat.c [i].name, MAX_SFCCHEAT_NAME - 1);
-	if (fwrite (data, 8 + MAX_SFCCHEAT_NAME, 1, fs) != 1)
-	{
-	    fclose (fs);
-	    return (FALSE);
-	}
-    }
-
-    fclose (fs);
-    return (TRUE);
+   if (Cheat.num_cheats == 0)
+   {
+      (void) remove(filename);
+      return (TRUE);
+   }
+
+   FILE* fs = fopen(filename, "wb");
+   uint8 data [8 + MAX_SFCCHEAT_NAME];
+
+   if (!fs)
+      return (FALSE);
+
+   uint32 i;
+   for (i = 0; i < Cheat.num_cheats; i++)
+   {
+      memset(data, 0, 8 + MAX_SFCCHEAT_NAME);
+      data [6] = 254;
+      data [7] = 252;
+      if (!Cheat.c [i].enabled)
+         data [0] |= 4;
+
+      if (Cheat.c [i].saved)
+         data [0] |= 8;
+
+      data [1] = Cheat.c [i].byte;
+      data [2] = (uint8) Cheat.c [i].address;
+      data [3] = (uint8)(Cheat.c [i].address >> 8);
+      data [4] = (uint8)(Cheat.c [i].address >> 16);
+      data [5] = Cheat.c [i].saved_byte;
+
+      memcpy(&data [8], Cheat.c [i].name, MAX_SFCCHEAT_NAME - 1);
+      if (fwrite(data, 8 + MAX_SFCCHEAT_NAME, 1, fs) != 1)
+      {
+         fclose(fs);
+         return (FALSE);
+      }
+   }
+
+   fclose(fs);
+   return (TRUE);
 }