libretro/snes9x
1
0
Fork 0
mirror of https://github.com/libretro/snes9x.git synced 2024-11-27 02:20:23 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix uninitialized warning and aliased pointers.

Browse Source
This commit is contained in:
Brandon Wright 2018-12-04 16:07:01 -06:00
parent bbebb2255a
commit 7e61653051
2 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
controls.cpp
View File

@ -2723,7 +2723,7 @@ static void do_polling (int mp)
{
case MAP_BUTTON:
{
bool pressed;
bool pressed = false;
if (S9xPollButton(*itr, &pressed))
S9xReportButton(*itr, pressed);
break;
@ -2731,7 +2731,7 @@ static void do_polling (int mp)
case MAP_AXIS:
{
int16 value;
int16 value = 0;
if (S9xPollAxis(*itr, &value))
S9xReportAxis(*itr, value);
break;
@ -2739,7 +2739,7 @@ static void do_polling (int mp)
case MAP_POINTER:
{
int16 x, y;
int16 x = 0, y = 0;
if (S9xPollPointer(*itr, &x, &y))
S9xReportPointer(*itr, x, y);
break;

31
gfx.cpp
View File

@ -1908,10 +1908,11 @@ static void DisplayPressedKeys (void)
{
case CTL_MOUSE:
{
uint8 buf[5], *p = buf;
MovieGetMouse(port, buf);
int16 x = READ_WORD(p);
int16 y = READ_WORD(p + 2);
uint8 buf[5];
if (!MovieGetMouse(port, buf))
break;
int16 x = READ_WORD(buf);
int16 y = READ_WORD(buf + 2);
uint8 buttons = buf[4];
sprintf(string, "#%d %d: (%03d,%03d) %c%c", port, ids[0], x, y,
(buttons & 0x40) ? 'L' : ' ', (buttons & 0x80) ? 'R' : ' ');
@ -1921,10 +1922,11 @@ static void DisplayPressedKeys (void)
case CTL_SUPERSCOPE:
{
uint8 buf[6], *p = buf;
MovieGetScope(port, buf);
int16 x = READ_WORD(p);
int16 y = READ_WORD(p + 2);
uint8 buf[6];
if (!MovieGetScope(port, buf))
break;
int16 x = READ_WORD(buf);
int16 y = READ_WORD(buf + 2);
uint8 buttons = buf[4];
sprintf(string, "#%d %d: (%03d,%03d) %c%c%c%c", port, ids[0], x, y,
(buttons & 0x80) ? 'F' : ' ', (buttons & 0x40) ? 'C' : ' ',
@ -1935,12 +1937,13 @@ static void DisplayPressedKeys (void)
case CTL_JUSTIFIER:
{
uint8 buf[11], *p = buf;
MovieGetJustifier(port, buf);
int16 x1 = READ_WORD(p);
int16 x2 = READ_WORD(p + 2);
int16 y1 = READ_WORD(p + 4);
int16 y2 = READ_WORD(p + 6);
uint8 buf[11];
if (!MovieGetJustifier(port, buf))
break;
int16 x1 = READ_WORD(buf);
int16 x2 = READ_WORD(buf + 2);
int16 y1 = READ_WORD(buf + 4);
int16 y2 = READ_WORD(buf + 6);
uint8 buttons = buf[8];
bool8 offscreen1 = buf[9];
bool8 offscreen2 = buf[10];