test/testintersections.c
changeset 6785 c094c438c0a6
parent 5535 96594ac5fd1a
child 7191 75360622e65f
     1.1 --- a/test/testintersections.c	Mon Dec 31 10:14:38 2012 -0800
     1.2 +++ b/test/testintersections.c	Mon Dec 31 10:26:38 2012 -0800
     1.3 @@ -16,12 +16,12 @@
     1.4  #include <stdio.h>
     1.5  #include <time.h>
     1.6  
     1.7 -#include "common.h"
     1.8 +#include "SDL_test_common.h"
     1.9  
    1.10  #define SWAP(typ,a,b) do{typ t=a;a=b;b=t;}while(0)
    1.11  #define NUM_OBJECTS	100
    1.12  
    1.13 -static CommonState *state;
    1.14 +static SDLTest_CommonState *state;
    1.15  static int num_objects;
    1.16  static SDL_bool cycle_color;
    1.17  static SDL_bool cycle_alpha;
    1.18 @@ -204,14 +204,14 @@
    1.19      num_objects = NUM_OBJECTS;
    1.20  
    1.21      /* Initialize test framework */
    1.22 -    state = CommonCreateState(argv, SDL_INIT_VIDEO);
    1.23 +    state = SDLTest_CommonCreateState(argv, SDL_INIT_VIDEO);
    1.24      if (!state) {
    1.25          return 1;
    1.26      }
    1.27      for (i = 1; i < argc;) {
    1.28          int consumed;
    1.29  
    1.30 -        consumed = CommonArg(state, i);
    1.31 +        consumed = SDLTest_CommonArg(state, i);
    1.32          if (consumed == 0) {
    1.33              consumed = -1;
    1.34              if (SDL_strcasecmp(argv[i], "--blend") == 0) {
    1.35 @@ -244,12 +244,12 @@
    1.36          if (consumed < 0) {
    1.37              fprintf(stderr,
    1.38                      "Usage: %s %s [--blend none|blend|add|mod] [--cyclecolor] [--cyclealpha]\n",
    1.39 -                    argv[0], CommonUsage(state));
    1.40 +                    argv[0], SDLTest_CommonUsage(state));
    1.41              return 1;
    1.42          }
    1.43          i += consumed;
    1.44      }
    1.45 -    if (!CommonInit(state)) {
    1.46 +    if (!SDLTest_CommonInit(state)) {
    1.47          return 2;
    1.48      }
    1.49  
    1.50 @@ -271,7 +271,7 @@
    1.51          /* Check for events */
    1.52          ++frames;
    1.53          while (SDL_PollEvent(&event)) {
    1.54 -            CommonEvent(state, &event, &done);
    1.55 +            SDLTest_CommonEvent(state, &event, &done);
    1.56              switch (event.type) {
    1.57              case SDL_MOUSEBUTTONDOWN:
    1.58                  mouse_begin_x = event.button.x;
    1.59 @@ -322,7 +322,7 @@
    1.60          }
    1.61      }
    1.62  
    1.63 -    CommonQuit(state);
    1.64 +    SDLTest_CommonQuit(state);
    1.65  
    1.66      /* Print out some timing information */
    1.67      now = SDL_GetTicks();