aboutsummaryrefslogtreecommitdiff
path: root/source/cpu.c
diff options
context:
space:
mode:
authoraliaspider2014-10-30 06:25:49 +0100
committeraliaspider2014-10-30 06:25:49 +0100
commit1fbc985d61038c52af8559bbac8ce801d2a1f0b8 (patch)
tree7f837cae2946d6da8420618c4214d0b23b9ed7a9 /source/cpu.c
parent9d26cad1e39af6e4c96a4efb5ae00332207163ca (diff)
downloadsnes9x2005-1fbc985d61038c52af8559bbac8ce801d2a1f0b8.tar.gz
snes9x2005-1fbc985d61038c52af8559bbac8ce801d2a1f0b8.tar.bz2
snes9x2005-1fbc985d61038c52af8559bbac8ce801d2a1f0b8.zip
remove ZSNES_FX defines
Diffstat (limited to 'source/cpu.c')
-rw-r--r--source/cpu.c14
1 files changed, 0 insertions, 14 deletions
diff --git a/source/cpu.c b/source/cpu.c
index 977ac77..0bc9d6c 100644
--- a/source/cpu.c
+++ b/source/cpu.c
@@ -102,7 +102,6 @@
#include "obc1.h"
-#ifndef ZSNES_FX
#include "fxemu.h"
extern struct FxInit_s SuperFX;
@@ -112,7 +111,6 @@ void S9xResetSuperFX()
SuperFX.vFlags = 0; //FX_FLAG_ROM_BUFFER;// | FX_FLAG_ADDRESS_CHECKING;
FxReset(&SuperFX);
}
-#endif
void S9xResetCPU()
{
@@ -164,20 +162,11 @@ void S9xResetCPU()
S9xUnpackStatus();
}
-#ifdef ZSNES_FX
-void S9xResetSuperFX();
-bool8 WinterGold = 0;
-extern uint8* C4Ram;
-#endif
-
void S9xReset(void)
{
if (Settings.SuperFX)
S9xResetSuperFX();
-#ifdef ZSNES_FX
- WinterGold = Settings.WinterGold;
-#endif
ZeroMemory(Memory.FillRAM, 0x8000);
memset(Memory.VRAM, 0x00, 0x10000);
memset(Memory.RAM, 0x55, 0x20000);
@@ -207,9 +196,6 @@ void S9xSoftReset(void)
if (Settings.SuperFX)
S9xResetSuperFX();
-#ifdef ZSNES_FX
- WinterGold = Settings.WinterGold;
-#endif
ZeroMemory(Memory.FillRAM, 0x8000);
memset(Memory.VRAM, 0x00, 0x10000);
// memset (Memory.RAM, 0x55, 0x20000);