X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=fceu.git;a=blobdiff_plain;f=fce.c;h=4db2a0a57e8bea9e64a09f719b1deca97fb7b601;hp=d50c201a2c02d7deeefb178db79eb0a025283062;hb=92764e6252a3691033d6044b466bf716c96b62d5;hpb=ea80a45b1dbd9f2c46567e18a2e18fcbb6e55c8d

diff --git a/fce.c b/fce.c
index d50c201..4db2a0a 100644
--- a/fce.c
+++ b/fce.c
@@ -48,6 +48,7 @@
 #include	"crc32.h"
 #include        "ppu.h"
 
+#include        "palette.h"
 #include        "movie.h"
 
 #include        "dprintf.h"
@@ -1032,7 +1033,7 @@ void CloseGame(void)
  if(GameLoaded)
  {
   if(FCEUGameInfo.type!=GIT_NSF)
-   FlushGameCheats();
+   FCEU_FlushGameCheats(0,0);
   #ifdef NETWORK
   if(FSettings.NetworkPlay) KillNetplay();
   #endif
@@ -1139,8 +1140,8 @@ FCEUGI *FCEUI_LoadGame(char *name)
         SaveStateRefresh();
         if(FCEUGameInfo.type!=GIT_NSF)
         {
-         LoadGamePalette();
-         LoadGameCheats();
+	 FCEU_LoadGamePalette();
+         FCEU_LoadGameCheats(0);
         }
 
 	FCEU_ResetPalette();
@@ -1187,7 +1188,7 @@ int FCEUI_Initialize(void)
 	FSettings.UsrFirstSLine[0]=8;
 	FSettings.UsrFirstSLine[1]=0;
         FSettings.UsrLastSLine[0]=FSettings.UsrLastSLine[1]=239;
-	FSettings.SoundVolume=65535;	// 100%
+	FSettings.SoundVolume=100;
         return 1;
 }
 
@@ -1222,7 +1223,7 @@ void EmLoop(void)
   int x;
   uint32 scanlines_per_frame = PAL ? 312 : 262;
   UpdateInput();
-  ApplyPeriodicCheats();
+  FCEU_ApplyPeriodicCheats();
 
   // FCEUPPU_Loop:
   if(ppudead) /* Needed for Knight Rider, possibly others. */
@@ -1435,7 +1436,7 @@ static void PowerPPU(void)
 
 void ResetNES(void)
 {
-        if(!GameLoaded || (FCEUGameInfo.type==GIT_NSF)) return;
+        if(!GameLoaded) return;
         GameInterface(GI_RESETM2);
         ResetSound();
         ResetPPU();