Auto-save flag tweaks, Win32-context menu-read only toggles added
This commit is contained in:
parent
8540908c8e
commit
130fee0f22
|
@ -323,6 +323,7 @@ FCEUCONTEXTMENUS MENU
|
||||||
BEGIN
|
BEGIN
|
||||||
POPUP "Game+Movie+readonly"
|
POPUP "Game+Movie+readonly"
|
||||||
BEGIN
|
BEGIN
|
||||||
|
MENUITEM "Toggle to read+write", FCEUX_CONTEXT_READONLYTOGGLE
|
||||||
MENUITEM "Play Movie from Beginning", FCEU_CONTEXT_PLAYMOVIEFROMBEGINNING
|
MENUITEM "Play Movie from Beginning", FCEU_CONTEXT_PLAYMOVIEFROMBEGINNING
|
||||||
MENUITEM "Stop Movie Replay", FCEU_CONTEXT_STOPMOVIE
|
MENUITEM "Stop Movie Replay", FCEU_CONTEXT_STOPMOVIE
|
||||||
MENUITEM "View comments and subtitles", FCEUX_CONTEXT_VIEWCOMMENTSSUBTITLES
|
MENUITEM "View comments and subtitles", FCEUX_CONTEXT_VIEWCOMMENTSSUBTITLES
|
||||||
|
@ -353,6 +354,7 @@ BEGIN
|
||||||
END
|
END
|
||||||
POPUP "Game+Movie+readwrite"
|
POPUP "Game+Movie+readwrite"
|
||||||
BEGIN
|
BEGIN
|
||||||
|
MENUITEM "Toggle to Read-only", FCEUX_CONTEXT_READONLYTOGGLE
|
||||||
MENUITEM "Play Movie From Beginning", FCEU_CONTEXT_PLAYMOVIEFROMBEGINNING
|
MENUITEM "Play Movie From Beginning", FCEU_CONTEXT_PLAYMOVIEFROMBEGINNING
|
||||||
MENUITEM "Stop Movie Recording", FCEU_CONTEXT_STOPMOVIE
|
MENUITEM "Stop Movie Recording", FCEU_CONTEXT_STOPMOVIE
|
||||||
MENUITEM "View comments and subtitles", FCEUX_CONTEXT_VIEWCOMMENTSSUBTITLES
|
MENUITEM "View comments and subtitles", FCEUX_CONTEXT_VIEWCOMMENTSSUBTITLES
|
||||||
|
|
|
@ -646,6 +646,9 @@
|
||||||
#define ID_FILE_MOVIE_TOGGLEREAD 40331
|
#define ID_FILE_MOVIE_TOGGLEREAD 40331
|
||||||
#define ID_LUA_RELOADLUASCRIPT 40332
|
#define ID_LUA_RELOADLUASCRIPT 40332
|
||||||
#define ID_FILE_LUA_RELOADLUASCRIPT 40333
|
#define ID_FILE_LUA_RELOADLUASCRIPT 40333
|
||||||
|
#define ID_GAME_SWITCHTOREAD 40334
|
||||||
|
#define FCEUX_CONTEXT_READONLYTOGGLE 40335
|
||||||
|
#define ID_GAME_TOGGLETOREAD 40336
|
||||||
#define IDC_DEBUGGER_ICONTRAY 55535
|
#define IDC_DEBUGGER_ICONTRAY 55535
|
||||||
#define MW_ValueLabel2 65423
|
#define MW_ValueLabel2 65423
|
||||||
#define MW_ValueLabel1 65426
|
#define MW_ValueLabel1 65426
|
||||||
|
@ -655,7 +658,7 @@
|
||||||
#ifdef APSTUDIO_INVOKED
|
#ifdef APSTUDIO_INVOKED
|
||||||
#ifndef APSTUDIO_READONLY_SYMBOLS
|
#ifndef APSTUDIO_READONLY_SYMBOLS
|
||||||
#define _APS_NEXT_RESOURCE_VALUE 125
|
#define _APS_NEXT_RESOURCE_VALUE 125
|
||||||
#define _APS_NEXT_COMMAND_VALUE 40334
|
#define _APS_NEXT_COMMAND_VALUE 40337
|
||||||
#define _APS_NEXT_CONTROL_VALUE 1199
|
#define _APS_NEXT_CONTROL_VALUE 1199
|
||||||
#define _APS_NEXT_SYMED_VALUE 101
|
#define _APS_NEXT_SYMED_VALUE 101
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -975,6 +975,7 @@ LRESULT FAR PASCAL AppWndProc(HWND hWnd,UINT msg,WPARAM wParam,LPARAM lParam)
|
||||||
case ID_FILE_PLAYMOVIEFROMBEGINNING:
|
case ID_FILE_PLAYMOVIEFROMBEGINNING:
|
||||||
FCEUI_MoviePlayFromBeginning();
|
FCEUI_MoviePlayFromBeginning();
|
||||||
break;
|
break;
|
||||||
|
case FCEUX_CONTEXT_READONLYTOGGLE:
|
||||||
case ID_FILE_MOVIE_TOGGLEREAD:
|
case ID_FILE_MOVIE_TOGGLEREAD:
|
||||||
FCEUI_MovieToggleReadOnly();
|
FCEUI_MovieToggleReadOnly();
|
||||||
break;
|
break;
|
||||||
|
|
|
@ -41,6 +41,7 @@ using namespace std;
|
||||||
#define MOVIE_VERSION 3
|
#define MOVIE_VERSION 3
|
||||||
|
|
||||||
extern char FileBase[];
|
extern char FileBase[];
|
||||||
|
extern bool AutoSS; //Declared in fceu.cpp, keeps track if a auto-savestate has been made
|
||||||
|
|
||||||
std::vector<int> subtitleFrames; //Frame numbers for subtitle messages
|
std::vector<int> subtitleFrames; //Frame numbers for subtitle messages
|
||||||
std::vector<string> subtitleMessages; //Messages of subtitles
|
std::vector<string> subtitleMessages; //Messages of subtitles
|
||||||
|
@ -624,8 +625,9 @@ void FCEUI_StopMovie()
|
||||||
else if(movieMode == MOVIEMODE_RECORD)
|
else if(movieMode == MOVIEMODE_RECORD)
|
||||||
StopRecording();
|
StopRecording();
|
||||||
|
|
||||||
curMovieFilename[0] = 0;
|
curMovieFilename[0] = 0; //No longer a current movie filename
|
||||||
freshMovie = false;
|
freshMovie = false; //No longer a fresh movie loaded
|
||||||
|
if (bindSavestate) AutoSS = false; //If bind movies to savestates is true, then there is no longer a valid auto-save to load
|
||||||
}
|
}
|
||||||
|
|
||||||
static void poweron(bool shouldDisableBatteryLoading)
|
static void poweron(bool shouldDisableBatteryLoading)
|
||||||
|
@ -741,7 +743,7 @@ void FCEUI_LoadMovie(const char *fname, bool _read_only, bool tasedit, int _paus
|
||||||
delete fp;
|
delete fp;
|
||||||
|
|
||||||
freshMovie = true; //Movie has been loaded, so it must be unaltered
|
freshMovie = true; //Movie has been loaded, so it must be unaltered
|
||||||
|
if (bindSavestate) AutoSS = false; //If bind savestate to movie is true, then their isn't a valid auto-save to load, so flag it
|
||||||
//fully reload the game to reinitialize everything before playing any movie
|
//fully reload the game to reinitialize everything before playing any movie
|
||||||
poweron(true);
|
poweron(true);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue