indent fade_darken.c

This commit is contained in:
Bill Kendrick 2017-10-15 11:44:27 -07:00
parent 16a92fb71a
commit ce8121301a

View file

@ -33,7 +33,8 @@
#include "SDL_image.h" #include "SDL_image.h"
#include "SDL_mixer.h" #include "SDL_mixer.h"
enum { enum
{
TOOL_FADE, TOOL_FADE,
TOOL_DARKEN, TOOL_DARKEN,
NUM_TOOLS NUM_TOOLS
@ -50,21 +51,14 @@ int fade_darken_get_tool_count(magic_api * api);
SDL_Surface *fade_darken_get_icon(magic_api * api, int which); SDL_Surface *fade_darken_get_icon(magic_api * api, int which);
char *fade_darken_get_name(magic_api * api, int which); char *fade_darken_get_name(magic_api * api, int which);
char *fade_darken_get_description(magic_api * api, int which, int mode); char *fade_darken_get_description(magic_api * api, int which, int mode);
static void do_fade_darken(void * ptr, int which, static void do_fade_darken(void *ptr, int which, SDL_Surface * canvas, SDL_Surface * last, int x, int y);
SDL_Surface * canvas, SDL_Surface * last, static void do_fade_darken_paint(void *ptr, int which, SDL_Surface * canvas, SDL_Surface * last, int x, int y);
int x, int y);
static void do_fade_darken_paint(void * ptr, int which,
SDL_Surface * canvas, SDL_Surface * last,
int x, int y);
void fade_darken_drag(magic_api * api, int which, SDL_Surface * canvas, void fade_darken_drag(magic_api * api, int which, SDL_Surface * canvas,
SDL_Surface * last, int ox, int oy, int x, int y, SDL_Surface * last, int ox, int oy, int x, int y, SDL_Rect * update_rect);
SDL_Rect * update_rect);
void fade_darken_click(magic_api * api, int which, int mode, void fade_darken_click(magic_api * api, int which, int mode,
SDL_Surface * canvas, SDL_Surface * last, SDL_Surface * canvas, SDL_Surface * last, int x, int y, SDL_Rect * update_rect);
int x, int y, SDL_Rect * update_rect);
void fade_darken_release(magic_api * api, int which, void fade_darken_release(magic_api * api, int which,
SDL_Surface * canvas, SDL_Surface * last, SDL_Surface * canvas, SDL_Surface * last, int x, int y, SDL_Rect * update_rect);
int x, int y, SDL_Rect * update_rect);
void fade_darken_shutdown(magic_api * api); void fade_darken_shutdown(magic_api * api);
void fade_darken_set_color(magic_api * api, Uint8 r, Uint8 g, Uint8 b); void fade_darken_set_color(magic_api * api, Uint8 r, Uint8 g, Uint8 b);
int fade_darken_requires_colors(magic_api * api, int which); int fade_darken_requires_colors(magic_api * api, int which);
@ -76,18 +70,19 @@ int fade_darken_init(magic_api * api)
{ {
char fname[1024]; char fname[1024];
snprintf(fname, sizeof(fname), "%s/sounds/magic/fade.wav", snprintf(fname, sizeof(fname), "%s/sounds/magic/fade.wav", api->data_directory);
api->data_directory);
snd_effects[TOOL_FADE] = Mix_LoadWAV(fname); snd_effects[TOOL_FADE] = Mix_LoadWAV(fname);
snprintf(fname, sizeof(fname), "%s/sounds/magic/darken.wav", snprintf(fname, sizeof(fname), "%s/sounds/magic/darken.wav", api->data_directory);
api->data_directory);
snd_effects[TOOL_DARKEN] = Mix_LoadWAV(fname); snd_effects[TOOL_DARKEN] = Mix_LoadWAV(fname);
return (1); return (1);
} }
Uint32 fade_darken_api_version(void) { return(TP_MAGIC_API_VERSION); } Uint32 fade_darken_api_version(void)
{
return (TP_MAGIC_API_VERSION);
}
// Multiple tools: // Multiple tools:
int fade_darken_get_tool_count(magic_api * api ATTRIBUTE_UNUSED) int fade_darken_get_tool_count(magic_api * api ATTRIBUTE_UNUSED)
@ -102,13 +97,11 @@ SDL_Surface * fade_darken_get_icon(magic_api * api, int which)
if (which == TOOL_FADE) if (which == TOOL_FADE)
{ {
snprintf(fname, sizeof(fname), "%s/images/magic/fade.png", snprintf(fname, sizeof(fname), "%s/images/magic/fade.png", api->data_directory);
api->data_directory);
} }
else if (which == TOOL_DARKEN) else if (which == TOOL_DARKEN)
{ {
snprintf(fname, sizeof(fname), "%s/images/magic/darken.png", snprintf(fname, sizeof(fname), "%s/images/magic/darken.png", api->data_directory);
api->data_directory);
} }
return (IMG_Load(fname)); return (IMG_Load(fname));
@ -146,9 +139,7 @@ char * fade_darken_get_description(magic_api * api ATTRIBUTE_UNUSED, int which,
return (NULL); return (NULL);
} }
static void do_fade_darken(void * ptr, int which, static void do_fade_darken(void *ptr, int which, SDL_Surface * canvas, SDL_Surface * last, int x, int y)
SDL_Surface * canvas, SDL_Surface * last,
int x, int y)
{ {
Uint8 r, g, b; Uint8 r, g, b;
magic_api *api = (magic_api *) ptr; magic_api *api = (magic_api *) ptr;
@ -172,9 +163,7 @@ static void do_fade_darken(void * ptr, int which,
} }
// Callback that does the fade_darken color effect on a circle centered around x,y // Callback that does the fade_darken color effect on a circle centered around x,y
static void do_fade_darken_paint(void * ptr, int which, static void do_fade_darken_paint(void *ptr, int which, SDL_Surface * canvas, SDL_Surface * last, int x, int y)
SDL_Surface * canvas, SDL_Surface * last,
int x, int y)
{ {
int xx, yy; int xx, yy;
magic_api *api = (magic_api *) ptr; magic_api *api = (magic_api *) ptr;
@ -183,8 +172,7 @@ static void do_fade_darken_paint(void * ptr, int which,
{ {
for (xx = x - 16; xx < x + 16; xx++) for (xx = x - 16; xx < x + 16; xx++)
{ {
if (api->in_circle(xx - x, yy - y, 16) && if (api->in_circle(xx - x, yy - y, 16) && !api->touched(xx, yy))
!api->touched(xx, yy))
{ {
do_fade_darken(api, which, canvas, last, xx, yy); do_fade_darken(api, which, canvas, last, xx, yy);
} }
@ -194,8 +182,7 @@ static void do_fade_darken_paint(void * ptr, int which,
// Ask Tux Paint to call our 'do_fade_darken_paint()' callback over a line // Ask Tux Paint to call our 'do_fade_darken_paint()' callback over a line
void fade_darken_drag(magic_api * api, int which, SDL_Surface * canvas, void fade_darken_drag(magic_api * api, int which, SDL_Surface * canvas,
SDL_Surface * last, int ox, int oy, int x, int y, SDL_Surface * last, int ox, int oy, int x, int y, SDL_Rect * update_rect)
SDL_Rect * update_rect)
{ {
SDL_LockSurface(last); SDL_LockSurface(last);
SDL_LockSurface(canvas); SDL_LockSurface(canvas);
@ -207,8 +194,20 @@ void fade_darken_drag(magic_api * api, int which, SDL_Surface * canvas,
api->playsound(snd_effects[which], (x * 255) / canvas->w, 255); api->playsound(snd_effects[which], (x * 255) / canvas->w, 255);
if (ox > x) { int tmp = ox; ox = x; x = tmp; } if (ox > x)
if (oy > y) { int tmp = oy; oy = y; y = tmp; } {
int tmp = ox;
ox = x;
x = tmp;
}
if (oy > y)
{
int tmp = oy;
oy = y;
y = tmp;
}
update_rect->x = ox - 16; update_rect->x = ox - 16;
update_rect->y = oy - 16; update_rect->y = oy - 16;
@ -219,8 +218,7 @@ void fade_darken_drag(magic_api * api, int which, SDL_Surface * canvas,
// Ask Tux Paint to call our 'do_fade_darken_paint()' callback at a single point, // Ask Tux Paint to call our 'do_fade_darken_paint()' callback at a single point,
// or 'do_fade_darken()' on the entire image // or 'do_fade_darken()' on the entire image
void fade_darken_click(magic_api * api, int which, int mode, void fade_darken_click(magic_api * api, int which, int mode,
SDL_Surface * canvas, SDL_Surface * last, SDL_Surface * canvas, SDL_Surface * last, int x, int y, SDL_Rect * update_rect)
int x, int y, SDL_Rect * update_rect)
{ {
if (mode == MODE_PAINT) if (mode == MODE_PAINT)
fade_darken_drag(api, which, canvas, last, x, y, x, y, update_rect); fade_darken_drag(api, which, canvas, last, x, y, x, y, update_rect);
@ -270,11 +268,13 @@ int fade_darken_requires_colors(magic_api * api ATTRIBUTE_UNUSED, int which ATTR
return 0; return 0;
} }
void fade_darken_switchin(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED, int mode ATTRIBUTE_UNUSED, SDL_Surface * canvas ATTRIBUTE_UNUSED) void fade_darken_switchin(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED, int mode ATTRIBUTE_UNUSED,
SDL_Surface * canvas ATTRIBUTE_UNUSED)
{ {
} }
void fade_darken_switchout(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED, int mode ATTRIBUTE_UNUSED, SDL_Surface * canvas ATTRIBUTE_UNUSED) void fade_darken_switchout(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED, int mode ATTRIBUTE_UNUSED,
SDL_Surface * canvas ATTRIBUTE_UNUSED)
{ {
} }