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
|
|
@ -44,7 +44,8 @@ static Mix_Chunk *shift_snd;
|
|||
/* Local function prototypes: */
|
||||
|
||||
static void shift_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);
|
||||
Uint32 shift_api_version(void);
|
||||
int shift_init(magic_api * api);
|
||||
int shift_get_tool_count(magic_api * api);
|
||||
|
|
@ -53,17 +54,20 @@ char *shift_get_name(magic_api * api, int which);
|
|||
int shift_get_group(magic_api * api, int which);
|
||||
char *shift_get_description(magic_api * api, int which, int mode);
|
||||
void shift_drag(magic_api * api, int which, SDL_Surface * canvas,
|
||||
SDL_Surface * last, int ox, int oy, int x, int y, SDL_Rect * update_rect);
|
||||
void shift_click(magic_api * api, int which, int mode,
|
||||
SDL_Surface * canvas, SDL_Surface * last, int x, int y, SDL_Rect * update_rect);
|
||||
void shift_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);
|
||||
void shift_click(magic_api * api, int which, int mode, SDL_Surface * canvas,
|
||||
SDL_Surface * last, int x, int y, SDL_Rect * update_rect);
|
||||
void shift_release(magic_api * api, int which, SDL_Surface * canvas,
|
||||
SDL_Surface * last, int x, int y, SDL_Rect * update_rect);
|
||||
void shift_shutdown(magic_api * api);
|
||||
void shift_set_color(magic_api * api, Uint8 r, Uint8 g, Uint8 b);
|
||||
int shift_requires_colors(magic_api * api, int which);
|
||||
|
||||
void shift_switchin(magic_api * api, int which, int mode, SDL_Surface * canvas);
|
||||
void shift_switchout(magic_api * api, int which, int mode, SDL_Surface * canvas);
|
||||
void shift_switchin(magic_api * api, int which, int mode,
|
||||
SDL_Surface * canvas);
|
||||
void shift_switchout(magic_api * api, int which, int mode,
|
||||
SDL_Surface * canvas);
|
||||
int shift_modes(magic_api * api, int which);
|
||||
|
||||
|
||||
|
|
@ -79,7 +83,8 @@ int shift_init(magic_api * api)
|
|||
{
|
||||
char fname[1024];
|
||||
|
||||
snprintf(fname, sizeof(fname), "%ssounds/magic/shift.ogg", api->data_directory);
|
||||
snprintf(fname, sizeof(fname), "%ssounds/magic/shift.ogg",
|
||||
api->data_directory);
|
||||
shift_snd = Mix_LoadWAV(fname);
|
||||
|
||||
return (1);
|
||||
|
|
@ -92,37 +97,46 @@ int shift_get_tool_count(magic_api * api ATTRIBUTE_UNUSED)
|
|||
}
|
||||
|
||||
// Load our icons:
|
||||
SDL_Surface *shift_get_icon(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED)
|
||||
SDL_Surface *shift_get_icon(magic_api * api ATTRIBUTE_UNUSED,
|
||||
int which ATTRIBUTE_UNUSED)
|
||||
{
|
||||
char fname[1024];
|
||||
|
||||
snprintf(fname, sizeof(fname), "%simages/magic/shift.png", api->data_directory);
|
||||
snprintf(fname, sizeof(fname), "%simages/magic/shift.png",
|
||||
api->data_directory);
|
||||
|
||||
return (IMG_Load(fname));
|
||||
}
|
||||
|
||||
// Return our names, localized:
|
||||
char *shift_get_name(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED)
|
||||
char *shift_get_name(magic_api * api ATTRIBUTE_UNUSED,
|
||||
int which ATTRIBUTE_UNUSED)
|
||||
{
|
||||
return (strdup(gettext_noop("Shift")));
|
||||
}
|
||||
|
||||
// Return our group
|
||||
int shift_get_group(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED)
|
||||
int shift_get_group(magic_api * api ATTRIBUTE_UNUSED,
|
||||
int which ATTRIBUTE_UNUSED)
|
||||
{
|
||||
return MAGIC_TYPE_PICTURE_WARPS;
|
||||
}
|
||||
|
||||
// Return our descriptions, localized:
|
||||
char *shift_get_description(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED, int mode ATTRIBUTE_UNUSED)
|
||||
char *shift_get_description(magic_api * api ATTRIBUTE_UNUSED,
|
||||
int which ATTRIBUTE_UNUSED,
|
||||
int mode ATTRIBUTE_UNUSED)
|
||||
{
|
||||
return (strdup(gettext_noop("Click and drag to shift your picture around on the canvas.")));
|
||||
return (strdup
|
||||
(gettext_noop
|
||||
("Click and drag to shift your picture around on the canvas.")));
|
||||
}
|
||||
|
||||
|
||||
// Affect the canvas on drag:
|
||||
void shift_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)
|
||||
{
|
||||
if (ox == x && oy == y)
|
||||
return; /* No-op */
|
||||
|
|
@ -130,8 +144,10 @@ void shift_drag(magic_api * api, int which, SDL_Surface * canvas,
|
|||
shift_doit(api, which, canvas, last, ox, oy, x, y, update_rect, 1);
|
||||
}
|
||||
|
||||
static void shift_doit(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED, SDL_Surface * canvas,
|
||||
SDL_Surface * last, int ox ATTRIBUTE_UNUSED, int oy ATTRIBUTE_UNUSED, int x, int y,
|
||||
static void shift_doit(magic_api * api ATTRIBUTE_UNUSED,
|
||||
int which ATTRIBUTE_UNUSED, SDL_Surface * canvas,
|
||||
SDL_Surface * last, int ox ATTRIBUTE_UNUSED,
|
||||
int oy ATTRIBUTE_UNUSED, int x, int y,
|
||||
SDL_Rect * update_rect, int crosshairs)
|
||||
{
|
||||
SDL_Rect dest;
|
||||
|
|
@ -162,123 +178,123 @@ static void shift_doit(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNU
|
|||
|
||||
|
||||
if (dy > 0)
|
||||
{
|
||||
if (dx > 0)
|
||||
{
|
||||
if (dx > 0)
|
||||
{
|
||||
/* Top Left */
|
||||
/* Top Left */
|
||||
|
||||
dest.x = dx - canvas->w;
|
||||
dest.y = dy - canvas->h;
|
||||
|
||||
SDL_BlitSurface(last, NULL, canvas, &dest);
|
||||
}
|
||||
|
||||
|
||||
/* Top */
|
||||
|
||||
dest.x = dx;
|
||||
dest.x = dx - canvas->w;
|
||||
dest.y = dy - canvas->h;
|
||||
|
||||
SDL_BlitSurface(last, NULL, canvas, &dest);
|
||||
|
||||
|
||||
if (dx < 0)
|
||||
{
|
||||
/* Top Right */
|
||||
|
||||
dest.x = dx + canvas->w;
|
||||
dest.y = dy - canvas->h;
|
||||
|
||||
SDL_BlitSurface(last, NULL, canvas, &dest);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/* Top */
|
||||
|
||||
dest.x = dx;
|
||||
dest.y = dy - canvas->h;
|
||||
|
||||
SDL_BlitSurface(last, NULL, canvas, &dest);
|
||||
|
||||
|
||||
if (dx < 0)
|
||||
{
|
||||
/* Top Right */
|
||||
|
||||
dest.x = dx + canvas->w;
|
||||
dest.y = dy - canvas->h;
|
||||
|
||||
SDL_BlitSurface(last, NULL, canvas, &dest);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
if (dx > 0)
|
||||
{
|
||||
/* Left */
|
||||
{
|
||||
/* Left */
|
||||
|
||||
dest.x = dx - canvas->w;
|
||||
dest.y = dy;
|
||||
dest.x = dx - canvas->w;
|
||||
dest.y = dy;
|
||||
|
||||
SDL_BlitSurface(last, NULL, canvas, &dest);
|
||||
}
|
||||
SDL_BlitSurface(last, NULL, canvas, &dest);
|
||||
}
|
||||
|
||||
if (dx < 0)
|
||||
{
|
||||
/* Right */
|
||||
{
|
||||
/* Right */
|
||||
|
||||
dest.x = dx + canvas->w;
|
||||
dest.y = dy;
|
||||
dest.x = dx + canvas->w;
|
||||
dest.y = dy;
|
||||
|
||||
SDL_BlitSurface(last, NULL, canvas, &dest);
|
||||
}
|
||||
SDL_BlitSurface(last, NULL, canvas, &dest);
|
||||
}
|
||||
|
||||
|
||||
if (dy < 0)
|
||||
{
|
||||
if (dx > 0)
|
||||
{
|
||||
if (dx > 0)
|
||||
{
|
||||
/* Bottom Left */
|
||||
/* Bottom Left */
|
||||
|
||||
dest.x = dx - canvas->w;
|
||||
dest.y = dy + canvas->h;
|
||||
|
||||
SDL_BlitSurface(last, NULL, canvas, &dest);
|
||||
}
|
||||
|
||||
|
||||
/* Bottom */
|
||||
|
||||
dest.x = dx;
|
||||
dest.x = dx - canvas->w;
|
||||
dest.y = dy + canvas->h;
|
||||
|
||||
SDL_BlitSurface(last, NULL, canvas, &dest);
|
||||
|
||||
|
||||
if (dx < 0)
|
||||
{
|
||||
/* Bottom Right */
|
||||
|
||||
dest.x = dx + canvas->w;
|
||||
dest.y = dy + canvas->h;
|
||||
|
||||
SDL_BlitSurface(last, NULL, canvas, &dest);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/* Bottom */
|
||||
|
||||
dest.x = dx;
|
||||
dest.y = dy + canvas->h;
|
||||
|
||||
SDL_BlitSurface(last, NULL, canvas, &dest);
|
||||
|
||||
|
||||
if (dx < 0)
|
||||
{
|
||||
/* Bottom Right */
|
||||
|
||||
dest.x = dx + canvas->w;
|
||||
dest.y = dy + canvas->h;
|
||||
|
||||
SDL_BlitSurface(last, NULL, canvas, &dest);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
if (crosshairs)
|
||||
{
|
||||
dest.x = (canvas->w / 2) - 1;
|
||||
dest.y = 0;
|
||||
dest.w = 3;
|
||||
dest.h = canvas->h;
|
||||
{
|
||||
dest.x = (canvas->w / 2) - 1;
|
||||
dest.y = 0;
|
||||
dest.w = 3;
|
||||
dest.h = canvas->h;
|
||||
|
||||
SDL_FillRect(canvas, &dest, SDL_MapRGB(canvas->format, 255, 255, 255));
|
||||
SDL_FillRect(canvas, &dest, SDL_MapRGB(canvas->format, 255, 255, 255));
|
||||
|
||||
dest.x = 0;
|
||||
dest.y = (canvas->h / 2) - 1;
|
||||
dest.w = canvas->w;
|
||||
dest.h = 3;
|
||||
dest.x = 0;
|
||||
dest.y = (canvas->h / 2) - 1;
|
||||
dest.w = canvas->w;
|
||||
dest.h = 3;
|
||||
|
||||
SDL_FillRect(canvas, &dest, SDL_MapRGB(canvas->format, 255, 255, 255));
|
||||
SDL_FillRect(canvas, &dest, SDL_MapRGB(canvas->format, 255, 255, 255));
|
||||
|
||||
|
||||
dest.x = canvas->w / 2;
|
||||
dest.y = 0;
|
||||
dest.w = 1;
|
||||
dest.h = canvas->h;
|
||||
dest.x = canvas->w / 2;
|
||||
dest.y = 0;
|
||||
dest.w = 1;
|
||||
dest.h = canvas->h;
|
||||
|
||||
SDL_FillRect(canvas, &dest, SDL_MapRGB(canvas->format, 0, 0, 0));
|
||||
SDL_FillRect(canvas, &dest, SDL_MapRGB(canvas->format, 0, 0, 0));
|
||||
|
||||
dest.x = 0;
|
||||
dest.y = canvas->h / 2;
|
||||
dest.w = canvas->w;
|
||||
dest.h = 1;
|
||||
dest.x = 0;
|
||||
dest.y = canvas->h / 2;
|
||||
dest.w = canvas->w;
|
||||
dest.h = 1;
|
||||
|
||||
SDL_FillRect(canvas, &dest, SDL_MapRGB(canvas->format, 0, 0, 0));
|
||||
}
|
||||
SDL_FillRect(canvas, &dest, SDL_MapRGB(canvas->format, 0, 0, 0));
|
||||
}
|
||||
|
||||
|
||||
/* Update everything! */
|
||||
|
|
@ -293,7 +309,8 @@ static void shift_doit(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNU
|
|||
|
||||
// Affect the canvas on click:
|
||||
void shift_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)
|
||||
{
|
||||
shift_x = x;
|
||||
shift_y = y;
|
||||
|
|
@ -303,7 +320,8 @@ void shift_click(magic_api * api, int which, int mode ATTRIBUTE_UNUSED,
|
|||
|
||||
// Affect the canvas on release:
|
||||
void shift_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)
|
||||
{
|
||||
shift_doit(api, which, canvas, last, x, y, x, y, update_rect, 0);
|
||||
api->stopsound();
|
||||
|
|
@ -319,22 +337,26 @@ void shift_shutdown(magic_api * api ATTRIBUTE_UNUSED)
|
|||
|
||||
// Record the color from Tux Paint:
|
||||
void shift_set_color(magic_api * api ATTRIBUTE_UNUSED,
|
||||
Uint8 r ATTRIBUTE_UNUSED, Uint8 g ATTRIBUTE_UNUSED, Uint8 b ATTRIBUTE_UNUSED)
|
||||
Uint8 r ATTRIBUTE_UNUSED, Uint8 g ATTRIBUTE_UNUSED,
|
||||
Uint8 b ATTRIBUTE_UNUSED)
|
||||
{
|
||||
}
|
||||
|
||||
// Use colors:
|
||||
int shift_requires_colors(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED)
|
||||
int shift_requires_colors(magic_api * api ATTRIBUTE_UNUSED,
|
||||
int which ATTRIBUTE_UNUSED)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
void shift_switchin(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED, int mode ATTRIBUTE_UNUSED,
|
||||
void shift_switchin(magic_api * api ATTRIBUTE_UNUSED,
|
||||
int which ATTRIBUTE_UNUSED, int mode ATTRIBUTE_UNUSED,
|
||||
SDL_Surface * canvas ATTRIBUTE_UNUSED)
|
||||
{
|
||||
}
|
||||
|
||||
void shift_switchout(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED, int mode ATTRIBUTE_UNUSED,
|
||||
void shift_switchout(magic_api * api ATTRIBUTE_UNUSED,
|
||||
int which ATTRIBUTE_UNUSED, int mode ATTRIBUTE_UNUSED,
|
||||
SDL_Surface * canvas ATTRIBUTE_UNUSED)
|
||||
{
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue