summaryrefslogtreecommitdiff
path: root/src/post/goom/tentacle3d.c
diff options
context:
space:
mode:
authorMichael Roitzsch <mroi@users.sourceforge.net>2004-07-21 14:38:29 +0000
committerMichael Roitzsch <mroi@users.sourceforge.net>2004-07-21 14:38:29 +0000
commit2e73a5e69f0227f15c6049ef805a9b8c20166e2b (patch)
treea76597e387b3748bb06290e7980e432711d72670 /src/post/goom/tentacle3d.c
parent5ef0b5f10d0ee154a8add83c7c19d8557898226f (diff)
downloadxine-lib-2e73a5e69f0227f15c6049ef805a9b8c20166e2b.tar.gz
xine-lib-2e73a5e69f0227f15c6049ef805a9b8c20166e2b.tar.bz2
new goom2k4-dev18 includes almost all of my warning fixes
(the goom team is quite fast in applying my patches :) ) some files are still slightly patched from the release version, but I will get this sorted out so we will soon use a completely unmodified version of goom it compiles almost warningless now (the remaining warnings are introduced by lex/yacc and I plan to simply ignore them) the Makefile.am distclean-hack is also obsolete now, since the offending files have been renamed CVS patchset: 6828 CVS date: 2004/07/21 14:38:29
Diffstat (limited to 'src/post/goom/tentacle3d.c')
-rwxr-xr-xsrc/post/goom/tentacle3d.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/src/post/goom/tentacle3d.c b/src/post/goom/tentacle3d.c
index 600511327..b42e80525 100755
--- a/src/post/goom/tentacle3d.c
+++ b/src/post/goom/tentacle3d.c
@@ -38,16 +38,16 @@ typedef struct _TENTACLE_FX_DATA {
int lock;
} TentacleFXData;
-void tentacle_new (TentacleFXData *data);
-void tentacle_update(PluginInfo *goomInfo, Pixel *buf, Pixel *back, int W, int H,
+static void tentacle_new (TentacleFXData *data);
+static void tentacle_update(PluginInfo *goomInfo, Pixel *buf, Pixel *back, int W, int H,
short[2][512], float, int drawit, TentacleFXData *data);
-void tentacle_free (TentacleFXData *data);
+static void tentacle_free (TentacleFXData *data);
/*
* VisualFX wrapper for the tentacles
*/
-void tentacle_fx_init(VisualFX *_this) {
+static void tentacle_fx_init(VisualFX *_this) {
TentacleFXData *data = (TentacleFXData*)malloc(sizeof(TentacleFXData));
@@ -77,18 +77,18 @@ void tentacle_fx_init(VisualFX *_this) {
_this->fx_data = (void*)data;
}
-void tentacle_fx_apply(VisualFX *_this, Pixel *src, Pixel *dest, PluginInfo *goomInfo) {
+static void tentacle_fx_apply(VisualFX *_this, Pixel *src, Pixel *dest, PluginInfo *goomInfo) {
tentacle_update(goomInfo, dest, src, goomInfo->screen.width, goomInfo->screen.height, goomInfo->sound.samples,
(float)goomInfo->sound.accelvar, goomInfo->curGState->drawTentacle, (TentacleFXData*)_this->fx_data);
}
-void tentacle_fx_free(VisualFX *_this) {
+static void tentacle_fx_free(VisualFX *_this) {
tentacle_free((TentacleFXData*)_this->fx_data);
free(_this->fx_data);
}
-VisualFX tentacle_fx_create() {
+VisualFX tentacle_fx_create(void) {
VisualFX fx;
fx.init = tentacle_fx_init;
fx.apply = tentacle_fx_apply;
@@ -98,12 +98,12 @@ VisualFX tentacle_fx_create() {
/* ----- */
-void tentacle_free (TentacleFXData *data) {
+static void tentacle_free (TentacleFXData *data) {
/* TODO : un vrai FREE GRID!! */
free (data->vals);
}
-void tentacle_new (TentacleFXData *data) {
+static void tentacle_new (TentacleFXData *data) {
int tmp;
v3d center = {0,-17.0,0};
@@ -221,7 +221,7 @@ static void pretty_move (PluginInfo *goomInfo, float cycle, float *dist, float *
*rotangle = fx_data->rot = (tmp + 15.0f*fx_data->rot) / 16.0f;
}
-void tentacle_update(PluginInfo *goomInfo, Pixel *buf, Pixel *back, int W, int H,
+static void tentacle_update(PluginInfo *goomInfo, Pixel *buf, Pixel *back, int W, int H,
short data[2][512], float rapport, int drawit, TentacleFXData *fx_data) {
int tmp;