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.
*/
void
InitInputInterface ()
void InitInputInterface ()
{
void *InputDPtr;
@ -1447,8 +1446,7 @@ static ButtConfig fkbmap[0x48] = {
/**
* Update the status of the Family KeyBoard.
*/
static void
UpdateFKB ()
static void updatefkb ()
{
int x;
@ -1456,7 +1454,7 @@ UpdateFKB ()
{
fkbkeys[x] = 0;
if (DTestButton (&fkbmap[x]))
if (dtestbutton (&fkbmap[x]))
{
fkbkeys[x] = 1;
}
@ -1563,8 +1561,7 @@ static ButtConfig FTrainerButtons[12] = {
/**
* Update the status of the FTrainer input device.
*/
static void
UpdateFTrainer ()
static void UpdateFTrainer ()
{
int x;
FTrainerData = 0;
@ -1584,8 +1581,7 @@ UpdateFTrainer ()
* @param bc the NES gamepad's button config
* @param which the index of the button
*/
const char *
ButtonName (const ButtConfig * bc, int which)
const char * ButtonName (const ButtConfig * bc, int which)
{
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
* button was pressed. Used in button configuration.
*/
int
DWaitButton (const uint8 * text, ButtConfig * bc, int wb)
int DWaitButton (const uint8 * text, ButtConfig * bc, int wb)
{
SDL_Event event;
static int32 LastAx[64][64];
@ -1744,7 +1739,7 @@ DWaitButton (const uint8 * text, ButtConfig * bc, int wb)
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
* possible settings for each input button.
*/
void
ConfigButton (char *text, ButtConfig * bc)
void configbutton (char *text, buttconfig * bc)
{
uint8 buf[256];
int wc;
for (wc = 0; wc < MAXBUTTCONFIG; wc++)
for (wc = 0; wc < maxbuttconfig; wc++)
{
sprintf ((char *) buf, "%s (%d)", text, wc + 1);
DWaitButton (buf, bc, wc);
dwaitbutton (buf, bc, wc);
if (wc &&
bc->ButtType[wc] == bc->ButtType[wc - 1] &&
bc->DeviceNum[wc] == bc->DeviceNum[wc - 1] &&
bc->ButtonNum[wc] == bc->ButtonNum[wc - 1])
bc->butttype[wc] == bc->butttype[wc - 1] &&
bc->devicenum[wc] == bc->devicenum[wc - 1] &&
bc->buttonnum[wc] == bc->buttonnum[wc - 1])
{
break;
}
}
bc->NumC = wc;
bc->numc = wc;
}
/**
@ -1781,8 +1775,7 @@ ConfigButton (char *text, ButtConfig * bc)
*/
extern Config *g_config;
void
ConfigDevice (int which, int arg)
void ConfigDevice (int which, int arg)
{
char buf[256];
int x;
@ -1916,8 +1909,7 @@ ConfigDevice (int which, int arg)
/**
* Update the button configuration for a device, specified by a text string.
*/
void
InputCfg (const std::string & text)
void InputCfg (const std::string & text)
{
#ifdef _GTK
// 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
* future - soules.
*/
void
UpdateInput (Config * config)
void UpdateInput (Config * config)
{
char buf[64];
std::string device, prefix;