ShuriZma
/
fceux
mirror of https://github.com/TASEmulators/fceux.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Win32 - Movie subtitle toggle menu item

This commit is contained in:
adelikat 2008-11-23 21:41:33 +00:00
parent eb65e0122b
commit 13d2afeffb
6 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/drivers/win/config.cpp
View File

@ -46,6 +46,7 @@ extern int DesynchAutoFire;
extern bool lagCounterDisplay;
extern bool frameAdvanceLagSkip;
extern int ClipSidesOffset;
extern bool movieSubtitles;
extern uint8 gNoBGFillColor;
@ -206,6 +207,7 @@ static CFGSTRUCT fceuconfig[] = {
AC(AutoFireOffset),
AC(DesynchAutoFire),
AC(lagCounterDisplay),
AC(movieSubtitles),
AC(bindSavestate),
AC(ClipSidesOffset),
//ACS(memwLastfile[2048]),

1
src/drivers/win/res.rc
View File

@ -92,6 +92,7 @@ BEGIN
END
MENUITEM "Lag Counter", MENU_DISPLAY_LAGCOUNTER
MENUITEM "Frame Counter", ID_DISPLAY_FRAMECOUNTER
MENUITEM "Move Subtitles", ID_DISPLAY_MOVESUBTITLES
MENUITEM SEPARATOR
MENUITEM "Graphics: BG", MENU_DISPLAY_BG
MENUITEM "Graphics: OBJ", MENU_DISPLAY_OBJ

3
src/drivers/win/resource.h
View File

@ -561,6 +561,7 @@
#define MENU_CONFIG_BINDSAVES 40256
#define MEMVIEW_HELP 40257
#define MENU_MV_HELP 40258
#define ID_DISPLAY_MOVESUBTITLES 40259
#define IDC_DEBUGGER_ICONTRAY 55535
#define MW_ValueLabel2 65423
#define MW_ValueLabel1 65426
@ -570,7 +571,7 @@
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_NEXT_RESOURCE_VALUE 124
#define _APS_NEXT_COMMAND_VALUE 40259
#define _APS_NEXT_COMMAND_VALUE 40260
#define _APS_NEXT_CONTROL_VALUE 1187
#define _APS_NEXT_SYMED_VALUE 101
#endif

7
src/drivers/win/window.cpp
View File

@ -71,6 +71,7 @@ using namespace std;
extern FCEUGI *GameInfo;
extern int EnableAutosave;
extern bool frameAdvanceLagSkip;
extern bool movieSubtitles;
// Extern functions
@ -309,6 +310,7 @@ void UpdateCheckedMenuItems()
CheckMenuItem(fceumenu, MENU_DISPLAY_LAGCOUNTER, lagCounterDisplay?MF_CHECKED : MF_UNCHECKED);
CheckMenuItem(fceumenu, MENU_DISPLAY_BG, bg?MF_CHECKED:MF_UNCHECKED);
CheckMenuItem(fceumenu, MENU_DISPLAY_OBJ, spr?MF_CHECKED:MF_UNCHECKED);
CheckMenuItem(fceumenu, ID_DISPLAY_MOVESUBTITLES, movieSubtitles?MF_CHECKED:MF_UNCHECKED);
CheckMenuItem(fceumenu, MENU_PAUSEAFTERPLAYBACK, pauseAfterPlayback ? MF_CHECKED : MF_UNCHECKED);
CheckMenuItem(fceumenu, MENU_RUN_IN_BACKGROUND, eoptions & EO_BGRUN ? MF_CHECKED : MF_UNCHECKED);
@ -1026,6 +1028,11 @@ LRESULT FAR PASCAL AppWndProc(HWND hWnd,UINT msg,WPARAM wParam,LPARAM lParam)
UpdateCheckedMenuItems();
break;
case ID_DISPLAY_MOVESUBTITLES:
movieSubtitles ^= 1;
UpdateCheckedMenuItems();
break;
case MENU_SHOW_STATUS_ICON:
// Show status icon menu was selected
status_icon = !status_icon;

5
src/fceu.cpp
View File

@ -69,6 +69,8 @@ int AFon = 1, AFoff = 1, AutoFireOffset = 0; //For keeping track of autofire set
bool justLagged = false;
bool frameAdvanceLagSkip = false; //If this is true, frame advance will skip over lag frame (i.e. it will emulate 2 frames instead of 1)
bool movieSubtitles = true; //Toggle for displaying movie subtitles
FCEUGI::FCEUGI()
: filename(0)
, archiveFilename(0)
@ -632,7 +634,8 @@ void FCEUI_Emulate(uint8 **pXBuf, int32 **SoundBuf, int32 *SoundBufSize, int ski
}
else justLagged = false;
ProcessSubtitles();
if (movieSubtitles)
ProcessSubtitles();
}
void FCEUI_CloseGame(void)

1
src/fceu.h
View File

@ -50,7 +50,6 @@ uint8 FCEU_ReadRomByte(uint32 i);
extern readfunc ARead[0x10000];
extern writefunc BWrite[0x10000];
enum GI {
GI_RESETM2 =1,
GI_POWER =2,