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

[xscreensaver] / hacks / glx / skytentacles.c

diff --git a/hacks/glx/skytentacles.c b/hacks/glx/skytentacles.c
index 3e0cfcf025687ef11aef6d16e00da41ffddfdb06..ce61cf0160b82d988178a4550314112a29ad956b 100644 (file)
--- a/hacks/glx/skytentacles.c
+++ b/hacks/glx/skytentacles.c
@@ -818,7 +818,7 @@ tentacles_handle_event (ModeInfo *mi, XEvent *event)
       XLookupString (&event->xkey, &c, 1, &keysym, 0);
       if (c == ' ')
         {
-          gltrackball_reset (tc->trackball);
+          gltrackball_reset (tc->trackball, 0, 0);
           return True;
         }
     }
@@ -851,14 +851,7 @@ init_tentacles (ModeInfo *mi)
   int wire = MI_IS_WIREFRAME(mi);
   int i;
 
-  if (!tcs) {
-    tcs = (tentacles_configuration *)
-      calloc (MI_NUM_SCREENS(mi), sizeof (tentacles_configuration));
-    if (!tcs) {
-      fprintf(stderr, "%s: out of memory\n", progname);
-      exit(1);
-    }
-  }
+  MI_INIT (mi, tcs, NULL);
 
   tc = &tcs[MI_SCREEN(mi)];