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

Fixed the input display auto hold code I put in yesterday, and optimized the code slightly.

This commit is contained in:
ugetab 2010-05-16 14:23:23 +00:00
parent 87e92e3e52
commit 64fd9f0c44
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/video.cpp
View File

@ -253,7 +253,7 @@ void FCEU_PutImage(void)
if(input_display) if(input_display)
{ {
extern uint32 JSAutoHeld; extern uint32 JSAutoHeld;
uint32 held = JSAutoHeld; uint32 held;
int controller, c, ci, color; int controller, c, ci, color;
int i, j; int i, j;
@ -275,16 +275,13 @@ void FCEU_PutImage(void)
t[i+j*256] = 0xCF; t[i+j*256] = 0xCF;
c = cur_input_display >> (controller * 8); c = cur_input_display >> (controller * 8);
// Do this before shifting away data
held &= 255;
// This doesn't work in anything except windows for now. // This doesn't work in anything except windows for now.
// It doesn't get set anywhere in other ports. // It doesn't get set anywhere in other ports.
#ifdef WIN32 #ifdef WIN32
if (!oldInputDisplay) ci = FCEUMOV_Mode(MOVIEMODE_PLAY) ? 0:GetGamepadPressedImmediate() >> (controller * 8); if (!oldInputDisplay) ci = FCEUMOV_Mode(MOVIEMODE_PLAY) ? 0:GetGamepadPressedImmediate() >> (controller * 8);
else ci = 0; else ci = 0;
if (!oldInputDisplay && !FCEUMOV_Mode(MOVIEMODE_PLAY)) held = (held >> 8); if (!oldInputDisplay && !FCEUMOV_Mode(MOVIEMODE_PLAY)) held = (JSAutoHeld >> (controller * 8));
else held = 0; else held = 0;
#else #else
// Put other port info here // Put other port info here
@ -292,9 +289,6 @@ void FCEU_PutImage(void)
held = 0; held = 0;
#endif #endif
c &= 255;
ci &= 255;
//adelikat: I apologize to anyone who ever sifts through this color assignment //adelikat: I apologize to anyone who ever sifts through this color assignment
//A //A
if (held&1) { //If auto-hold if (held&1) { //If auto-hold