Merge commit '3a7f96fd99528968c39b5be81db067ca018d432b' into dev
This commit is contained in:
11
external/SDL/test/testintersections.c
vendored
11
external/SDL/test/testintersections.c
vendored
@@ -29,8 +29,8 @@
|
||||
|
||||
static SDLTest_CommonState *state;
|
||||
static int num_objects;
|
||||
static SDL_bool cycle_color;
|
||||
static SDL_bool cycle_alpha;
|
||||
static bool cycle_color;
|
||||
static bool cycle_alpha;
|
||||
static int cycle_direction = 1;
|
||||
static int current_alpha = 255;
|
||||
static int current_color = 255;
|
||||
@@ -295,9 +295,6 @@ int main(int argc, char *argv[])
|
||||
return 1;
|
||||
}
|
||||
|
||||
/* Enable standard application logging */
|
||||
SDL_SetLogPriority(SDL_LOG_CATEGORY_APPLICATION, SDL_LOG_PRIORITY_INFO);
|
||||
|
||||
for (i = 1; i < argc;) {
|
||||
int consumed;
|
||||
|
||||
@@ -330,10 +327,10 @@ int main(int argc, char *argv[])
|
||||
}
|
||||
}
|
||||
} else if (SDL_strcasecmp(argv[i], "--cyclecolor") == 0) {
|
||||
cycle_color = SDL_TRUE;
|
||||
cycle_color = true;
|
||||
consumed = 1;
|
||||
} else if (SDL_strcasecmp(argv[i], "--cyclealpha") == 0) {
|
||||
cycle_alpha = SDL_TRUE;
|
||||
cycle_alpha = true;
|
||||
consumed = 1;
|
||||
} else if (num_objects < 0 && SDL_isdigit(*argv[i])) {
|
||||
char *endptr = NULL;
|
||||
|
||||
Reference in New Issue
Block a user