Remove non-subset fn calls

5 files changed, 12 insertions, 14 deletions

diff --git a/progs/samples/Makefile b/progs/samples/Makefile
index 7ce328b822..a99a3d1c89 100644
--- a/progs/samples/Makefile
+++ b/progs/samples/Makefile
@@ -23,6 +23,6 @@ PROGS = prim \
 default: $(PROGS)
 
 
-clean:
-	-rm *.o *~
+clean::
+	rm -f *.o *~ $(PROGS)
 
diff --git a/progs/samples/line.c b/progs/samples/line.c
index 48a9497d53..bd64e83499 100644
--- a/progs/samples/line.c
+++ b/progs/samples/line.c
@@ -141,7 +141,7 @@ static void Draw(void)
     for (i = 0; i < 360; i += 5) {
 	glRotatef(5.0, 0,0,1);
 
-	(rgb) ? glColor3f(1.0, 1.0, 0.0) : glIndexi(ci);
+	glColor3f(1.0, 1.0, 0.0);
 	glBegin(GL_LINE_STRIP);
 	    glVertex3fv(pntA);
 	    glVertex3fv(pntB);
@@ -199,7 +199,7 @@ int main(int argc, char **argv)
 
     glutInitWindowPosition(0, 0); glutInitWindowSize( 300, 300);
 
-    windType = (rgb) ? GLUT_RGB : GLUT_INDEX;
+    windType = GLUT_RGB;
     windType |= (doubleBuffer) ? GLUT_DOUBLE : GLUT_SINGLE;
     glutInitDisplayMode(windType);
 
diff --git a/progs/samples/point.c b/progs/samples/point.c
index 224e940bd3..39b6581f8a 100644
--- a/progs/samples/point.c
+++ b/progs/samples/point.c
@@ -153,9 +153,9 @@ static void Draw(void)
 
 /*     glPointSize(size); */
     if (mode) {
-	(rgb) ? glColor3f(1.0, 0.0, 0.0) : glIndexf(CI_ANTI_ALIAS_RED);
+       glColor3f(1.0, 0.0, 0.0);
     } else {
-	(rgb) ? glColor3f(1.0, 0.0, 0.0) : glIndexf(CI_RED);
+       glColor3f(1.0, 0.0, 0.0);
     }
     glBegin(GL_POINTS);
 	glVertex3fv(point);
diff --git a/progs/samples/star.c b/progs/samples/star.c
index f2871db966..ac99c82ae6 100644
--- a/progs/samples/star.c
+++ b/progs/samples/star.c
@@ -255,8 +255,6 @@ static void Key(unsigned char key, int x, int y)
 
 void Draw(void)
 {
-   usleep(10000);
-
     MoveStars();
     ShowStars();
     if (nitro > 0) {
diff --git a/progs/samples/tri.c b/progs/samples/tri.c
index 3856c9f180..e6f39eb075 100644
--- a/progs/samples/tri.c
+++ b/progs/samples/tri.c
@@ -278,11 +278,11 @@ static void Draw(void)
 	EndPrim();
 
 	if (showVerticies) {
-	    (rgb) ? glColor3fv(RGBMap[COLOR_RED]) : glIndexf(color1);
+	    glColor3fv(RGBMap[COLOR_RED]);
 /* 	    glRectf(p0[0]-2, p0[1]-2, p0[0]+2, p0[1]+2); */
-	    (rgb) ? glColor3fv(RGBMap[COLOR_GREEN]) : glIndexf(color2);
+	    glColor3fv(RGBMap[COLOR_GREEN]);
 /* 	    glRectf(p1[0]-2, p1[1]-2, p1[0]+2, p1[1]+2); */
-	    (rgb) ? glColor3fv(RGBMap[COLOR_BLUE]) : glIndexf(color3);
+	    glColor3fv(RGBMap[COLOR_BLUE]);
 /* 	    glRectf(p2[0]-2, p2[1]-2, p2[0]+2, p2[1]+2); */
 	}
 
@@ -314,11 +314,11 @@ static void Draw(void)
 
     SetColor(COLOR_RED);
     BeginPrim();
-	(rgb) ? glColor3fv(RGBMap[COLOR_RED]) : glIndexf(color1);
+	glColor3fv(RGBMap[COLOR_RED]);
 	glVertex3fv(p0);
-	(rgb) ? glColor3fv(RGBMap[COLOR_GREEN]) : glIndexf(color2);
+	glColor3fv(RGBMap[COLOR_GREEN]);
 	glVertex3fv(p1);
-	(rgb) ? glColor3fv(RGBMap[COLOR_BLUE]) : glIndexf(color3);
+	glColor3fv(RGBMap[COLOR_BLUE]);
 	glVertex3fv(p2);
     EndPrim();