a_dinosaur/ZSNES
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Less stupidity and more testcode removal makes state-less power-on movies a reality.

Browse Source
This commit is contained in:
grinvader
2005-03-23 22:06:31 +00:00
parent 80e723c9f9
commit abd8936460
4 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
zsnes/src/cpu/execute.asm
View File

@@ -718,12 +718,8 @@ NEWSYM start65816
; rep stosd ; rep stosd
cmp byte[romloadskip],1 cmp byte[romloadskip],1
je near StartGUI je near StartGUI
cmp byte[MovieProcessing],0
je continueprog
ret
NEWSYM continueprog NEWSYM continueprog
; clear keyboard presses ; clear keyboard presses
mov esi,pressed mov esi,pressed
mov ecx,256+128+64 mov ecx,256+128+64

2
zsnes/src/gui/gui.asm
View File

@@ -166,7 +166,7 @@ EXTSYM GUIHQ3X
EXTSYM GUIHQ4X EXTSYM GUIHQ4X
EXTSYM firstsaveinc EXTSYM firstsaveinc
EXTSYM nssdip1,nssdip2,nssdip3,nssdip4,nssdip5,nssdip6 EXTSYM nssdip1,nssdip2,nssdip3,nssdip4,nssdip5,nssdip6
EXTSYM SkipMovie,MovieStop,MoviePlay,MovieRecord,MovieInsertChapter,init EXTSYM SkipMovie,MovieStop,MoviePlay,MovieRecord,MovieInsertChapter
EXTSYM MovieSeekAhead,MovieSeekBehind EXTSYM MovieSeekAhead,MovieSeekBehind
%ifdef __LINUX__ %ifdef __LINUX__

2
zsnes/src/init.asm
View File

@@ -57,7 +57,7 @@ EXTSYM NumComboLocl,ComboBlHeader,ComboHeader,CombinDataLocl
EXTSYM CombinDataGlob,NumCombo,GUIComboGameSpec EXTSYM CombinDataGlob,NumCombo,GUIComboGameSpec
EXTSYM mousexloc,mouseyloc EXTSYM mousexloc,mouseyloc
EXTSYM extlatch EXTSYM extlatch
EXTSYM BackState,clearmem2,NextLineCache,sramsavedis EXTSYM BackState
EXTSYM FIRTAPVal0,FIRTAPVal1,FIRTAPVal2,FIRTAPVal3,FIRTAPVal4 EXTSYM FIRTAPVal0,FIRTAPVal1,FIRTAPVal2,FIRTAPVal3,FIRTAPVal4
EXTSYM FIRTAPVal5,FIRTAPVal6,FIRTAPVal7,INTEnab,JoyAPos,JoyBPos EXTSYM FIRTAPVal5,FIRTAPVal6,FIRTAPVal7,INTEnab,JoyAPos,JoyBPos
EXTSYM NMIEnab,SPCROM,VIRQLoc,coladdb,coladdg,coladdr,doirqnext EXTSYM NMIEnab,SPCROM,VIRQLoc,coladdb,coladdg,coladdr,doirqnext

9
zsnes/src/zmovie.c
View File

@@ -719,6 +719,7 @@ static bool zmv_open(char *filename)
switch (MovieStartMethod) switch (MovieStartMethod)
{ {
case 0: // from zst case 0: // from zst
zst_load(zmv_vars.fp);
break; break;
case 1: // from power-on case 1: // from power-on
powercycle(); powercycle();
@@ -728,11 +729,11 @@ static bool zmv_open(char *filename)
break; break;
} }
zst_load(zmv_vars.fp); if (MovieStartMethod)
if (zmv_vars.header.zsnes_version != (versionNumber & 0xFFFF))
{ {
if (zmv_vars.header.zsnes_version != (versionNumber & 0xFFFF))
{ zst_load(zmv_vars.fp); }
else { fseek(zmv_vars.fp, zmv_vars.header.zst_size, SEEK_CUR); }
} }
firstloop = true; firstloop = true;