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

Posix: Fix a few warnings in ctrlssdl.cpp

This commit is contained in:
Emmanuel Gil Peyrot 2020-12-25 03:08:16 +01:00
parent ac507ebdc0
commit aeaf404177
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
desmume/src/frontend/posix/shared/ctrlssdl.cpp
View File

@ -272,12 +272,12 @@ static void set_mouse_coord(signed long x,signed long y)
} }
// Adapted from Windows port // Adapted from Windows port
bool allowUpAndDown = false; static bool allowUpAndDown = false;
static buttonstruct<int> cardinalHeldTime = {0}; static buttonstruct<int> cardinalHeldTime = {};
static void RunAntipodalRestriction(const buttonstruct<bool>& pad) static void RunAntipodalRestriction(const buttonstruct<bool>& pad)
{ {
if(allowUpAndDown) if (allowUpAndDown)
return; return;
pad.U ? (cardinalHeldTime.U++) : (cardinalHeldTime.U=0); pad.U ? (cardinalHeldTime.U++) : (cardinalHeldTime.U=0);
@ -287,20 +287,22 @@ static void RunAntipodalRestriction(const buttonstruct<bool>& pad)
} }
static void ApplyAntipodalRestriction(buttonstruct<bool>& pad) static void ApplyAntipodalRestriction(buttonstruct<bool>& pad)
{ {
if(allowUpAndDown) if (allowUpAndDown)
return; return;
// give preference to whichever direction was most recently pressed // give preference to whichever direction was most recently pressed
if(pad.U && pad.D) if (pad.U && pad.D) {
if(cardinalHeldTime.U < cardinalHeldTime.D) if (cardinalHeldTime.U < cardinalHeldTime.D)
pad.D = false; pad.D = false;
else else
pad.U = false; pad.U = false;
if(pad.L && pad.R) }
if(cardinalHeldTime.L < cardinalHeldTime.R) if (pad.L && pad.R) {
if (cardinalHeldTime.L < cardinalHeldTime.R)
pad.R = false; pad.R = false;
else else
pad.L = false; pad.L = false;
}
} }
/* Update NDS keypad */ /* Update NDS keypad */
@ -466,7 +468,7 @@ process_joystick_events( u16 *keypad) {
} }
} }
u16 shift_pressed; static u16 shift_pressed;
void void
process_ctrls_event( SDL_Event& event, process_ctrls_event( SDL_Event& event,
@ -576,6 +578,7 @@ process_ctrls_event( SDL_Event& event,
case SDL_MOUSEBUTTONDOWN: case SDL_MOUSEBUTTONDOWN:
if(event.button.button==1) if(event.button.button==1)
mouse.down = TRUE; mouse.down = TRUE;
break;
case SDL_MOUSEMOTION: case SDL_MOUSEMOTION:
if(!mouse.down) if(!mouse.down)