#define DEF_SPIN "True"
#define DEF_WANDER "True"
-#define DEFAULTS "*delay: 10000 \n" \
+#define DEFAULTS "*delay: 30000 \n" \
"*showFPS: False \n" \
"*move: True \n" \
"*spin: True \n" \
static XrmOptionDescRec opts[] = {
{"-engine", ".engine.engine", XrmoptionSepArg, DEF_ENGINE },
- {"-move", ".engine.move", XrmoptionNoArg, (caddr_t) "True" },
- {"+move", ".engine.move", XrmoptionNoArg, (caddr_t) "False" },
- {"-spin", ".engine.spin", XrmoptionNoArg, (caddr_t) "True" },
- {"+spin", ".engine.spin", XrmoptionNoArg, (caddr_t) "False" },
- { "-titles", ".engine.titles", XrmoptionNoArg, (caddr_t) "True" },
- { "+titles", ".engine.titles", XrmoptionNoArg, (caddr_t) "False" },
+ {"-move", ".engine.move", XrmoptionNoArg, "True" },
+ {"+move", ".engine.move", XrmoptionNoArg, "False" },
+ {"-spin", ".engine.spin", XrmoptionNoArg, "True" },
+ {"+spin", ".engine.spin", XrmoptionNoArg, "False" },
+ { "-titles", ".engine.titles", XrmoptionNoArg, "True" },
+ { "+titles", ".engine.titles", XrmoptionNoArg, "False" },
};
static argtype vars[] = {
- {(caddr_t *) &which_engine, "engine", "Engine", DEF_ENGINE, t_String},
- {(caddr_t *) &move, "move", "Move", DEF_WANDER, t_Bool},
- {(caddr_t *) &spin, "spin", "Spin", DEF_SPIN, t_Bool},
- {(caddr_t *) &do_titles, "titles", "Titles", DEF_TITLES, t_Bool},
+ {&which_engine, "engine", "Engine", DEF_ENGINE, t_String},
+ {&move, "move", "Move", DEF_WANDER, t_Bool},
+ {&spin, "spin", "Spin", DEF_SPIN, t_Bool},
+ {&do_titles, "titles", "Titles", DEF_TITLES, t_Bool},
};
ModeSpecOpt engine_opts = {countof(opts), opts, countof(vars), vars, NULL};
#define ENG engines[engineType]
/* given a number of cylinders and an included angle, finds matching engine */
-int find_engine(const char *name)
+int
+find_engine(char *name)
{
unsigned int i;
+ char *s;
if (!name || !*name || !strcasecmp (name, "(none)"))
return (random() % countof(engines));
+ for (s = name; *s; s++)
+ if (*s == '-' || *s == '_') *s = ' ';
+
for (i = 0; i < countof(engines); i++) {
if (!strcasecmp(name, engines[i].engineName))
return i;
}
{
- double spin_speed = 1.0;
- double wander_speed = 0.03;
+ double spin_speed = 0.5;
+ double wander_speed = 0.01;
e->rot = make_rotator (spin ? spin_speed : 0,
spin ? spin_speed : 0,