notgne2/tuxpaint-pencil-sharpener
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Tornado too needs MODE_PAINT_WITH_PREVIEW. Removing warnings about missings prototypes and unused variables.

Browse source
This commit is contained in:
Pere Pujal i Carabantes 2011-05-13 10:05:57 +00:00
parent 3e15d76dd2
commit 3e5f7c4b85
1 changed files with 47 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

65
magic/src/tornado.c
View file

@ -73,6 +73,36 @@ static Point2D tornado_PointOnCubicBezier(Point2D* cp, float t);
static void tornado_ComputeBezier(Point2D* cp, int numberOfPoints, Point2D* curve); static void tornado_ComputeBezier(Point2D* cp, int numberOfPoints, Point2D* curve);
static void tornado_colorize_cloud(magic_api * api); static void tornado_colorize_cloud(magic_api * api);
static Uint32 tornado_mess(Uint32 pixel, SDL_Surface * canvas); static Uint32 tornado_mess(Uint32 pixel, SDL_Surface * canvas);
Uint32 tornado_api_version(void);
int tornado_init(magic_api * api);
int tornado_get_tool_count(magic_api * api);
SDL_Surface * tornado_get_icon(magic_api * api, int which);
char * tornado_get_name(magic_api * api, int which);
char * tornado_get_description(magic_api * api, int which, int mode);
void tornado_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 tornado_click(magic_api * api, int which, int mode,
SDL_Surface * canvas, SDL_Surface * last,
int x, int y, SDL_Rect * update_rect);
void tornado_release(magic_api * api, int which,
SDL_Surface * canvas, SDL_Surface * last,
int x, int y, SDL_Rect * update_rect);
void tornado_shutdown(magic_api * api);
void tornado_set_color(magic_api * api, Uint8 r, Uint8 g, Uint8 b);
int tornado_requires_colors(magic_api * api, int which);
void tornado_switchin(magic_api * api, int which, int mode, SDL_Surface * canvas);
void tornado_switchout(magic_api * api, int which, int mode, SDL_Surface * canvas);
int tornado_modes(magic_api * api, int which);
Uint32 tornado_api_version(void) { return(TP_MAGIC_API_VERSION); } Uint32 tornado_api_version(void) { return(TP_MAGIC_API_VERSION); }
@ -105,13 +135,13 @@ int tornado_init(magic_api * api)
} }
// We have multiple tools: // We have multiple tools:
int tornado_get_tool_count(magic_api * api) int tornado_get_tool_count(magic_api * api ATTRIBUTE_UNUSED)
{ {
return(1); return(1);
} }
// Load our icons: // Load our icons:
SDL_Surface * tornado_get_icon(magic_api * api, int which) SDL_Surface * tornado_get_icon(magic_api * api, int which ATTRIBUTE_UNUSED)
{ {
char fname[1024]; char fname[1024];
@ -122,20 +152,20 @@ SDL_Surface * tornado_get_icon(magic_api * api, int which)
} }
// Return our names, localized: // Return our names, localized:
char * tornado_get_name(magic_api * api, int which) char * tornado_get_name(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED)
{ {
return(strdup(gettext_noop("Tornado"))); return(strdup(gettext_noop("Tornado")));
} }
// Return our descriptions, localized: // Return our descriptions, localized:
char * tornado_get_description(magic_api * api, int which, int mode) char * tornado_get_description(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED, int mode ATTRIBUTE_UNUSED)
{ {
return(strdup(gettext_noop("Click and drag to draw a tornado funnel on your picture."))); return(strdup(gettext_noop("Click and drag to draw a tornado funnel on your picture.")));
} }
// Affect the canvas on drag: // Affect the canvas on drag:
static void tornado_predrag(magic_api * api, SDL_Surface * canvas, static void tornado_predrag(magic_api * api ATTRIBUTE_UNUSED, SDL_Surface * canvas ATTRIBUTE_UNUSED,
SDL_Surface * last, int ox, int oy, int x, int y) SDL_Surface * last ATTRIBUTE_UNUSED, int ox, int oy, int x, int y)
{ {
if (x < tornado_min_x) if (x < tornado_min_x)
tornado_min_x = x; tornado_min_x = x;
@ -168,7 +198,7 @@ static void tornado_predrag(magic_api * api, SDL_Surface * canvas,
} }
} }
void tornado_drag(magic_api * api, int which, SDL_Surface * canvas, void tornado_drag(magic_api * api, int which ATTRIBUTE_UNUSED, 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)
{ {
@ -195,7 +225,7 @@ void tornado_drag(magic_api * api, int which, SDL_Surface * canvas,
} }
// Affect the canvas on click: // Affect the canvas on click:
void tornado_click(magic_api * api, int which, int mode, void tornado_click(magic_api * api, int which, int mode ATTRIBUTE_UNUSED,
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)
{ {
@ -215,7 +245,7 @@ void tornado_click(magic_api * api, int which, int mode,
} }
// Affect the canvas on release: // Affect the canvas on release:
void tornado_release(magic_api * api, int which, void tornado_release(magic_api * api, int which ATTRIBUTE_UNUSED,
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)
{ {
@ -268,7 +298,7 @@ static void tornado_drawtornado(magic_api * api, SDL_Surface * canvas, int x, in
SDL_FreeSurface(aux_surf); SDL_FreeSurface(aux_surf);
} }
static void tornado_drawbase(magic_api * api, SDL_Surface * canvas) static void tornado_drawbase(magic_api * api ATTRIBUTE_UNUSED, SDL_Surface * canvas)
{ {
SDL_Rect dest; SDL_Rect dest;
@ -298,8 +328,7 @@ static void tornado_drawstalk(magic_api * api, SDL_Surface * canvas, SDL_Surface
Point2D * curve; Point2D * curve;
int i, n_points; int i, n_points;
int left, right; int left, right;
SDL_Rect dest, src; SDL_Rect dest;
int xx, yy, side;
int rotation = 0; int rotation = 0;
int p; int p;
int ii, ww; int ii, ww;
@ -396,7 +425,7 @@ static void tornado_drawstalk(magic_api * api, SDL_Surface * canvas, SDL_Surface
free(curve); free(curve);
} }
void tornado_shutdown(magic_api * api) void tornado_shutdown(magic_api * api ATTRIBUTE_UNUSED)
{ {
/* /*
if (tornado_click_snd != NULL) if (tornado_click_snd != NULL)
@ -425,7 +454,7 @@ void tornado_set_color(magic_api * api, Uint8 r, Uint8 g, Uint8 b)
} }
// Use colors: // Use colors:
int tornado_requires_colors(magic_api * api, int which) int tornado_requires_colors(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED)
{ {
return 1; return 1;
} }
@ -538,16 +567,16 @@ static void tornado_colorize_cloud(magic_api * api)
SDL_UnlockSurface(tornado_cloud); SDL_UnlockSurface(tornado_cloud);
} }
void tornado_switchin(magic_api * api, int which, int mode, SDL_Surface * canvas) void tornado_switchin(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED, int mode ATTRIBUTE_UNUSED, SDL_Surface * canvas ATTRIBUTE_UNUSED)
{ {
} }
void tornado_switchout(magic_api * api, int which, int mode, SDL_Surface * canvas) void tornado_switchout(magic_api * api, int which ATTRIBUTE_UNUSED, int mode ATTRIBUTE_UNUSED, SDL_Surface * canvas ATTRIBUTE_UNUSED)
{ {
api->stopsound(); api->stopsound();
} }
int tornado_modes(magic_api * api, int which) int tornado_modes(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED)
{ {
return(MODE_PAINT); return(MODE_PAINT_WITH_PREVIEW);
} }