From cc7dd8e3c936f81502da2f53b4172ff99b919ad5 Mon Sep 17 00:00:00 2001 From: Bill Kendrick Date: Sun, 15 Oct 2017 11:51:18 -0700 Subject: [PATCH] indent tv.c --- magic/src/tv.c | 134 ++++++++++++++++++++++++------------------------- 1 file changed, 67 insertions(+), 67 deletions(-) diff --git a/magic/src/tv.c b/magic/src/tv.c index 4c08ce156..95e893d8b 100644 --- a/magic/src/tv.c +++ b/magic/src/tv.c @@ -32,42 +32,37 @@ int RADIUS = 16; -Mix_Chunk * tv_snd; +Mix_Chunk *tv_snd; Uint32 tv_api_version(void); void tv_set_color(magic_api * api, Uint8 r, Uint8 g, Uint8 b); int tv_init(magic_api * api); int tv_get_tool_count(magic_api * api); -SDL_Surface * tv_get_icon(magic_api * api, int which); -char * tv_get_name(magic_api * api, int which); -char * tv_get_description(magic_api * api, int which, int mode); +SDL_Surface *tv_get_icon(magic_api * api, int which); +char *tv_get_name(magic_api * api, int which); +char *tv_get_description(magic_api * api, int which, int mode); int tv_requires_colors(magic_api * api, int which); void tv_release(magic_api * api, int which, - SDL_Surface * canvas, SDL_Surface * snapshot, - int x, int y, SDL_Rect * update_rect); + SDL_Surface * canvas, SDL_Surface * snapshot, int x, int y, SDL_Rect * update_rect); void tv_shutdown(magic_api * api); -void tv_paint_tv(void * ptr_to_api, int which_tool, - SDL_Surface * canvas, SDL_Surface * snapshot, int x, int y); -void tv_do_tv(void * ptr_to_api, int which_tool, - SDL_Surface * canvas, SDL_Surface * snapshot, int x, int y); +void tv_paint_tv(void *ptr_to_api, int which_tool, SDL_Surface * canvas, SDL_Surface * snapshot, int x, int y); +void tv_do_tv(void *ptr_to_api, int which_tool, SDL_Surface * canvas, SDL_Surface * snapshot, int x, int y); void tv_drag(magic_api * api, int which, SDL_Surface * canvas, - SDL_Surface * snapshot, int ox, int oy, int x, int y, - SDL_Rect * update_rect); + SDL_Surface * snapshot, int ox, int oy, int x, int y, SDL_Rect * update_rect); void tv_click(magic_api * api, int which, int mode, - SDL_Surface * canvas, SDL_Surface * last, - int x, int y, SDL_Rect * update_rect); + SDL_Surface * canvas, SDL_Surface * last, int x, int y, SDL_Rect * update_rect); void tv_switchin(magic_api * api, int which, int mode, SDL_Surface * canvas); void tv_switchout(magic_api * api, int which, int mode, SDL_Surface * canvas); int tv_modes(magic_api * api, int which); -// Housekeeping functions +// Housekeeping functions Uint32 tv_api_version(void) { - return(TP_MAGIC_API_VERSION); + return (TP_MAGIC_API_VERSION); } -void tv_set_color(magic_api * api ATTRIBUTE_UNUSED, Uint8 r ATTRIBUTE_UNUSED, Uint8 g ATTRIBUTE_UNUSED, Uint8 b ATTRIBUTE_UNUSED) //get the colors from API and store it in structure +void tv_set_color(magic_api * api ATTRIBUTE_UNUSED, Uint8 r ATTRIBUTE_UNUSED, Uint8 g ATTRIBUTE_UNUSED, Uint8 b ATTRIBUTE_UNUSED) //get the colors from API and store it in structure { } @@ -75,79 +70,83 @@ void tv_set_color(magic_api * api ATTRIBUTE_UNUSED, Uint8 r ATTRIBUTE_UNUSED, Ui int tv_init(magic_api * api ATTRIBUTE_UNUSED) { char fname[1024]; - - snprintf(fname, sizeof(fname), "%s/sounds/magic/tv.ogg", api->data_directory); - tv_snd = Mix_LoadWAV(fname); - return(1); + snprintf(fname, sizeof(fname), "%s/sounds/magic/tv.ogg", api->data_directory); + tv_snd = Mix_LoadWAV(fname); + + return (1); } -int tv_get_tool_count(magic_api * api ATTRIBUTE_UNUSED) +int tv_get_tool_count(magic_api * api ATTRIBUTE_UNUSED) { return 1; } -SDL_Surface * tv_get_icon(magic_api * api, int which ATTRIBUTE_UNUSED) +SDL_Surface *tv_get_icon(magic_api * api, int which ATTRIBUTE_UNUSED) { char fname[1024]; - snprintf(fname, sizeof(fname), "%s/images/magic/tv.png", - api->data_directory); + snprintf(fname, sizeof(fname), "%s/images/magic/tv.png", api->data_directory); - return(IMG_Load(fname)); + return (IMG_Load(fname)); } -char * tv_get_name(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED) { return strdup(gettext_noop("TV")); } +char *tv_get_name(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED) +{ + return strdup(gettext_noop("TV")); +} -char * tv_get_description(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED, int mode) -{ +char *tv_get_description(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED, int mode) +{ if (mode == MODE_PAINT) - return strdup(gettext_noop("Click and drag to make parts of your picture look like they are on television.")); + return strdup(gettext_noop("Click and drag to make parts of your picture look like they are on television.")); else - return strdup(gettext_noop("Click to make your picture look like it's on television.")); + return strdup(gettext_noop("Click to make your picture look like it's on television.")); } -int tv_requires_colors(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED) { return 0; } +int tv_requires_colors(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED) +{ + return 0; +} void tv_release(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED, - SDL_Surface * canvas ATTRIBUTE_UNUSED, SDL_Surface * snapshot ATTRIBUTE_UNUSED, - int x ATTRIBUTE_UNUSED, int y ATTRIBUTE_UNUSED, SDL_Rect * update_rect ATTRIBUTE_UNUSED) + SDL_Surface * canvas ATTRIBUTE_UNUSED, SDL_Surface * snapshot ATTRIBUTE_UNUSED, + int x ATTRIBUTE_UNUSED, int y ATTRIBUTE_UNUSED, SDL_Rect * update_rect ATTRIBUTE_UNUSED) { } -void tv_shutdown(magic_api * api ATTRIBUTE_UNUSED) - { Mix_FreeChunk(tv_snd); } +void tv_shutdown(magic_api * api ATTRIBUTE_UNUSED) +{ + Mix_FreeChunk(tv_snd); +} // Interactivity functions -void tv_paint_tv(void * ptr_to_api, int which_tool ATTRIBUTE_UNUSED, - SDL_Surface * canvas, SDL_Surface * snapshot ATTRIBUTE_UNUSED, int x, int y) +void tv_paint_tv(void *ptr_to_api, int which_tool ATTRIBUTE_UNUSED, + SDL_Surface * canvas, SDL_Surface * snapshot ATTRIBUTE_UNUSED, int x, int y) { int i, j; - magic_api * api = (magic_api *) ptr_to_api; + magic_api *api = (magic_api *) ptr_to_api; for (i = x - RADIUS; i < x + RADIUS; i++) for (j = y - RADIUS; j < y + RADIUS; j++) - if ((j + 1) % 2 && - api->in_circle(i - x, j - y, RADIUS) && - ! api->touched(i, j)) - api->putpixel(canvas, i, j, SDL_MapRGB(canvas->format, 128, 128, 165)); + if ((j + 1) % 2 && api->in_circle(i - x, j - y, RADIUS) && !api->touched(i, j)) + api->putpixel(canvas, i, j, SDL_MapRGB(canvas->format, 128, 128, 165)); } -void tv_do_tv(void * ptr_to_api, int which_tool ATTRIBUTE_UNUSED, - SDL_Surface * canvas, SDL_Surface * snapshot ATTRIBUTE_UNUSED, int x, int y) +void tv_do_tv(void *ptr_to_api, int which_tool ATTRIBUTE_UNUSED, + SDL_Surface * canvas, SDL_Surface * snapshot ATTRIBUTE_UNUSED, int x, int y) { - magic_api * api = (magic_api *) ptr_to_api; - - api->putpixel(canvas, x, y, SDL_MapRGB(canvas->format, 128, 128, 165)); - //api->putpixel(canvas, x, y, SDL_MapRGB(canvas->format, 0, 0, 255)); + magic_api *api = (magic_api *) ptr_to_api; + + api->putpixel(canvas, x, y, SDL_MapRGB(canvas->format, 128, 128, 165)); + //api->putpixel(canvas, x, y, SDL_MapRGB(canvas->format, 0, 0, 255)); } void tv_drag(magic_api * api, int which, SDL_Surface * canvas, - SDL_Surface * snapshot, int ox, int oy, int x, int y, - SDL_Rect * update_rect) + SDL_Surface * snapshot, int ox, int oy, int x, int y, SDL_Rect * update_rect) { api->line(api, which, canvas, snapshot, ox, oy, x, y, 1, tv_paint_tv); @@ -159,38 +158,39 @@ void tv_drag(magic_api * api, int which, SDL_Surface * canvas, } void tv_click(magic_api * api, int which, int mode, - SDL_Surface * canvas, SDL_Surface * last, - int x, int y, SDL_Rect * update_rect) + SDL_Surface * canvas, SDL_Surface * last, int x, int y, SDL_Rect * update_rect) { if (mode == MODE_FULLSCREEN) { - int i; + int i; - for (i=0; ih; i+=2) - api->line(api, which, canvas, last, 0, i, canvas->w, i, 1, tv_do_tv); + for (i = 0; i < canvas->h; i += 2) + api->line(api, which, canvas, last, 0, i, canvas->w, i, 1, tv_do_tv); - update_rect->w=canvas->w; - update_rect->h=canvas->h; - update_rect->x=update_rect->y=0; - api->playsound(tv_snd, 128,255); + update_rect->w = canvas->w; + update_rect->h = canvas->h; + update_rect->x = update_rect->y = 0; + api->playsound(tv_snd, 128, 255); } else { - tv_drag(api, which, canvas, last, x, y, x, y, update_rect); + tv_drag(api, which, canvas, last, x, y, x, y, update_rect); } } -void tv_switchin(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED, int mode ATTRIBUTE_UNUSED, SDL_Surface * canvas ATTRIBUTE_UNUSED) -{ - +void tv_switchin(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED, int mode ATTRIBUTE_UNUSED, + SDL_Surface * canvas ATTRIBUTE_UNUSED) +{ + } -void tv_switchout(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED, int mode ATTRIBUTE_UNUSED, SDL_Surface * canvas ATTRIBUTE_UNUSED) +void tv_switchout(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED, int mode ATTRIBUTE_UNUSED, + SDL_Surface * canvas ATTRIBUTE_UNUSED) { - + } int tv_modes(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED) { - return(MODE_FULLSCREEN | MODE_PAINT); + return (MODE_FULLSCREEN | MODE_PAINT); }