X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Fglx%2Fspheremonics.c;h=8e45a4a4266cf3645f9900594e42724a0af2325f;hb=96a411663168b0ba5432b407a83be55f3df0c802;hp=f4ffa0116085ecc4e5a6dadcc1cb72c44748f40d;hpb=13dbc569cdc6e29019722c0ef9b932a925efbcad;p=xscreensaver

diff --git a/hacks/glx/spheremonics.c b/hacks/glx/spheremonics.c
index f4ffa011..8e45a4a4 100644
--- a/hacks/glx/spheremonics.c
+++ b/hacks/glx/spheremonics.c
@@ -768,7 +768,7 @@ static void
 draw_label (ModeInfo *mi, const char *s)
 {
   spheremonics_configuration *cc = &ccs[MI_SCREEN(mi)];
-  int i;
+  unsigned int i;
   
   glPushAttrib(GL_TRANSFORM_BIT | GL_ENABLE_BIT);
   glDisable(GL_LIGHTING);
@@ -851,11 +851,11 @@ init_spheremonics (ModeInfo *mi)
       }
 
     cc->rot = make_rotator (spinx ? spin_speed : 0,
-                            spiny ? spin_speed : 0,
                             spinz ? spin_speed : 0,
+                            spiny ? spin_speed : 0,
                             1.0,
                             do_wander ? wander_speed : 0,
-                            True);
+                            (spinx && spiny && spinz));
     cc->trackball = gltrackball_init ();
   }
 
@@ -871,7 +871,7 @@ init_spheremonics (ModeInfo *mi)
 
   cc->m_max = 4; /* 9? */
   {
-    int i;
+    unsigned int i;
     for (i = 0; i < countof(cc->dm); i++)
       cc->dm[i] = 1;  /* going up! */