Made gamepad 2 off by default.

This commit is contained in:
adelikat 2010-05-18 04:52:05 +00:00
parent cec1766f34
commit fb579eb4b2
3 changed files with 5 additions and 2 deletions

View File

@ -1,3 +1,6 @@
17-may-2010 - adelikat - Made gamepad 2 off by default.
17-may-2010 - adelikat - Movies - fully implemented "bulletproof" read-only
17-may-2010 - zeromus - Movie loading (& movie-savestate saving/loading) should now be faster due to the use of a emufile class instead of std::ostream for dumping
16-may-2010 - ugetab - Added player 3 and 4 to autohold notification window. Made FCEU_DispMessage able to display to different screen locations to do it. Made sure to update SDL with the change. Hope SDL still compiles ok.
15-may-2010 - ugetab - Win32 - Added option for palette selection as color for LUA colors. Included an LUA script to display all choices with the value used to pick displayed color.
14-may-2010 - adelikat - Win32 - Replay dialog, when selecting a movie in a relative path (.\movies for example), the recent movies list stores an absolute path instead.

View File

@ -51,7 +51,7 @@ extern bool replaceP2StartWithMicrophone;
// (game/savestate/movie loading can override user settings)
//int UsrInputType[3]={SI_GAMEPAD,SI_GAMEPAD,SIFC_NONE};
int InputType[3]={SI_GAMEPAD,SI_GAMEPAD,SIFC_NONE};
int InputType[3]={SI_GAMEPAD,SI_NONE,SIFC_NONE};
int InitDInput(void)
{

View File

@ -1314,7 +1314,7 @@ bool FCEUMOV_ReadState(EMUFILE* is, uint32 size)
//if we made it this far, then the savestate has identical movie data but we want to know now if the stateMOVIE size is greater than current movie size and make this error
//currFrameCounter at this point represents the savestate framecount
if(currFrameCounter > currMovieData.records.size())
if(currFrameCounter > (int)currMovieData.records.size())
{
//TODO: turn frame counter to red to get attention
FCEU_PrintError("Savestate is from a frame (%d) after the final frame in the movie (%d). This is not permitted.", tempMovieData.records.size(), currMovieData.records.size()-1);