From http://www.jwz.org/xscreensaver/xscreensaver-5.18.tar.gz

[xscreensaver] / hacks / glx / atunnel.c

diff --git a/hacks/glx/atunnel.c b/hacks/glx/atunnel.c
index e13129cbbc52d19559f2b8fadd42177481f8c234..29eee782af6de99df3e09307f59b3e209cf5c5e7 100644 (file)
--- a/hacks/glx/atunnel.c
+++ b/hacks/glx/atunnel.c
@@ -84,7 +84,7 @@ static const char sccsid[] = "@(#)atunnel.c   5.13 2004/05/25 xlockmore";
 #define countof(x) (sizeof((x))/sizeof((*x)))
 
 #define DEF_LIGHT      "True"
-#define DEF_WIRE       "False"
+#define DEF_WIRE    "False"
 #define DEF_TEXTURE    "True"
 
 static Bool do_light;
@@ -185,7 +185,6 @@ static void Init(ModeInfo * mi)
        GLfloat light_position[] = {0.0, 0.0, 1.0, 0.0};
        GLfloat fogColor[4] = {0.8, 0.8, 0.8, 1.0};
 
-       glClearColor(0, 0, 0, 0);
        if (do_texture)
        {
                glGenTextures(MAX_TEXTURE, sa->texture);
@@ -197,7 +196,7 @@ static void Init(ModeInfo * mi)
                LoadTexture(mi, texture5,5);
                glEnable(GL_TEXTURE_2D);
        }
-       sa->ts = InitTunnel();
+       sa->ts = atunnel_InitTunnel();
        
        /* Set lighting parameters */
        if (do_light)
@@ -271,8 +270,8 @@ ENTRYPOINT void draw_atunnel(ModeInfo * mi)
 
        glLoadIdentity();
 
-       DrawTunnel(sa->ts, do_texture, do_light, sa->texture);
-       SplashScreen(sa->ts, do_wire, do_texture, do_light);
+       atunnel_DrawTunnel(sa->ts, do_texture, do_light, sa->texture);
+       atunnel_SplashScreen(sa->ts, do_wire, do_texture, do_light);
 
        glFlush();  
        /* manage framerate display */
@@ -307,6 +306,7 @@ ENTRYPOINT void init_atunnel(ModeInfo * mi)
 /* all sorts of nice cleanup code should go here! */
 ENTRYPOINT void release_atunnel(ModeInfo * mi)
 {
+#if 0
   int screen;
   if (Atunnel != NULL) {
        for (screen = 0; screen < MI_NUM_SCREENS(mi); screen++) {
@@ -317,6 +317,7 @@ ENTRYPOINT void release_atunnel(ModeInfo * mi)
        Atunnel = NULL;
   }
   FreeAllGL(mi);
+#endif
 }
 
 XSCREENSAVER_MODULE ("Atunnel", atunnel)