notaz.gp2x.de
/
fceu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
merge x6502 code FCEUX
[fceu.git]
/
movie.c
diff --git
a/movie.c
b/movie.c
index
d4a6505
..
2875dba
100644
(file)
--- a/
movie.c
+++ b/
movie.c
@@
-47,7
+47,7
@@
typedef struct
// backwards compat
static void FCEUI_LoadMovie_v1(char *fname, int _read_only);
// backwards compat
static void FCEUI_LoadMovie_v1(char *fname, int _read_only);
-static int FCEUI_MovieGetInfo_v1(const char* fname, MOVIE_INFO* info);
+
//
static int FCEUI_MovieGetInfo_v1(const char* fname, MOVIE_INFO* info);
extern char FileBase[];
extern char FileBase[];
@@
-87,10
+87,10
@@
static uint32 savestate_offset = 0;
static uint32 rerecord_count = 0;
/*static*/ int movie_readonly = 1;
int frame_display = 0;
static uint32 rerecord_count = 0;
/*static*/ int movie_readonly = 1;
int frame_display = 0;
-static uint32 last_frame_display = ~0;
+
//
static uint32 last_frame_display = ~0;
int input_display = 0;
static uint32 cur_input_display = 0;
int input_display = 0;
static uint32 cur_input_display = 0;
-static uint32 last_input_display = ~0;
+
//
static uint32 last_input_display = ~0;
int resetDMCacc=0;
int resetDMCacc=0;
@@
-98,7
+98,7
@@
int resetDMCacc=0;
static uint32 nextts = 0;
static int32 nextd = 0;
static uint32 nextts = 0;
static int32 nextd = 0;
-#define FCEUSTATE_RLSB 0x80000000
+
//
#define FCEUSTATE_RLSB 0x80000000
SFORMAT FCEUMOV_STATEINFO[]={
{ joop, 4,"JOOP"},
SFORMAT FCEUMOV_STATEINFO[]={
{ joop, 4,"JOOP"},
@@
-112,11
+112,11
@@
SFORMAT FCEUMOV_STATEINFO[]={
};
static int CurrentMovie = 1;
};
static int CurrentMovie = 1;
-static int MovieShow = 0;
+
//
static int MovieShow = 0;
static int MovieStatus[10];
static int MovieStatus[10];
-static void DoEncode(int joy, int button, int);
+
//
static void DoEncode(int joy, int button, int);
int FCEUMOV_IsPlaying(void)
{
int FCEUMOV_IsPlaying(void)
{
@@
-431,7
+431,7
@@
strcpy(origname,fname);
{
// attempt to load previous version's format
fclose(fp);
{
// attempt to load previous version's format
fclose(fp);
- printf("trying movie v1\n");
+ printf("
movie:
trying movie v1\n");
FCEUI_LoadMovie_v1(fname, _read_only);
return;
}
FCEUI_LoadMovie_v1(fname, _read_only);
return;
}
@@
-440,6
+440,7
@@
strcpy(origname,fname);
else
{
// unsupported version
else
{
// unsupported version
+ printf("movie: unsupported version\n");
fclose(fp);
return;
}
fclose(fp);
return;
}
@@
-485,7
+486,8
@@
strcpy(origname,fname);
}
#endif
}
#endif
- if(!FCEUSS_LoadFP(fp,1)) return;
+ // Loading new savestates doesn't work and even breaks FDS
+ //if(!FCEUSS_LoadFP(fp,1)) return;
ResetInputTypes();
ResetInputTypes();
@@
-716,9
+718,9
@@
static void DoEncode(int joy, int button, int dummy)
// TODO: make this function legible! (what are all these magic numbers and weirdly named variables and crazy unexplained loops?)
void FCEUMOV_AddJoy(uint8 *js)
{
// TODO: make this function legible! (what are all these magic numbers and weirdly named variables and crazy unexplained loops?)
void FCEUMOV_AddJoy(uint8 *js)
{
- int x,y;
+
//
int x,y;
-
//
if(!current) return; // Not playback nor recording.
+ if(!current) return; // Not playback nor recording.
if(current < 0) // Playback
{
if(current < 0) // Playback
{
@@
-732,10
+734,7
@@
void FCEUMOV_AddJoy(uint8 *js)
if(nextd&0x80)
{
//puts("Egads");
if(nextd&0x80)
{
//puts("Egads");
- // TODO?
-#if 0
FCEU_DoSimpleCommand(nextd&0x1F);
FCEU_DoSimpleCommand(nextd&0x1F);
-#endif
}
else
joop[(nextd >> 3)&0x3] ^= 1 << (nextd&0x7);
}
else
joop[(nextd >> 3)&0x3] ^= 1 << (nextd&0x7);