Re-ran indent on all .c & .h source code files
Like so --
find . -name "*.c" -or -name "*.h" -exec indent -nbfda -npcs -npsl -bli0 --no-tabs {} \;
The `indent` invocation differs from the last one noted in
CHANGES.txt (from 2006!?), in that I've added "--no-tabs",
to ensure indents are all space-based.
This commit is contained in:
Bill Kendrick
parent
09f332367f
commit
cc05925d9e
99 changed files with 31659 additions and 27102 deletions
|
|
@ -59,7 +59,7 @@ static Mix_Chunk *clone_start_snd, *clone_snd;
|
|||
int clone_state;
|
||||
int clone_src_x, clone_src_y;
|
||||
int clone_drag_start_x, clone_drag_start_y;
|
||||
SDL_Surface * clone_last;
|
||||
SDL_Surface *clone_last;
|
||||
int clone_crosshair_visible;
|
||||
|
||||
|
||||
|
|
@ -73,31 +73,38 @@ char *clone_get_name(magic_api * api, int which);
|
|||
int clone_get_group(magic_api * api, int which);
|
||||
char *clone_get_description(magic_api * api, int which, int mode);
|
||||
void clone_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 clone_doit(magic_api * api, int which, SDL_Surface * canvas,
|
||||
SDL_Surface * last, int ox, int oy, int x, int y, SDL_Rect * update_rect,
|
||||
int crosshairs);
|
||||
void clone_click(magic_api * api, int which, int mode,
|
||||
SDL_Surface * canvas, SDL_Surface * last, int x, int y, SDL_Rect * update_rect);
|
||||
void clone_release(magic_api * api, int which, SDL_Surface * canvas, SDL_Surface * last, int x, int y, SDL_Rect * update_rect);
|
||||
SDL_Surface * last, int ox, int oy, int x, int y,
|
||||
SDL_Rect * update_rect, int crosshairs);
|
||||
void clone_click(magic_api * api, int which, int mode, SDL_Surface * canvas,
|
||||
SDL_Surface * last, int x, int y, SDL_Rect * update_rect);
|
||||
void clone_release(magic_api * api, int which, SDL_Surface * canvas,
|
||||
SDL_Surface * last, int x, int y, SDL_Rect * update_rect);
|
||||
void clone_shutdown(magic_api * api);
|
||||
void clone_set_color(magic_api * api, Uint8 r, Uint8 g, Uint8 b);
|
||||
int clone_requires_colors(magic_api * api, int which);
|
||||
void clone_switchin(magic_api * api, int which, int mode, SDL_Surface * canvas);
|
||||
void clone_switchout(magic_api * api, int which, int mode, SDL_Surface * canvas);
|
||||
void clone_switchin(magic_api * api, int which, int mode,
|
||||
SDL_Surface * canvas);
|
||||
void clone_switchout(magic_api * api, int which, int mode,
|
||||
SDL_Surface * canvas);
|
||||
int clone_modes(magic_api * api, int which);
|
||||
void clone_crosshairs(magic_api * api, SDL_Surface * canvas, int x, int y);
|
||||
void done_cloning(magic_api * api, SDL_Surface * canvas, SDL_Rect * update_rect);
|
||||
void done_cloning(magic_api * api, SDL_Surface * canvas,
|
||||
SDL_Rect * update_rect);
|
||||
|
||||
// No setup required:
|
||||
int clone_init(magic_api * api)
|
||||
{
|
||||
char fname[1024];
|
||||
|
||||
snprintf(fname, sizeof(fname), "%ssounds/magic/clone_start.ogg", api->data_directory);
|
||||
snprintf(fname, sizeof(fname), "%ssounds/magic/clone_start.ogg",
|
||||
api->data_directory);
|
||||
clone_start_snd = Mix_LoadWAV(fname);
|
||||
|
||||
snprintf(fname, sizeof(fname), "%ssounds/magic/clone.ogg", api->data_directory);
|
||||
snprintf(fname, sizeof(fname), "%ssounds/magic/clone.ogg",
|
||||
api->data_directory);
|
||||
clone_snd = Mix_LoadWAV(fname);
|
||||
|
||||
clone_state = CLONE_READY_TO_START;
|
||||
|
|
@ -122,34 +129,42 @@ SDL_Surface *clone_get_icon(magic_api * api, int which ATTRIBUTE_UNUSED)
|
|||
{
|
||||
char fname[1024];
|
||||
|
||||
snprintf(fname, sizeof(fname), "%simages/magic/clone.png", api->data_directory);
|
||||
snprintf(fname, sizeof(fname), "%simages/magic/clone.png",
|
||||
api->data_directory);
|
||||
|
||||
return (IMG_Load(fname));
|
||||
}
|
||||
|
||||
// Return our names, localized:
|
||||
char *clone_get_name(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED)
|
||||
char *clone_get_name(magic_api * api ATTRIBUTE_UNUSED,
|
||||
int which ATTRIBUTE_UNUSED)
|
||||
{
|
||||
return (strdup(gettext_noop("Clone")));
|
||||
}
|
||||
|
||||
// Return our groups:
|
||||
int clone_get_group(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED)
|
||||
int clone_get_group(magic_api * api ATTRIBUTE_UNUSED,
|
||||
int which ATTRIBUTE_UNUSED)
|
||||
{
|
||||
return MAGIC_TYPE_DISTORTS;
|
||||
}
|
||||
|
||||
// Return our descriptions, localized:
|
||||
char *clone_get_description(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED, int mode ATTRIBUTE_UNUSED)
|
||||
char *clone_get_description(magic_api * api ATTRIBUTE_UNUSED,
|
||||
int which ATTRIBUTE_UNUSED,
|
||||
int mode ATTRIBUTE_UNUSED)
|
||||
{
|
||||
return (strdup(gettext_noop("Click once to pick a spot to begin cloning. Click again and drag to clone that part of the picture.")));
|
||||
return (strdup
|
||||
(gettext_noop
|
||||
("Click once to pick a spot to begin cloning. Click again and drag to clone that part of the picture.")));
|
||||
|
||||
return (NULL);
|
||||
}
|
||||
|
||||
// Do the effect:
|
||||
|
||||
static void do_clone(void *ptr, int which ATTRIBUTE_UNUSED, SDL_Surface * canvas, SDL_Surface * last, int x, int y)
|
||||
static void do_clone(void *ptr, int which ATTRIBUTE_UNUSED,
|
||||
SDL_Surface * canvas, SDL_Surface * last, int x, int y)
|
||||
{
|
||||
magic_api *api = (magic_api *) ptr;
|
||||
Uint8 r, g, b;
|
||||
|
|
@ -161,25 +176,27 @@ static void do_clone(void *ptr, int which ATTRIBUTE_UNUSED, SDL_Surface * canvas
|
|||
srcy = clone_src_y + (y - clone_drag_start_y);
|
||||
|
||||
if (!api->touched(x, y))
|
||||
{
|
||||
for (yy = -16; yy < 16; yy++)
|
||||
{
|
||||
for (yy = -16; yy < 16; yy++)
|
||||
for (xx = -16; xx < 16; xx++)
|
||||
{
|
||||
if (api->in_circle(xx, yy, 16))
|
||||
{
|
||||
for (xx = -16; xx < 16; xx++)
|
||||
{
|
||||
if (api->in_circle(xx, yy, 16))
|
||||
{
|
||||
SDL_GetRGB(api->getpixel(last, srcx + xx, srcy + yy), last->format, &r, &g, &b);
|
||||
pixel = SDL_MapRGB(canvas->format, r, g, b);
|
||||
api->putpixel(canvas, x + xx, y + yy, pixel);
|
||||
}
|
||||
}
|
||||
SDL_GetRGB(api->getpixel(last, srcx + xx, srcy + yy), last->format,
|
||||
&r, &g, &b);
|
||||
pixel = SDL_MapRGB(canvas->format, r, g, b);
|
||||
api->putpixel(canvas, x + xx, y + yy, pixel);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Affect the canvas on drag:
|
||||
void clone_drag(magic_api * api, int which, SDL_Surface * canvas,
|
||||
SDL_Surface * last ATTRIBUTE_UNUSED, int ox, int oy, int x, int y, SDL_Rect * update_rect)
|
||||
SDL_Surface * last ATTRIBUTE_UNUSED, int ox, int oy, int x,
|
||||
int y, SDL_Rect * update_rect)
|
||||
{
|
||||
/* Step 3 - Actively cloning (moving the mouse) */
|
||||
|
||||
|
|
@ -192,8 +209,8 @@ void clone_drag(magic_api * api, int which, SDL_Surface * canvas,
|
|||
}
|
||||
|
||||
void clone_doit(magic_api * api, int which, SDL_Surface * canvas,
|
||||
SDL_Surface * last, int ox, int oy, int x, int y, SDL_Rect * update_rect,
|
||||
int crosshairs)
|
||||
SDL_Surface * last, int ox, int oy, int x, int y,
|
||||
SDL_Rect * update_rect, int crosshairs)
|
||||
{
|
||||
if (clone_state != CLONE_CLONING)
|
||||
return;
|
||||
|
|
@ -201,28 +218,29 @@ void clone_doit(magic_api * api, int which, SDL_Surface * canvas,
|
|||
clone_drag_start_x = ox;
|
||||
clone_drag_start_y = oy;
|
||||
|
||||
api->line((void *)api, which, canvas, last, ox, oy, x, y, 1, do_clone);
|
||||
api->line((void *) api, which, canvas, last, ox, oy, x, y, 1, do_clone);
|
||||
|
||||
/* Move source position relative to mouse motion */
|
||||
clone_src_x += (x - ox);
|
||||
clone_src_y += (y - oy);
|
||||
|
||||
if (ox > x)
|
||||
{
|
||||
int tmp = ox;
|
||||
{
|
||||
int tmp = ox;
|
||||
|
||||
ox = x;
|
||||
x = tmp;
|
||||
}
|
||||
ox = x;
|
||||
x = tmp;
|
||||
}
|
||||
if (oy > y)
|
||||
{
|
||||
int tmp = oy;
|
||||
{
|
||||
int tmp = oy;
|
||||
|
||||
oy = y;
|
||||
y = tmp;
|
||||
}
|
||||
oy = y;
|
||||
y = tmp;
|
||||
}
|
||||
|
||||
if (crosshairs) {
|
||||
if (crosshairs)
|
||||
{
|
||||
clone_crosshairs(api, canvas, clone_src_x, clone_src_y);
|
||||
/* FIXME be more clever */
|
||||
update_rect->x = 0;
|
||||
|
|
@ -230,7 +248,9 @@ void clone_doit(magic_api * api, int which, SDL_Surface * canvas,
|
|||
update_rect->w = canvas->w;
|
||||
update_rect->h = canvas->h;
|
||||
clone_crosshair_visible = 1;
|
||||
} else {
|
||||
}
|
||||
else
|
||||
{
|
||||
update_rect->x = x - 64;
|
||||
update_rect->y = y - 64;
|
||||
update_rect->w = (ox + 128) - update_rect->x;
|
||||
|
|
@ -242,9 +262,11 @@ void clone_doit(magic_api * api, int which, SDL_Surface * canvas,
|
|||
|
||||
// Affect the canvas on click:
|
||||
void clone_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)
|
||||
{
|
||||
if (clone_state == CLONE_READY_TO_START) {
|
||||
if (clone_state == CLONE_READY_TO_START)
|
||||
{
|
||||
/* Step 1 - Picking a source for the clone */
|
||||
clone_src_x = x;
|
||||
clone_src_y = y;
|
||||
|
|
@ -260,47 +282,57 @@ void clone_click(magic_api * api, int which, int mode ATTRIBUTE_UNUSED,
|
|||
update_rect->y = y - 15;
|
||||
update_rect->w = 32;
|
||||
update_rect->h = 32;
|
||||
} else if (clone_state == CLONE_CLONING) {
|
||||
}
|
||||
else if (clone_state == CLONE_CLONING)
|
||||
{
|
||||
/* Step 2 - Starting a clone (hopefully holding mouse down here) */
|
||||
clone_doit(api, which, canvas, clone_last, x, y, x, y, update_rect, 0);
|
||||
}
|
||||
}
|
||||
|
||||
void clone_release(magic_api * api, int which ATTRIBUTE_UNUSED,
|
||||
SDL_Surface * canvas, SDL_Surface * last ATTRIBUTE_UNUSED,
|
||||
int x ATTRIBUTE_UNUSED, int y ATTRIBUTE_UNUSED, SDL_Rect * update_rect)
|
||||
SDL_Surface * canvas, SDL_Surface * last ATTRIBUTE_UNUSED,
|
||||
int x ATTRIBUTE_UNUSED, int y ATTRIBUTE_UNUSED,
|
||||
SDL_Rect * update_rect)
|
||||
{
|
||||
if (clone_state == CLONE_STARTING) {
|
||||
if (clone_state == CLONE_STARTING)
|
||||
{
|
||||
/* Release of the initial click (to pick initial source position);
|
||||
now ready for second click (to begin cloning) */
|
||||
clone_state = CLONE_CLONING;
|
||||
} else {
|
||||
}
|
||||
else
|
||||
{
|
||||
done_cloning(api, canvas, update_rect);
|
||||
}
|
||||
}
|
||||
|
||||
void done_cloning(magic_api * api, SDL_Surface * canvas, SDL_Rect * update_rect) {
|
||||
void done_cloning(magic_api * api, SDL_Surface * canvas,
|
||||
SDL_Rect * update_rect)
|
||||
{
|
||||
/* Done cloning! */
|
||||
|
||||
/* Erase crosshairs from source position, now that we're all done */
|
||||
if (clone_crosshair_visible)
|
||||
{
|
||||
clone_crosshairs(api, canvas, clone_src_x, clone_src_y);
|
||||
update_rect->x = clone_src_x - 15;
|
||||
update_rect->y = clone_src_y - 15;
|
||||
update_rect->w = 32;
|
||||
update_rect->h = 32;
|
||||
clone_crosshair_visible = 0;
|
||||
}
|
||||
{
|
||||
clone_crosshairs(api, canvas, clone_src_x, clone_src_y);
|
||||
update_rect->x = clone_src_x - 15;
|
||||
update_rect->y = clone_src_y - 15;
|
||||
update_rect->w = 32;
|
||||
update_rect->h = 32;
|
||||
clone_crosshair_visible = 0;
|
||||
}
|
||||
|
||||
clone_state = CLONE_READY_TO_START;
|
||||
api->stopsound();
|
||||
}
|
||||
|
||||
void clone_crosshairs(magic_api * api, SDL_Surface * canvas, int x, int y) {
|
||||
void clone_crosshairs(magic_api * api, SDL_Surface * canvas, int x, int y)
|
||||
{
|
||||
int i;
|
||||
|
||||
for (i = -15; i < 16; i++) {
|
||||
for (i = -15; i < 16; i++)
|
||||
{
|
||||
api->xorpixel(canvas, x + i, y);
|
||||
api->xorpixel(canvas, x, y + i);
|
||||
}
|
||||
|
|
@ -314,29 +346,35 @@ void clone_shutdown(magic_api * api ATTRIBUTE_UNUSED)
|
|||
Mix_FreeChunk(clone_start_snd);
|
||||
}
|
||||
|
||||
void clone_set_color(magic_api * api ATTRIBUTE_UNUSED, Uint8 ATTRIBUTE_UNUSED r, Uint8 ATTRIBUTE_UNUSED g, Uint8 ATTRIBUTE_UNUSED b)
|
||||
void clone_set_color(magic_api * api ATTRIBUTE_UNUSED,
|
||||
Uint8 ATTRIBUTE_UNUSED r, Uint8 ATTRIBUTE_UNUSED g,
|
||||
Uint8 ATTRIBUTE_UNUSED b)
|
||||
{
|
||||
}
|
||||
|
||||
int clone_requires_colors(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED)
|
||||
int clone_requires_colors(magic_api * api ATTRIBUTE_UNUSED,
|
||||
int which ATTRIBUTE_UNUSED)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
void clone_switchin(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED,
|
||||
int mode ATTRIBUTE_UNUSED, SDL_Surface * canvas ATTRIBUTE_UNUSED)
|
||||
void clone_switchin(magic_api * api ATTRIBUTE_UNUSED,
|
||||
int which ATTRIBUTE_UNUSED, int mode ATTRIBUTE_UNUSED,
|
||||
SDL_Surface * canvas ATTRIBUTE_UNUSED)
|
||||
{
|
||||
clone_last = SDL_CreateRGBSurface(0, canvas->w, canvas->h, canvas->format->BitsPerPixel,
|
||||
canvas->format->Rmask, canvas->format->Gmask, canvas->format->Bmask,
|
||||
canvas->format->Amask);
|
||||
clone_last =
|
||||
SDL_CreateRGBSurface(0, canvas->w, canvas->h,
|
||||
canvas->format->BitsPerPixel, canvas->format->Rmask,
|
||||
canvas->format->Gmask, canvas->format->Bmask,
|
||||
canvas->format->Amask);
|
||||
|
||||
clone_state = CLONE_READY_TO_START;
|
||||
}
|
||||
|
||||
void clone_switchout(magic_api * api, int which ATTRIBUTE_UNUSED,
|
||||
int mode ATTRIBUTE_UNUSED, SDL_Surface * canvas)
|
||||
int mode ATTRIBUTE_UNUSED, SDL_Surface * canvas)
|
||||
{
|
||||
SDL_Rect update_rect; /* Needed to satisfy done_cloning() :-( */
|
||||
SDL_Rect update_rect; /* Needed to satisfy done_cloning() :-( */
|
||||
|
||||
done_cloning(api, canvas, &update_rect);
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue