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

sdl: fix formatting in code

This commit is contained in:
punkrockguy318 2013-03-16 02:37:50 +00:00
parent 3d1484c7e7
commit 5eeafe4ae3
1 changed files with 858 additions and 867 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
trunk/src/drivers/sdl/input.cpp
View File

@ -1342,8 +1342,7 @@ FCEUD_SetInput (bool fourscore, bool microphone, ESI port0, ESI port1,
/** /**
* Initialize the input device interface between the emulation and the driver. * Initialize the input device interface between the emulation and the driver.
*/ */
void void InitInputInterface ()
InitInputInterface ()
{ {
void *InputDPtr; void *InputDPtr;
@ -1447,8 +1446,7 @@ static ButtConfig fkbmap[0x48] = {
/** /**
* Update the status of the Family KeyBoard. * Update the status of the Family KeyBoard.
*/ */
static void static void updatefkb ()
UpdateFKB ()
{ {
int x; int x;
@ -1456,7 +1454,7 @@ UpdateFKB ()
{ {
fkbkeys[x] = 0; fkbkeys[x] = 0;
if (DTestButton (&fkbmap[x])) if (dtestbutton (&fkbmap[x]))
{ {
fkbkeys[x] = 1; fkbkeys[x] = 1;
} }
@ -1563,8 +1561,7 @@ static ButtConfig FTrainerButtons[12] = {
/** /**
* Update the status of the FTrainer input device. * Update the status of the FTrainer input device.
*/ */
static void static void UpdateFTrainer ()
UpdateFTrainer ()
{ {
int x; int x;
FTrainerData = 0; FTrainerData = 0;
@ -1584,8 +1581,7 @@ UpdateFTrainer ()
* @param bc the NES gamepad's button config * @param bc the NES gamepad's button config
* @param which the index of the button * @param which the index of the button
*/ */
const char * const char * ButtonName (const ButtConfig * bc, int which)
ButtonName (const ButtConfig * bc, int which)
{ {
static char name[256]; static char name[256];
@ -1647,8 +1643,7 @@ ButtonName (const ButtConfig * bc, int which)
* Waits for a button input and returns the information as to which * Waits for a button input and returns the information as to which
* button was pressed. Used in button configuration. * button was pressed. Used in button configuration.
*/ */
int int DWaitButton (const uint8 * text, ButtConfig * bc, int wb)
DWaitButton (const uint8 * text, ButtConfig * bc, int wb)
{ {
SDL_Event event; SDL_Event event;
static int32 LastAx[64][64]; static int32 LastAx[64][64];
@ -1744,7 +1739,7 @@ DWaitButton (const uint8 * text, ButtConfig * bc, int wb)
break; break;
} }
return (0); return 0;
} }
/** /**
@ -1754,26 +1749,25 @@ DWaitButton (const uint8 * text, ButtConfig * bc, int wb)
* used as input for the specified button, thus allowing up to four * used as input for the specified button, thus allowing up to four
* possible settings for each input button. * possible settings for each input button.
*/ */
void void configbutton (char *text, buttconfig * bc)
ConfigButton (char *text, ButtConfig * bc)
{ {
uint8 buf[256]; uint8 buf[256];
int wc; int wc;
for (wc = 0; wc < MAXBUTTCONFIG; wc++) for (wc = 0; wc < maxbuttconfig; wc++)
{ {
sprintf ((char *) buf, "%s (%d)", text, wc + 1); sprintf ((char *) buf, "%s (%d)", text, wc + 1);
DWaitButton (buf, bc, wc); dwaitbutton (buf, bc, wc);
if (wc && if (wc &&
bc->ButtType[wc] == bc->ButtType[wc - 1] && bc->butttype[wc] == bc->butttype[wc - 1] &&
bc->DeviceNum[wc] == bc->DeviceNum[wc - 1] && bc->devicenum[wc] == bc->devicenum[wc - 1] &&
bc->ButtonNum[wc] == bc->ButtonNum[wc - 1]) bc->buttonnum[wc] == bc->buttonnum[wc - 1])
{ {
break; break;
} }
} }
bc->NumC = wc; bc->numc = wc;
} }
/** /**
@ -1781,8 +1775,7 @@ ConfigButton (char *text, ButtConfig * bc)
*/ */
extern Config *g_config; extern Config *g_config;
void void ConfigDevice (int which, int arg)
ConfigDevice (int which, int arg)
{ {
char buf[256]; char buf[256];
int x; int x;
@ -1916,8 +1909,7 @@ ConfigDevice (int which, int arg)
/** /**
* Update the button configuration for a device, specified by a text string. * Update the button configuration for a device, specified by a text string.
*/ */
void void InputCfg (const std::string & text)
InputCfg (const std::string & text)
{ {
#ifdef _GTK #ifdef _GTK
// enable noGui to prevent the gtk x11 hack from executing // enable noGui to prevent the gtk x11 hack from executing
@ -1970,8 +1962,7 @@ InputCfg (const std::string & text)
* configuration management. Will probably want to change this in the * configuration management. Will probably want to change this in the
* future - soules. * future - soules.
*/ */
void void UpdateInput (Config * config)
UpdateInput (Config * config)
{ {
char buf[64]; char buf[64];
std::string device, prefix; std::string device, prefix;