new PPU flag - changed "New PPU" to "NewpPU", made flag false if no flag is present in a movie header. Win32 - replay dialog - display new PPU flag.
This commit is contained in:
adelikat
parent
320223bd29
commit
06b37466c2
|
|
@ -1,4 +1,4 @@
|
|||
14-may-2010 - adelikat - Win32 - Replay dialog shows PAL flag
|
||||
14-may-2010 - adelikat - Win32 - Replay dialog shows PAL flag & New PPU flag
|
||||
14-may-2010 - adelikat - New PPU flag in movie headers (doesn't change an emulators PPU state when loading a movie)
|
||||
13-may-2010 - adelikat - input display overhaul - a more desmume style system which shows both keys held the previous frame and immiately held keys that will be put in on the next frame
|
||||
12-may-2010 - ugetab - Win32 - Added rudamentry Between-Frames input display code for adelikat to customize.
|
||||
|
|
|
|||
|
|
@ -198,6 +198,12 @@ void UpdateReplayDialog(HWND hwndDlg)
|
|||
if (!info.pal)
|
||||
strcpy(boolstring, "Off");
|
||||
SetWindowText(GetDlgItem(hwndDlg,IDC_LABEL_PALUSED),boolstring);
|
||||
if (info.ppuflag)
|
||||
strcpy(boolstring, "On ");
|
||||
else
|
||||
strcpy(boolstring, "Off");
|
||||
SetWindowText(GetDlgItem(hwndDlg,IDC_LABEL_NEWPPUUSED),boolstring);
|
||||
|
||||
|
||||
|
||||
if(info.emu_version_used < 20000 )
|
||||
|
|
|
|||
|
|
@ -1271,16 +1271,16 @@ BEGIN
|
|||
RTEXT "Author:",65502,18,43,34,10,SS_CENTERIMAGE | NOT WS_GROUP,WS_EX_RIGHT
|
||||
END
|
||||
|
||||
IDD_REPLAYINP DIALOGEX 0, 0, 300, 205
|
||||
IDD_REPLAYINP DIALOGEX 0, 0, 300, 218
|
||||
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
|
||||
CAPTION "Play Movie"
|
||||
FONT 8, "MS Shell Dlg", 0, 0, 0x0
|
||||
BEGIN
|
||||
DEFPUSHBUTTON "OK",1,191,179,50,14
|
||||
GROUPBOX "",65497,3,0,293,171
|
||||
DEFPUSHBUTTON "OK",1,193,192,50,14
|
||||
GROUPBOX "",65497,3,0,293,183
|
||||
RTEXT "File:",65498,8,11,24,10,SS_CENTERIMAGE | NOT WS_GROUP
|
||||
COMBOBOX IDC_COMBO_FILENAME,35,10,257,128,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
|
||||
PUSHBUTTON "Cancel",2,245,179,50,14
|
||||
PUSHBUTTON "Cancel",2,247,192,50,14
|
||||
RTEXT "Length:",64397,10,68,59,8
|
||||
RTEXT "Frames:",65496,10,79,59,8
|
||||
RTEXT "Record Count:",65495,10,90,59,8
|
||||
|
|
@ -1304,6 +1304,8 @@ BEGIN
|
|||
EDITTEXT IDC_LABEL_LENGTH,76,68,59,12,ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP
|
||||
RTEXT "Pal:",65494,10,153,59,8
|
||||
EDITTEXT IDC_LABEL_PALUSED,76,153,155,12,ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP
|
||||
RTEXT "New PPU:",65499,10,163,59,8
|
||||
EDITTEXT IDC_LABEL_NEWPPUUSED,76,163,155,12,ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP
|
||||
END
|
||||
|
||||
TASEDIT DIALOGEX 0, 0, 465, 382
|
||||
|
|
@ -1784,7 +1786,7 @@ BEGIN
|
|||
|
||||
"IDD_REPLAYINP", DIALOG
|
||||
BEGIN
|
||||
BOTTOMMARGIN, 201
|
||||
BOTTOMMARGIN, 214
|
||||
END
|
||||
|
||||
"TASEDIT", DIALOG
|
||||
|
|
|
|||
|
|
@ -254,10 +254,11 @@
|
|||
#define IDC_DEBUGGER_STACK_CONTENTS 308
|
||||
#define IDC_BTN_CHEAT_LT 309
|
||||
#define IDC_DEBUGGER_VAL_PCSEEK 309
|
||||
#define IDC_LABEL_EMULATORUSED2 309
|
||||
#define IDC_LABEL_PALUSED 309
|
||||
#define MENU_GAME_GENIE 310
|
||||
#define IDC_DEBUGGER_VAL_PPU 310
|
||||
#define IDC_LABEL_PALUSED2 310
|
||||
#define IDC_LABEL_NEWPPUUSED 310
|
||||
#define MENU_PAL 311
|
||||
#define IDC_DEBUGGER_VAL_SPR 311
|
||||
#define IDC_DEBUGGER_BOOKMARK 312
|
||||
|
|
|
|||
|
|
@ -345,6 +345,7 @@ MovieData::MovieData()
|
|||
: version(MOVIE_VERSION)
|
||||
, emuVersion(FCEU_VERSION_NUMERIC)
|
||||
, palFlag(false)
|
||||
, PPUflag(false)
|
||||
, rerecordCount(0)
|
||||
, binaryFlag(false)
|
||||
, greenZoneCount(0)
|
||||
|
|
@ -363,7 +364,7 @@ void MovieData::installValue(std::string& key, std::string& val)
|
|||
//todo - use another config system, or drive this from a little data structure. because this is gross
|
||||
if(key == "FDS")
|
||||
installInt(val,fds);
|
||||
else if(key == "New PPU")
|
||||
else if(key == "NewPPU")
|
||||
installBool(val,PPUflag);
|
||||
else if(key == "version")
|
||||
installInt(val,version);
|
||||
|
|
@ -427,7 +428,7 @@ int MovieData::dump(std::ostream *os, bool binary)
|
|||
*os << "port1 " << ports[1] << endl;
|
||||
*os << "port2 " << ports[2] << endl;
|
||||
*os << "FDS " << isFDS << endl;
|
||||
*os << "New PPU " << newppu << endl;
|
||||
*os << "NewPPU " << newppu << endl;
|
||||
|
||||
for(uint32 i=0;i<comments.size();i++)
|
||||
*os << "comment " << wcstombs(comments[i]) << endl;
|
||||
|
|
@ -1381,6 +1382,7 @@ bool FCEUI_MovieGetInfo(FCEUFILE* fp, MOVIE_INFO& info, bool skipFrameCount)
|
|||
info.movie_version = md.version;
|
||||
info.poweron = md.savestate.size()==0;
|
||||
info.pal = md.palFlag;
|
||||
info.ppuflag = md.PPUflag;
|
||||
info.nosynchack = true;
|
||||
info.num_frames = md.records.size();
|
||||
info.md5_of_rom_used = md.romChecksum;
|
||||
|
|
|
|||
|
|
@ -37,7 +37,7 @@ typedef struct
|
|||
int movie_version; // version of the movie format in the file
|
||||
uint32 num_frames;
|
||||
uint32 rerecord_count;
|
||||
bool poweron, pal, nosynchack;
|
||||
bool poweron, pal, nosynchack, ppuflag;
|
||||
bool reset; //mbg 6/21/08 - this flag isnt used anymore.. but maybe one day we can scan it out of the first record in the movie file
|
||||
uint32 emu_version_used; // 9813 = 0.98.13
|
||||
MD5DATA md5_of_rom_used;
|
||||
|
|
|
|||
Loading…
Reference in New Issue