From 320223bd29cc10e7d4c27bd4e6743a53b9765130 Mon Sep 17 00:00:00 2001 From: adelikat Date: Fri, 14 May 2010 16:21:03 +0000 Subject: [PATCH] Win32 - Replay dialog shows pal flag --- changelog.txt | 1 + src/drivers/win/replay.cpp | 5 +++++ src/drivers/win/res.rc | 44 ++++++++++++++++++++------------------ src/drivers/win/resource.h | 2 ++ 4 files changed, 31 insertions(+), 21 deletions(-) diff --git a/changelog.txt b/changelog.txt index ce821654..9af2ce1e 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,3 +1,4 @@ +14-may-2010 - adelikat - Win32 - Replay dialog shows PAL 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. diff --git a/src/drivers/win/replay.cpp b/src/drivers/win/replay.cpp index 5d5caf1a..348285f2 100644 --- a/src/drivers/win/replay.cpp +++ b/src/drivers/win/replay.cpp @@ -194,6 +194,11 @@ void UpdateReplayDialog(HWND hwndDlg) char emuStr[128]; SetWindowText(GetDlgItem(hwndDlg,IDC_LABEL_ROMUSED),info.name_of_rom_used.c_str()); SetWindowText(GetDlgItem(hwndDlg,IDC_LABEL_ROMCHECKSUM),md5_asciistr(info.md5_of_rom_used)); + char boolstring[4] = "On "; + if (!info.pal) + strcpy(boolstring, "Off"); + SetWindowText(GetDlgItem(hwndDlg,IDC_LABEL_PALUSED),boolstring); + if(info.emu_version_used < 20000 ) sprintf(emuStr, "FCEU %d.%02d.%02d%s", info.emu_version_used/10000, (info.emu_version_used/100)%100, (info.emu_version_used)%100, info.emu_version_used < 9813 ? " (blip)" : ""); diff --git a/src/drivers/win/res.rc b/src/drivers/win/res.rc index 018499a7..86be89a2 100644 --- a/src/drivers/win/res.rc +++ b/src/drivers/win/res.rc @@ -1271,37 +1271,39 @@ BEGIN RTEXT "Author:",65502,18,43,34,10,SS_CENTERIMAGE | NOT WS_GROUP,WS_EX_RIGHT END -IDD_REPLAYINP DIALOGEX 0, 0, 300, 164 +IDD_REPLAYINP DIALOGEX 0, 0, 300, 205 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,145,50,14 - GROUPBOX "",65497,3,0,293,140 + DEFPUSHBUTTON "OK",1,191,179,50,14 + GROUPBOX "",65497,3,0,293,171 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,145,50,14 - RTEXT "Length:",64397,10,70,59,8 - RTEXT "Frames:",65496,10,78,59,8 - RTEXT "Record Count:",65495,10,86,59,8 - RTEXT "ROM Used:",65493,10,102,59,8 - RTEXT "ROM Checksum:",65492,10,110,59,8 - RTEXT "Recorded From:",65491,10,94,59,8 - RTEXT "Emulator Used:",65490,10,126,59,8 - RTEXT "Current ROM Sum:",65489,8,118,61,8 + PUSHBUTTON "Cancel",2,245,179,50,14 + RTEXT "Length:",64397,10,68,59,8 + RTEXT "Frames:",65496,10,79,59,8 + RTEXT "Record Count:",65495,10,90,59,8 + RTEXT "ROM Used:",65493,10,111,59,8 + RTEXT "ROM Checksum:",65492,10,121,59,8 + RTEXT "Recorded From:",65491,10,100,59,8 + RTEXT "Emulator Used:",65490,10,143,59,8 + RTEXT "Current ROM Sum:",65489,8,132,61,8 CONTROL "Pause movie at frame",IDC_CHECK_STOPMOVIE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,19,49,83,10 EDITTEXT IDC_EDIT_STOPFRAME,103,47,35,12,ES_AUTOHSCROLL | ES_NUMBER GROUPBOX "Parameters",IDC_STATIC,13,25,278,40 PUSHBUTTON "Metadata...",IDC_BUTTON_METADATA,239,71,50,14 - EDITTEXT IDC_LABEL_EMULATORUSED,76,126,155,8,ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_LABEL_CURRCHECKSUM,76,118,155,8,ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_LABEL_ROMCHECKSUM,76,110,155,8,ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_LABEL_ROMUSED,76,102,187,8,ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_LABEL_RECORDEDFROM,76,94,123,8,ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP + EDITTEXT IDC_LABEL_EMULATORUSED,76,143,155,12,ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP + EDITTEXT IDC_LABEL_CURRCHECKSUM,76,132,155,12,ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP + EDITTEXT IDC_LABEL_ROMCHECKSUM,76,122,155,12,ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP + EDITTEXT IDC_LABEL_ROMUSED,76,111,187,12,ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP + EDITTEXT IDC_LABEL_RECORDEDFROM,76,100,123,12,ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP CONTROL "Open &Read-Only",IDC_CHECK_READONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,19,36,69,10 - EDITTEXT IDC_LABEL_UNDOCOUNT,76,86,59,8,ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_LABEL_FRAMES,76,78,59,8,ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_LABEL_LENGTH,76,70,59,8,ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP + EDITTEXT IDC_LABEL_UNDOCOUNT,76,90,59,12,ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP + EDITTEXT IDC_LABEL_FRAMES,76,79,59,12,ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP + 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 END TASEDIT DIALOGEX 0, 0, 465, 382 @@ -1782,7 +1784,7 @@ BEGIN "IDD_REPLAYINP", DIALOG BEGIN - BOTTOMMARGIN, 146 + BOTTOMMARGIN, 201 END "TASEDIT", DIALOG diff --git a/src/drivers/win/resource.h b/src/drivers/win/resource.h index 19487c86..4c9abf1b 100644 --- a/src/drivers/win/resource.h +++ b/src/drivers/win/resource.h @@ -254,6 +254,8 @@ #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 MENU_PAL 311