X-Git-Url: https://jxself.org/git/?p=super-star-trek.git;a=blobdiff_plain;f=src%2Fplanets.c;h=1ab10a1996cce21a17f5dceba6a98188e4e2feb7;hp=c76dace1fbffaafedd5201d345b8ccdf322a626f;hb=188965b8e49bc7a0233258627917239b57429e77;hpb=28815fe0dea83042dbcd6f112ae6ce1821edd1e0 diff --git a/src/planets.c b/src/planets.c index c76dace..1ab10a1 100644 --- a/src/planets.c +++ b/src/planets.c @@ -11,15 +11,15 @@ static int consumeTime(void) game.ididit = 1; #if 0 /* Don't worry about this */ - if (future[FTBEAM] <= game.state.date+game.optime && game.state.remcom != 0 && game.condit != IHDOCKED) { + if (scheduled(FTBEAM) <= game.state.date+game.optime && game.state.remcom != 0 && game.condit != IHDOCKED) { /* We are about to be tractor beamed -- operation fails */ return 1; } #endif -// asave = future[FSNOVA]; -// future[FSNOVA] = FOREVER; /* defer supernovas */ - events(); /* Used to avoid if future[FSCMOVE] within time */ -// future[FSNOVA] = asave; +// asave = scheduled(FSNOVA); +// unschedule(FSNOVA); /* defer supernovas */ + events(); /* Used to avoid if FSCMOVE is scheduled within time */ +// schedule(FSNOVA, asave-game.state.time); /*fails if game over, quadrant super-novas or we've moved to new quadrant*/ if (game.alldone || game.state.galaxy[game.quadx][game.quady].supernova || game.justin != 0) return 1; return 0;