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

moved ShowInputDisplay

This commit is contained in:
p989 2009-06-06 15:08:13 +00:00
parent d38623350f
commit 8ff221a8fa
4 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
desmume/src/movie.cpp
View File

@ -56,6 +56,7 @@ bool movie_readonly = true;
char curMovieFilename[512] = {0}; char curMovieFilename[512] = {0};
MovieData currMovieData; MovieData currMovieData;
int currRerecordCount; int currRerecordCount;
bool ShowInputDisplay = false;
//-------------- //--------------

1
desmume/src/movie.h
View File

@ -194,5 +194,6 @@ void mov_savestate(std::ostream* os);
bool mov_loadstate(std::istream* is, int size); bool mov_loadstate(std::istream* is, int size);
void LoadFM2_binarychunk(MovieData& movieData, std::istream* fp, int size); void LoadFM2_binarychunk(MovieData& movieData, std::istream* fp, int size);
extern bool movie_readonly; extern bool movie_readonly;
extern bool ShowInputDisplay;
void FCEUI_MakeBackupMovie(bool dispMessage); void FCEUI_MakeBackupMovie(bool dispMessage);
#endif #endif

3
desmume/src/windows/main.cpp
View File

@ -258,7 +258,6 @@ int emu_paused = 0;
bool frameAdvance = false; bool frameAdvance = false;
bool frameCounterDisplay = false; bool frameCounterDisplay = false;
bool FpsDisplay = false; bool FpsDisplay = false;
bool ShowInputDisplay = false;
bool ShowLagFrameCounter = false; bool ShowLagFrameCounter = false;
bool ShowMicrophone = false; bool ShowMicrophone = false;
bool HudEditorMode = false; bool HudEditorMode = false;
@ -3843,7 +3842,7 @@ LRESULT CALLBACK MicrophoneSettingsDlgProc(HWND hDlg, UINT uMsg, WPARAM wParam,
{ {
int val = 0; int val = 0;
if((!romloaded) || (val == IDYES)) if((romloaded)) //|| (val == IDYES))
{ {
HWND cur; HWND cur;

1
desmume/src/windows/main.h
View File

@ -20,7 +20,6 @@ void WavEnd();
extern bool frameCounterDisplay; extern bool frameCounterDisplay;
extern bool FpsDisplay; extern bool FpsDisplay;
extern bool ShowInputDisplay;
extern bool ShowLagFrameCounter; extern bool ShowLagFrameCounter;
#define GPU3D_NULL 0 #define GPU3D_NULL 0