notaz.gp2x.de
/
fceu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fceu options + support code
[fceu.git]
/
fce.c
diff --git
a/fce.c
b/fce.c
index
814c80e
..
7cc5996
100644
(file)
--- a/
fce.c
+++ b/
fce.c
@@
-95,7
+95,7
@@
static uint8 deemp=0;
static int deempcnt[8];
FCEUGI FCEUGameInfo;
static int deempcnt[8];
FCEUGI FCEUGameInfo;
-void (*GameInterface)(int h);
+void (*GameInterface)(int h
, void *param
);
void FP_FASTAPASS(1) (*PPU_hook)(uint32 A);
void FP_FASTAPASS(1) (*PPU_hook)(uint32 A);
@@
-605,7
+605,7
@@
static void LineUpdate(uint8 *target)
{
uint32 tem;
{
uint32 tem;
- if(FSkip)
+ if(FSkip
|| scanline < FSettings.FirstSLine || scanline > FSettings.LastSLine
)
{
if(PPU_hook)
PRefreshLine();
{
if(PPU_hook)
PRefreshLine();
@@
-614,13
+614,7
@@
static void LineUpdate(uint8 *target)
{
if(ScreenON)
{
{
if(ScreenON)
{
- if(scanline>=FSettings.FirstSLine && scanline<=FSettings.LastSLine)
- BGRender(target);
- else
- {
- if(PPU_hook)
- PRefreshLine();
- }
+ BGRender(target);
}
else
{
}
else
{
@@
-1045,6
+1039,7
@@
void ResetMapping(void)
int GameLoaded=0;
void CloseGame(void)
{
int GameLoaded=0;
void CloseGame(void)
{
+ FCEUI_StopMovie();
if(GameLoaded)
{
if(FCEUGameInfo.type!=GIT_NSF)
if(GameLoaded)
{
if(FCEUGameInfo.type!=GIT_NSF)
@@
-1052,7
+1047,7
@@
void CloseGame(void)
#ifdef NETWORK
if(FSettings.NetworkPlay) KillNetplay();
#endif
#ifdef NETWORK
if(FSettings.NetworkPlay) KillNetplay();
#endif
- GameInterface(GI_CLOSE);
+ GameInterface(GI_CLOSE
, 0
);
CloseGenie();
GameLoaded=0;
}
CloseGenie();
GameLoaded=0;
}
@@
-1234,13
+1229,13
@@
static void DoLine(void)
#ifdef FRAMESKIP
if(!FSkip)
#endif
#ifdef FRAMESKIP
if(!FSkip)
#endif
- if(SpriteON && spork)
- CopySprites(target);
+ if(scanline>=FSettings.FirstSLine && scanline<=FSettings.LastSLine)
+ {
+ if(SpriteON && spork)
+ CopySprites(target);
-#ifdef FRAMESKIP
- if(!FSkip)
-#endif
- LineUpdateEnd(target);
+ LineUpdateEnd(target);
+ }
sphitx=0x100;
if(ScreenON || SpriteON)
sphitx=0x100;
if(ScreenON || SpriteON)
@@
-1466,7
+1461,7
@@
static void PowerPPU(void)
void ResetNES(void)
{
if(!GameLoaded) return;
void ResetNES(void)
{
if(!GameLoaded) return;
- GameInterface(GI_RESETM2);
+ GameInterface(GI_RESETM2
, 0
);
ResetSound();
ResetPPU();
X6502_Reset();
ResetSound();
ResetPPU();
X6502_Reset();
@@
-1499,7
+1494,7
@@
void PowerNES(void)
memset(RAM,0x00,0x800);
#endif
ResetMapping();
memset(RAM,0x00,0x800);
#endif
ResetMapping();
- GameInterface(GI_POWER);
+ GameInterface(GI_POWER
, 0
);
PowerSound();
PowerPPU();
timestampbase=0;
PowerSound();
PowerPPU();
timestampbase=0;