notaz.gp2x.de
/
fceu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cli added for debug
[fceu.git]
/
fce.c
diff --git
a/fce.c
b/fce.c
index
d50c201
..
89c4285
100644
(file)
--- a/
fce.c
+++ b/
fce.c
@@
-48,6
+48,7
@@
#include "crc32.h"
#include "ppu.h"
#include "crc32.h"
#include "ppu.h"
+#include "palette.h"
#include "movie.h"
#include "dprintf.h"
#include "movie.h"
#include "dprintf.h"
@@
-1032,7
+1033,7
@@
void CloseGame(void)
if(GameLoaded)
{
if(FCEUGameInfo.type!=GIT_NSF)
if(GameLoaded)
{
if(FCEUGameInfo.type!=GIT_NSF)
- F
lushGameCheats(
);
+ F
CEU_FlushGameCheats(0,0
);
#ifdef NETWORK
if(FSettings.NetworkPlay) KillNetplay();
#endif
#ifdef NETWORK
if(FSettings.NetworkPlay) KillNetplay();
#endif
@@
-1139,8
+1140,8
@@
FCEUGI *FCEUI_LoadGame(char *name)
SaveStateRefresh();
if(FCEUGameInfo.type!=GIT_NSF)
{
SaveStateRefresh();
if(FCEUGameInfo.type!=GIT_NSF)
{
-
LoadGamePalette();
-
LoadGameCheats(
);
+
FCEU_
LoadGamePalette();
+
FCEU_LoadGameCheats(0
);
}
FCEU_ResetPalette();
}
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.UsrFirstSLine[0]=8;
FSettings.UsrFirstSLine[1]=0;
FSettings.UsrLastSLine[0]=FSettings.UsrLastSLine[1]=239;
- FSettings.SoundVolume=
65535; // 100%
+ FSettings.SoundVolume=
100;
return 1;
}
return 1;
}
@@
-1222,7
+1223,7
@@
void EmLoop(void)
int x;
uint32 scanlines_per_frame = PAL ? 312 : 262;
UpdateInput();
int x;
uint32 scanlines_per_frame = PAL ? 312 : 262;
UpdateInput();
- ApplyPeriodicCheats();
+
FCEU_
ApplyPeriodicCheats();
// FCEUPPU_Loop:
if(ppudead) /* Needed for Knight Rider, possibly others. */
// FCEUPPU_Loop:
if(ppudead) /* Needed for Knight Rider, possibly others. */
@@
-1287,7
+1288,8
@@
void EmLoop(void)
if(FCEUGameInfo.type==GIT_NSF)
{
if(FCEUGameInfo.type==GIT_NSF)
{
- X6502_Run((256+85)*240);
+ for(scanline=0;scanline<240;scanline++)
+ X6502_Run(256+85);
}
#ifdef FRAMESKIP
else if(FSkip)
}
#ifdef FRAMESKIP
else if(FSkip)
@@
-1435,7
+1437,7
@@
static void PowerPPU(void)
void ResetNES(void)
{
void ResetNES(void)
{
- if(!GameLoaded
|| (FCEUGameInfo.type==GIT_NSF)
) return;
+ if(!GameLoaded) return;
GameInterface(GI_RESETM2);
ResetSound();
ResetPPU();
GameInterface(GI_RESETM2);
ResetSound();
ResetPPU();