pandory500/SDL-mirror
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Minor cleanup.

Browse source
This commit is contained in:
Ryan C. Gordon 2013-02-25 00:47:47 -05:00
parent 3d19f803d8
commit db73a392c2
1 changed files with 3 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
test/testgamecontroller.c
View file

@ -88,19 +88,18 @@ ControllerButtonName(const SDL_CONTROLLER_BUTTON button)
void void
WatchGameController(SDL_GameController * gamecontroller) WatchGameController(SDL_GameController * gamecontroller)
{ {
const char *controllername = gamecontroller ? SDL_GameControllerName(gamecontroller) : "???"; const char *name = SDL_GameControllerName(gamecontroller);
const char *basetitle = "Game Controller Test: "; const char *basetitle = "Game Controller Test: ";
const size_t titlelen = SDL_strlen(basetitle) + SDL_strlen(controllername) + 1; const size_t titlelen = SDL_strlen(basetitle) + SDL_strlen(name) + 1;
char *title = SDL_malloc(titlelen); char *title = SDL_malloc(titlelen);
SDL_Window *window = NULL; SDL_Window *window = NULL;
SDL_Renderer *screen = NULL; SDL_Renderer *screen = NULL;
const char *name = NULL;
int done = 0; int done = 0;
SDL_Event event; SDL_Event event;
int i; int i;
if (title) { if (title) {
SDL_snprintf(title, titlelen, "%s%s", basetitle, controllername); SDL_snprintf(title, titlelen, "%s%s", basetitle, name);
} }
/* Create a window to display controller axis position */ /* Create a window to display controller axis position */
@ -125,7 +124,6 @@ WatchGameController(SDL_GameController * gamecontroller)
SDL_RaiseWindow(window); SDL_RaiseWindow(window);
/* Print info about the controller we are watching */ /* Print info about the controller we are watching */
name = SDL_GameControllerName(gamecontroller);
printf("Watching controller %s\n", name ? name : "Unknown Controller"); printf("Watching controller %s\n", name ? name : "Unknown Controller");
/* Loop, getting controller events! */ /* Loop, getting controller events! */