From 5a88d476c8fafbd2104da952a26ac8f37630baee Mon Sep 17 00:00:00 2001 From: Bill Kendrick Date: Sun, 15 Oct 2017 11:51:22 -0700 Subject: [PATCH] indent waves.c --- magic/src/waves.c | 152 ++++++++++++++++++++++++---------------------- 1 file changed, 80 insertions(+), 72 deletions(-) diff --git a/magic/src/waves.c b/magic/src/waves.c index f734b1156..a4fcfd40c 100644 --- a/magic/src/waves.c +++ b/magic/src/waves.c @@ -34,25 +34,22 @@ /* Our globals: */ -static Mix_Chunk * waves_snd[2]; +static Mix_Chunk *waves_snd[2]; /* Local function prototypes: */ Uint32 waves_api_version(void); int waves_init(magic_api * api); int waves_get_tool_count(magic_api * api); -SDL_Surface * waves_get_icon(magic_api * api, int which); -char * waves_get_name(magic_api * api, int which); -char * waves_get_description(magic_api * api, int which, int mode); +SDL_Surface *waves_get_icon(magic_api * api, int which); +char *waves_get_name(magic_api * api, int which); +char *waves_get_description(magic_api * api, int which, int mode); void waves_drag(magic_api * api, int which, SDL_Surface * canvas, - SDL_Surface * last, int ox, int oy, int x, int y, - SDL_Rect * update_rect); + SDL_Surface * last, int ox, int oy, int x, int y, SDL_Rect * update_rect); void waves_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 waves_release(magic_api * api, int which, - 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 waves_shutdown(magic_api * api); void waves_set_color(magic_api * api, Uint8 r, Uint8 g, Uint8 b); int waves_requires_colors(magic_api * api, int which); @@ -60,7 +57,10 @@ void waves_switchin(magic_api * api, int which, int mode, SDL_Surface * canvas); void waves_switchout(magic_api * api, int which, int mode, SDL_Surface * canvas); int waves_modes(magic_api * api, int which); -Uint32 waves_api_version(void) { return(TP_MAGIC_API_VERSION); } +Uint32 waves_api_version(void) +{ + return (TP_MAGIC_API_VERSION); +} // No setup required: @@ -68,16 +68,14 @@ int waves_init(magic_api * api) { char fname[1024]; - snprintf(fname, sizeof(fname), "%s/sounds/magic/waves.ogg", - api->data_directory); + snprintf(fname, sizeof(fname), "%s/sounds/magic/waves.ogg", api->data_directory); waves_snd[0] = Mix_LoadWAV(fname); - snprintf(fname, sizeof(fname), "%s/sounds/magic/wavelet.ogg", - api->data_directory); + snprintf(fname, sizeof(fname), "%s/sounds/magic/wavelet.ogg", api->data_directory); waves_snd[1] = Mix_LoadWAV(fname); - return(1); + return (1); } // We have multiple tools: @@ -87,35 +85,43 @@ int waves_get_tool_count(magic_api * api ATTRIBUTE_UNUSED) } // Load our icons: -SDL_Surface * waves_get_icon(magic_api * api, int which) +SDL_Surface *waves_get_icon(magic_api * api, int which) { char fname[1024]; - if (!which) snprintf(fname, sizeof(fname), "%s/images/magic/waves.png", api->data_directory); - else snprintf(fname, sizeof(fname), "%s/images/magic/wavelet.png", api->data_directory); + if (!which) + snprintf(fname, sizeof(fname), "%s/images/magic/waves.png", api->data_directory); + else + snprintf(fname, sizeof(fname), "%s/images/magic/wavelet.png", api->data_directory); - return(IMG_Load(fname)); + return (IMG_Load(fname)); } // Return our names, localized: -char * waves_get_name(magic_api * api ATTRIBUTE_UNUSED, int which) +char *waves_get_name(magic_api * api ATTRIBUTE_UNUSED, int which) { - if (!which) return(strdup(gettext_noop("Waves"))); - else return strdup(gettext_noop("Wavelets")); + if (!which) + return (strdup(gettext_noop("Waves"))); + else + return strdup(gettext_noop("Wavelets")); } // Return our descriptions, localized: -char * waves_get_description(magic_api * api ATTRIBUTE_UNUSED, int which, int mode ATTRIBUTE_UNUSED) +char *waves_get_description(magic_api * api ATTRIBUTE_UNUSED, int which, int mode ATTRIBUTE_UNUSED) { if (!which) - return(strdup(gettext_noop("Click to make the picture horizontally wavy. Click toward the top for shorter waves, the bottom for taller waves, the left for small waves, and the right for long waves."))); - return strdup(gettext_noop("Click to make the picture vertically wavy. Click toward the top for shorter waves, the bottom for taller waves, the left for small waves, and the right for long waves.")); -} + return (strdup + (gettext_noop + ("Click to make the picture horizontally wavy. Click toward the top for shorter waves, the bottom for taller waves, the left for small waves, and the right for long waves."))); + return + strdup(gettext_noop + ("Click to make the picture vertically wavy. Click toward the top for shorter waves, the bottom for taller waves, the left for small waves, and the right for long waves.")); +} void waves_drag(magic_api * api ATTRIBUTE_UNUSED, int which, SDL_Surface * canvas, - SDL_Surface * last, int ox ATTRIBUTE_UNUSED, int oy ATTRIBUTE_UNUSED, int x, int y, - SDL_Rect * update_rect) + SDL_Surface * last, int ox ATTRIBUTE_UNUSED, int oy ATTRIBUTE_UNUSED, int x, int y, + SDL_Rect * update_rect) { int xx, yy; SDL_Rect src, dest; @@ -123,48 +129,48 @@ void waves_drag(magic_api * api ATTRIBUTE_UNUSED, int which, SDL_Surface * canva int height; SDL_BlitSurface(last, NULL, canvas, NULL); - - if (which==0) - { - //waves effect - width = ((x * 10) / canvas->w) + 10; - height = ((canvas->h - y) / 10) + 1; - - for (yy = 0; yy < canvas->h; yy++) - { - xx = sin((yy * height) * M_PI / 180.0) * width; - src.x = 0; - src.y = yy; - src.w = canvas->w; - src.h = 1; + if (which == 0) + { + //waves effect + width = ((x * 10) / canvas->w) + 10; + height = ((canvas->h - y) / 10) + 1; - dest.x = xx; - dest.y = yy; + for (yy = 0; yy < canvas->h; yy++) + { + xx = sin((yy * height) * M_PI / 180.0) * width; - SDL_BlitSurface(last, &src, canvas, &dest); - } - } + src.x = 0; + src.y = yy; + src.w = canvas->w; + src.h = 1; + + dest.x = xx; + dest.y = yy; + + SDL_BlitSurface(last, &src, canvas, &dest); + } + } else - { - width = ((x * 10) / canvas->w) + 10; - height = ((canvas->h - y) / 10) + 1; - - for (xx = 0; xx < canvas->w; xx++) - { - yy = sin((xx * height) * M_PI / 180.0) * width; + { + width = ((x * 10) / canvas->w) + 10; + height = ((canvas->h - y) / 10) + 1; - src.x = xx; - src.y = 0; - src.w = 1; - src.h = canvas->h; + for (xx = 0; xx < canvas->w; xx++) + { + yy = sin((xx * height) * M_PI / 180.0) * width; - dest.x = xx; - dest.y = yy; + src.x = xx; + src.y = 0; + src.w = 1; + src.h = canvas->h; - SDL_BlitSurface(last, &src, canvas, &dest); - } - } + dest.x = xx; + dest.y = yy; + + SDL_BlitSurface(last, &src, canvas, &dest); + } + } update_rect->x = 0; update_rect->y = 0; update_rect->w = canvas->w; @@ -173,8 +179,7 @@ void waves_drag(magic_api * api ATTRIBUTE_UNUSED, int which, SDL_Surface * canva // Affect the canvas on click: void waves_click(magic_api * api, int which, int mode ATTRIBUTE_UNUSED, - 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) { waves_drag(api, which, canvas, last, x, y, x, y, update_rect); api->playsound(waves_snd[which], 128, 255); @@ -182,8 +187,8 @@ void waves_click(magic_api * api, int which, int mode ATTRIBUTE_UNUSED, // Affect the canvas on release: void waves_release(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED, - SDL_Surface * canvas ATTRIBUTE_UNUSED, SDL_Surface * last ATTRIBUTE_UNUSED, - int x ATTRIBUTE_UNUSED, int y ATTRIBUTE_UNUSED, SDL_Rect * update_rect ATTRIBUTE_UNUSED) + SDL_Surface * canvas ATTRIBUTE_UNUSED, SDL_Surface * last ATTRIBUTE_UNUSED, + int x ATTRIBUTE_UNUSED, int y ATTRIBUTE_UNUSED, SDL_Rect * update_rect ATTRIBUTE_UNUSED) { } @@ -197,7 +202,8 @@ void waves_shutdown(magic_api * api ATTRIBUTE_UNUSED) } // Record the color from Tux Paint: -void waves_set_color(magic_api * api ATTRIBUTE_UNUSED, Uint8 r ATTRIBUTE_UNUSED, Uint8 g ATTRIBUTE_UNUSED, Uint8 b ATTRIBUTE_UNUSED) +void waves_set_color(magic_api * api ATTRIBUTE_UNUSED, Uint8 r ATTRIBUTE_UNUSED, Uint8 g ATTRIBUTE_UNUSED, + Uint8 b ATTRIBUTE_UNUSED) { } @@ -207,15 +213,17 @@ int waves_requires_colors(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_ return 0; } -void waves_switchin(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED, int mode ATTRIBUTE_UNUSED, SDL_Surface * canvas ATTRIBUTE_UNUSED) +void waves_switchin(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED, int mode ATTRIBUTE_UNUSED, + SDL_Surface * canvas ATTRIBUTE_UNUSED) { } -void waves_switchout(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED, int mode ATTRIBUTE_UNUSED, SDL_Surface * canvas ATTRIBUTE_UNUSED) +void waves_switchout(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED, int mode ATTRIBUTE_UNUSED, + SDL_Surface * canvas ATTRIBUTE_UNUSED) { } int waves_modes(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED) { - return(MODE_PAINT); + return (MODE_PAINT); }