X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?p=xscreensaver;a=blobdiff_plain;f=hacks%2Ftriangle.c;h=d73c1226f547bbc040b10391e5c7af967971d727;hp=e8400d42c2be356ceb59c70cfb9ffee84b9fd441;hb=4361b69d3178d7fc98d0388f9a223af6c2651aba;hpb=d6b0217f2417bd19187f0ebc389d6c5c2233b11c

diff --git a/hacks/triangle.c b/hacks/triangle.c
index e8400d42..d73c1226 100644
--- a/hacks/triangle.c
+++ b/hacks/triangle.c
@@ -51,6 +51,7 @@ static const char sccsid[] = "@(#)triangle.c	4.04 97/07/28 xlockmore";
 					"*fpsSolid: true \n" \
 
 # define SMOOTH_COLORS
+# define release_triangle 0
 # include "xlockmore.h"		/* in xscreensaver distribution */
 #else /* STANDALONE */
 # include "xlock.h"			/* in xlockmore distribution */
@@ -222,11 +223,7 @@ init_triangle (ModeInfo * mi)
 	short      *tmp;
 	int         i, dim, one;
 
-	if (triangles == NULL) {
-		if ((triangles = (trianglestruct *) calloc(MI_NUM_SCREENS(mi),
-					   sizeof (trianglestruct))) == NULL)
-			return;
-	}
+	MI_INIT (mi, triangles, 0);
 	tp = &triangles[MI_SCREEN(mi)];
 
 	tp->width = MI_WIN_WIDTH(mi);
@@ -350,15 +347,6 @@ reshape_triangle(ModeInfo * mi, int width, int height)
   init_triangle (mi);
 }
 
-ENTRYPOINT void
-release_triangle(ModeInfo * mi)
-{
-	if (triangles != NULL) {
-		(void) free((void *) triangles);
-		triangles = NULL;
-	}
-}
-
 ENTRYPOINT void
 refresh_triangle (ModeInfo * mi)
 {