projects
/
super-star-trek.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert an incorrect bool type change.
[super-star-trek.git]
/
src
/
moving.c
diff --git
a/src/moving.c
b/src/moving.c
index 37ccb3ddc0104140303074e551e1596bbe899c52..42df8c1ea6e45002da883757e72adaaf6b7f1475 100644
(file)
--- a/
src/moving.c
+++ b/
src/moving.c
@@
-2,17
+2,19
@@
#include "sstlinux.h"
#include "sst.h"
#include "sstlinux.h"
#include "sst.h"
-static void getcd(
int
, int);
+static void getcd(
bool
, int);
void imove(void)
{
double angle, deltax, deltay, bigger, x, y,
finald, finalx, finaly, stopegy, probf;
void imove(void)
{
double angle, deltax, deltay, bigger, x, y,
finald, finalx, finaly, stopegy, probf;
- int trbeam = 0, n, l, ix=0, iy=0, kink, kinks, iquad;
+ int trbeam = 0, n, l, kink, kinks, iquad;
+ coord w;
+ w.x = w.y = 0;
if (game.inorbit) {
prout("Helmsman Sulu- \"Leaving standard orbit.\"");
if (game.inorbit) {
prout("Helmsman Sulu- \"Leaving standard orbit.\"");
- game.inorbit =
FALSE
;
+ game.inorbit =
false
;
}
angle = ((15.0 - game.direc) * 0.5235988);
}
angle = ((15.0 - game.direc) * 0.5235988);
@@
-27,30
+29,30
@@
void imove(void)
deltax /= bigger;
/* If tractor beam is to occur, don't move full distance */
deltax /= bigger;
/* If tractor beam is to occur, don't move full distance */
- if (game.state.date+game.optime >=
game.future[FTBEAM]
) {
+ if (game.state.date+game.optime >=
scheduled(FTBEAM)
) {
trbeam = 1;
game.condit = IHRED;
trbeam = 1;
game.condit = IHRED;
- game.dist = game.dist*(
game.future[FTBEAM]
-game.state.date)/game.optime + 0.1;
- game.optime =
game.future[FTBEAM]
- game.state.date + 1e-5;
+ game.dist = game.dist*(
scheduled(FTBEAM)
-game.state.date)/game.optime + 0.1;
+ game.optime =
scheduled(FTBEAM)
- game.state.date + 1e-5;
}
/* Move within the quadrant */
}
/* Move within the quadrant */
- game.quad[game.sect
x][game.sect
y] = IHDOT;
- x = game.sectx;
- y = game.secty;
+ game.quad[game.sect
or.x][game.sector.
y] = IHDOT;
+ x = game.sect
or.
x;
+ y = game.sect
or.
y;
n = 10.0*game.dist*bigger+0.5;
if (n > 0) {
for (l = 1; l <= n; l++) {
n = 10.0*game.dist*bigger+0.5;
if (n > 0) {
for (l = 1; l <= n; l++) {
-
i
x = (x += deltax) + 0.5;
-
i
y = (y += deltay) + 0.5;
- if (!VALID_SECTOR(
ix, i
y)) {
+
w.
x = (x += deltax) + 0.5;
+
w.
y = (y += deltay) + 0.5;
+ if (!VALID_SECTOR(
w.x, w.
y)) {
/* Leaving quadrant -- allow final enemy attack */
/* Don't do it if being pushed by Nova */
if (game.nenhere != 0 && game.iattak != 2) {
newcnd();
for_local_enemies(l) {
/* Leaving quadrant -- allow final enemy attack */
/* Don't do it if being pushed by Nova */
if (game.nenhere != 0 && game.iattak != 2) {
newcnd();
for_local_enemies(l) {
- finald = sqrt((
ix-game.kx[l])*(double)(ix-game.kx[l]
) +
- (
iy-game.ky[l])*(double)(iy-game.ky[l]
));
+ finald = sqrt((
w.x-game.ks[l].x)*(double)(w.x-game.ks[l].x
) +
+ (
w.y-game.ks[l].y)*(double)(w.y-game.ks[l].y
));
game.kavgd[l] = 0.5 * (finald+game.kdist[l]);
}
/*
game.kavgd[l] = 0.5 * (finald+game.kdist[l]);
}
/*
@@
-58,33
+60,33
@@
void imove(void)
* that attacks only happen if Klingons
* are present and your skill is good.
*/
* that attacks only happen if Klingons
* are present and your skill is good.
*/
- if (game.skill > SKILL_GOOD && game.klhere > 0 && !game.state.galaxy[game.quad
x][game.quad
y].supernova)
+ if (game.skill > SKILL_GOOD && game.klhere > 0 && !game.state.galaxy[game.quad
rant.x][game.quadrant.
y].supernova)
attack(0);
if (game.alldone) return;
}
/* compute final position -- new quadrant and sector */
attack(0);
if (game.alldone) return;
}
/* compute final position -- new quadrant and sector */
- x = QUADSIZE*(game.quad
x-1)+game.sect
x;
- y = QUADSIZE*(game.quad
y-1)+game.sect
y;
-
i
x = x+10.0*game.dist*bigger*deltax+0.5;
-
i
y = y+10.0*game.dist*bigger*deltay+0.5;
+ x = QUADSIZE*(game.quad
rant.x-1)+game.sector.
x;
+ y = QUADSIZE*(game.quad
rant.y-1)+game.sector.
y;
+
w.
x = x+10.0*game.dist*bigger*deltax+0.5;
+
w.
y = y+10.0*game.dist*bigger*deltay+0.5;
/* check for edge of galaxy */
kinks = 0;
do {
kink = 0;
/* check for edge of galaxy */
kinks = 0;
do {
kink = 0;
- if (
i
x <= 0) {
-
ix = -i
x + 1;
+ if (
w.
x <= 0) {
+
w.x = -w.
x + 1;
kink = 1;
}
kink = 1;
}
- if (
i
y <= 0) {
-
iy = -i
y + 1;
+ if (
w.
y <= 0) {
+
w.y = -w.
y + 1;
kink = 1;
}
kink = 1;
}
- if (
i
x > GALSIZE*QUADSIZE) {
-
ix = (GALSIZE*QUADSIZE*2)+1 - i
x;
+ if (
w.
x > GALSIZE*QUADSIZE) {
+
w.x = (GALSIZE*QUADSIZE*2)+1 - w.
x;
kink = 1;
}
kink = 1;
}
- if (
i
y > GALSIZE*QUADSIZE) {
-
iy = (GALSIZE*QUADSIZE*2)+1 - i
y;
+ if (
w.
y > GALSIZE*QUADSIZE) {
+
w.y = (GALSIZE*QUADSIZE*2)+1 - w.
y;
kink = 1;
}
if (kink) kinks = 1;
kink = 1;
}
if (kink) kinks = 1;
@@
-104,24
+106,23
@@
void imove(void)
}
/* Compute final position in new quadrant */
if (trbeam) return; /* Don't bother if we are to be beamed */
}
/* Compute final position in new quadrant */
if (trbeam) return; /* Don't bother if we are to be beamed */
- game.quad
x = (i
x+(QUADSIZE-1))/QUADSIZE;
- game.quad
y = (i
y+(QUADSIZE-1))/QUADSIZE;
- game.sect
x = ix - QUADSIZE*(game.quad
x-1);
- game.sect
y = iy - QUADSIZE*(game.quad
y-1);
+ game.quad
rant.x = (w.
x+(QUADSIZE-1))/QUADSIZE;
+ game.quad
rant.y = (w.
y+(QUADSIZE-1))/QUADSIZE;
+ game.sect
or.x = w.x - QUADSIZE*(game.quadrant.
x-1);
+ game.sect
or.y = w.y - QUADSIZE*(game.quadrant.
y-1);
skip(1);
skip(1);
- prout("Entering %s.",
- cramlc(quadrant, game.quadx, game.quady));
- game.quad[game.sectx][game.secty] = game.ship;
+ prout("Entering %s.", cramlc(quadrant, game.quadrant));
+ game.quad[game.sector.x][game.sector.y] = game.ship;
newqad(0);
if (game.skill>SKILL_NOVICE) attack(0);
return;
}
newqad(0);
if (game.skill>SKILL_NOVICE) attack(0);
return;
}
- iquad = game.quad[
ix][i
y];
+ iquad = game.quad[
w.x][w.
y];
if (iquad != IHDOT) {
/* object encountered in flight path */
stopegy = 50.0*game.dist/game.optime;
if (iquad != IHDOT) {
/* object encountered in flight path */
stopegy = 50.0*game.dist/game.optime;
- game.dist=0.1*sqrt((game.sect
x-ix)*(double)(game.sectx-i
x) +
- (game.sect
y-iy)*(double)(game.secty-i
y));
+ game.dist=0.1*sqrt((game.sect
or.x-w.x)*(double)(game.sector.x-w.
x) +
+ (game.sect
or.y-w.y)*(double)(game.sector.y-w.
y));
switch (iquad) {
case IHT: /* Ram a Tholian */
case IHK: /* Ram enemy ship */
switch (iquad) {
case IHT: /* Ram a Tholian */
case IHK: /* Ram enemy ship */
@@
-129,11
+130,11
@@
void imove(void)
case IHS:
case IHR:
case IHQUEST:
case IHS:
case IHR:
case IHQUEST:
- game.sect
x = i
x;
- game.sect
y = i
y;
- ram(0, iquad, game.sect
x, game.secty
);
- finalx = game.sectx;
- finaly = game.secty;
+ game.sect
or.x = w.
x;
+ game.sect
or.y = w.
y;
+ ram(0, iquad, game.sect
or
);
+ finalx = game.sect
or.
x;
+ finaly = game.sect
or.
y;
break;
case IHBLANK:
skip(1);
break;
case IHBLANK:
skip(1);
@@
-142,7
+143,7
@@
void imove(void)
proutn("***");
crmshp();
proutn(" pulled into black hole at ");
proutn("***");
crmshp();
proutn(" pulled into black hole at ");
- prout(cramlc(sector,
ix, iy
));
+ prout(cramlc(sector,
w
));
/*
* Getting pulled into a black hole was certain
* death in Almy's original. Stas Sergeev added a
/*
* Getting pulled into a black hole was certain
* death in Almy's original. Stas Sergeev added a
@@
-166,15
+167,15
@@
void imove(void)
proutn(" encounters Tholian web at ");
else
proutn(" blocked by object at ");
proutn(" encounters Tholian web at ");
else
proutn(" blocked by object at ");
- proutn(cramlc(sector,
ix,iy
));
+ proutn(cramlc(sector,
w
));
prout(";");
proutn("Emergency stop required ");
prout("%2d units of energy.", (int)stopegy);
game.energy -= stopegy;
finalx = x-deltax+0.5;
prout(";");
proutn("Emergency stop required ");
prout("%2d units of energy.", (int)stopegy);
game.energy -= stopegy;
finalx = x-deltax+0.5;
- game.sectx = finalx;
+ game.sect
or.
x = finalx;
finaly = y-deltay+0.5;
finaly = y-deltay+0.5;
- game.secty = finaly;
+ game.sect
or.
y = finaly;
if (game.energy <= 0) {
finish(FNRG);
return;
if (game.energy <= 0) {
finish(FNRG);
return;
@@
-184,25
+185,25
@@
void imove(void)
goto no_quad_change; /* sorry! */
}
}
goto no_quad_change; /* sorry! */
}
}
- game.dist = 0.1*sqrt((game.sect
x-ix)*(double)(game.sectx-i
x) +
- (game.sect
y-iy)*(double)(game.secty-i
y));
- game.sect
x = i
x;
- game.sect
y = i
y;
+ game.dist = 0.1*sqrt((game.sect
or.x-w.x)*(double)(game.sector.x-w.
x) +
+ (game.sect
or.y-w.y)*(double)(game.sector.y-w.
y));
+ game.sect
or.x = w.
x;
+ game.sect
or.y = w.
y;
}
}
- finalx = game.sectx;
- finaly = game.secty;
+ finalx = game.sect
or.
x;
+ finaly = game.sect
or.
y;
no_quad_change:
/* No quadrant change -- compute new avg enemy distances */
no_quad_change:
/* No quadrant change -- compute new avg enemy distances */
- game.quad[game.sect
x][game.sect
y] = game.ship;
+ game.quad[game.sect
or.x][game.sector.
y] = game.ship;
if (game.nenhere) {
for_local_enemies(l) {
if (game.nenhere) {
for_local_enemies(l) {
- finald = sqrt((
ix-game.kx[l])*(double)(ix-game.kx[l]
) +
- (
iy-game.ky[l])*(double)(iy-game.ky[l]
));
+ finald = sqrt((
w.x-game.ks[l].x)*(double)(w.x-game.ks[l].x
) +
+ (
w.y-game.ks[l].y)*(double)(w.y-game.ks[l].y
));
game.kavgd[l] = 0.5 * (finald+game.kdist[l]);
game.kdist[l] = finald;
}
sortkl();
game.kavgd[l] = 0.5 * (finald+game.kdist[l]);
game.kdist[l] = finald;
}
sortkl();
- if (!game.state.galaxy[game.quad
x][game.quad
y].supernova && game.iattak == 0)
+ if (!game.state.galaxy[game.quad
rant.x][game.quadrant.
y].supernova && game.iattak == 0)
attack(0);
for_local_enemies(l) game.kavgd[l] = game.kdist[l];
}
attack(0);
for_local_enemies(l) game.kavgd[l] = game.kdist[l];
}
@@
-224,7
+225,7
@@
void dock(int l)
prout("You must first leave standard orbit.");
return;
}
prout("You must first leave standard orbit.");
return;
}
- if (game.base
x==0 || abs(game.sectx-game.basex) > 1 || abs(game.secty-game.base
y) > 1) {
+ if (game.base
.x==0 || abs(game.sector.x-game.base.x) > 1 || abs(game.sector.y-game.base.
y) > 1) {
crmshp();
prout(" not adjacent to base.");
return;
crmshp();
prout(" not adjacent to base.");
return;
@@
-237,7
+238,7
@@
void dock(int l)
game.torps = game.intorps;
game.lsupres = game.inlsr;
if (game.damage[DRADIO] == 0.0 &&
game.torps = game.intorps;
game.lsupres = game.inlsr;
if (game.damage[DRADIO] == 0.0 &&
- (
game.future[FCDBAS] < FOREVER
|| game.isatb == 1) && game.iseenit == 0) {
+ (
is_scheduled(FCDBAS)
|| game.isatb == 1) && game.iseenit == 0) {
/* get attack report from base */
prout("Lt. Uhura- \"Captain, an important message from the starbase:\"");
attakreport(0);
/* get attack report from base */
prout("Lt. Uhura- \"Captain, an important message from the starbase:\"");
attakreport(0);
@@
-245,7
+246,7
@@
void dock(int l)
}
}
}
}
-static void getcd(
int
isprobe, int akey) {
+static void getcd(
bool
isprobe, int akey) {
/* This program originally required input in terms of a (clock)
direction and distance. Somewhere in history, it was changed to
cartesian coordinates. So we need to convert. I think
/* This program originally required input in terms of a (clock)
direction and distance. Somewhere in history, it was changed to
cartesian coordinates. So we need to convert. I think
@@
-255,10
+256,11
@@
static void getcd(int isprobe, int akey) {
are always displayed y - x, where +y is downward! */
are always displayed y - x, where +y is downward! */
- int irowq=game.quad
x, icolq=game.quady, irows, icols
, itemp=0, iprompt=0, key=0;
+ int irowq=game.quad
rant.x, icolq=game.quadrant.y
, itemp=0, iprompt=0, key=0;
double xi, xj, xk, xl;
double deltax, deltay;
int automatic = -1;
double xi, xj, xk, xl;
double deltax, deltay;
int automatic = -1;
+ coord incr;
/* Get course direction and distance. If user types bad values, return
with DIREC = -1.0. */
/* Get course direction and distance. If user types bad values, return
with DIREC = -1.0. */
@@
-359,23
+361,23
@@
static void getcd(int isprobe, int akey) {
irowq = xi + 0.5;
icolq = xj + 0.5;
irowq = xi + 0.5;
icolq = xj + 0.5;
- i
rows
= xk + 0.5;
- i
cols
= xl + 0.5;
+ i
ncr.y
= xk + 0.5;
+ i
ncr.x
= xl + 0.5;
}
else {
if (isprobe) {
/* only quadrant specified -- go to center of dest quad */
irowq = xi + 0.5;
icolq = xj + 0.5;
}
else {
if (isprobe) {
/* only quadrant specified -- go to center of dest quad */
irowq = xi + 0.5;
icolq = xj + 0.5;
- i
rows = icols
= 5;
+ i
ncr.y = incr.x
= 5;
}
else {
}
else {
- i
rows
= xi + 0.5;
- i
cols
= xj + 0.5;
+ i
ncr.y
= xi + 0.5;
+ i
ncr.x
= xj + 0.5;
}
itemp = 1;
}
}
itemp = 1;
}
- if (!VALID_QUADRANT(icolq,irowq)||!VALID_SECTOR(i
cols,irows
)) {
+ if (!VALID_QUADRANT(icolq,irowq)||!VALID_SECTOR(i
ncr.x,incr.y
)) {
huh();
return;
}
huh();
return;
}
@@
-384,13
+386,13
@@
static void getcd(int isprobe, int akey) {
if (itemp) {
if (iprompt) {
prout("Helmsman Sulu- \"Course locked in for %s.\"",
if (itemp) {
if (iprompt) {
prout("Helmsman Sulu- \"Course locked in for %s.\"",
- cramlc(sector, i
rows, icols
));
+ cramlc(sector, i
ncr
));
}
}
else prout("Ensign Chekov- \"Course laid in, Captain.\"");
}
}
}
else prout("Ensign Chekov- \"Course laid in, Captain.\"");
}
- deltax = icolq - game.quad
y + 0.1*(icols-game.sect
y);
- deltay = game.quad
x - irowq + 0.1*(game.sectx-irows
);
+ deltax = icolq - game.quad
rant.y + 0.1*(incr.x-game.sector.
y);
+ deltay = game.quad
rant.x - irowq + 0.1*(game.sector.x-incr.y
);
}
else { /* manual */
while (key == IHEOL) {
}
else { /* manual */
while (key == IHEOL) {
@@
-444,7
+446,7
@@
void impuls(void)
}
if (game.energy > 30.0) {
}
if (game.energy > 30.0) {
- getcd(
FALSE
, 0);
+ getcd(
false
, 0);
if (game.direc == -1.0) return;
power = 20.0 + 100.0*game.dist;
}
if (game.direc == -1.0) return;
power = 20.0 + 100.0*game.dist;
}
@@
-509,7
+511,7
@@
void warp(int i)
}
/* Read in course and distance */
}
/* Read in course and distance */
- getcd(
FALSE
, 0);
+ getcd(
false
, 0);
if (game.direc == -1.0) return;
/* Make sure starship has enough energy for the trip */
if (game.direc == -1.0) return;
/* Make sure starship has enough energy for the trip */
@@
-586,8
+588,8
@@
void warp(int i)
deltax /= bigger;
deltay /= bigger;
n = 10.0 * game.dist * bigger +0.5;
deltax /= bigger;
deltay /= bigger;
n = 10.0 * game.dist * bigger +0.5;
- x = game.sectx;
- y = game.secty;
+ x = game.sect
or.
x;
+ y = game.sect
or.
y;
for (l = 1; l <= n; l++) {
x += deltax;
ix = x + 0.5;
for (l = 1; l <= n; l++) {
x += deltax;
ix = x + 0.5;
@@
-732,7
+734,7
@@
void atover(int igrab)
skip(1);
prout("safely out of quadrant.");
if (game.damage[DRADIO] == 0.0)
skip(1);
prout("safely out of quadrant.");
if (game.damage[DRADIO] == 0.0)
- game.state.galaxy[game.quad
x][game.quady].charted = TRUE
;
+ game.state.galaxy[game.quad
rant.x][game.quadrant.y].charted = true
;
/* Try to use warp engines */
if (game.damage[DWARPEN]) {
skip(1);
/* Try to use warp engines */
if (game.damage[DWARPEN]) {
skip(1);
@@
-762,7
+764,7
@@
void atover(int igrab)
}
} while
/* Repeat if another snova */
}
} while
/* Repeat if another snova */
- (game.state.galaxy[game.quad
x][game.quad
y].supernova);
+ (game.state.galaxy[game.quad
rant.x][game.quadrant.
y].supernova);
if (KLINGREM==0)
finish(FWON); /* Snova killed remaining enemy. */
}
if (KLINGREM==0)
finish(FWON); /* Snova killed remaining enemy. */
}
@@
-778,16
+780,18
@@
void timwrp()
game.state = game.snapsht;
game.state.snap = 0;
if (game.state.remcom) {
game.state = game.snapsht;
game.state.snap = 0;
if (game.state.remcom) {
-
game.future[FTBEAM] = game.state.date + expran(game.intime/game.state.remcom
);
-
game.future[FBATTAK] = game.state.date + expran(0.3*game.intime
);
+
schedule(FTBEAM, expran(game.intime/game.state.remcom)
);
+
schedule(FBATTAK, expran(0.3*game.intime)
);
}
}
- game.future[FSNOVA] = game.state.date + expran(0.5*game.intime);
- game.future[FSNAP] = game.state.date +expran(0.25*game.state.remtime); /* next snapshot will
- be sooner */
- if (game.state.nscrem) game.future[FSCMOVE] = 0.2777;
+ schedule(FSNOVA, expran(0.5*game.intime));
+ /* next snapshot will be sooner */
+ schedule(FSNAP, expran(0.25*game.state.remtime));
+
+ if (game.state.nscrem) schedule(FSCMOVE, 0.2777);
game.isatb = 0;
game.isatb = 0;
- game.future[FCDBAS] = game.future[FSCDBAS] = FOREVER;
- game.batx = game.baty = 0;
+ unschedule(FCDBAS);
+ unschedule(FSCDBAS);
+ game.battle.x = game.battle.y = 0;
/* Make sure Galileo is consistant -- Snapshot may have been taken
when on planet, which would give us two Galileos! */
/* Make sure Galileo is consistant -- Snapshot may have been taken
when on planet, which would give us two Galileos! */
@@
-818,7
+822,7
@@
void timwrp()
game.optime = -0.5*game.intime*log(Rand());
prout("You are traveling forward in time %d stardates.", (int)game.optime);
/* cheat to make sure no tractor beams occur during time warp */
game.optime = -0.5*game.intime*log(Rand());
prout("You are traveling forward in time %d stardates.", (int)game.optime);
/* cheat to make sure no tractor beams occur during time warp */
-
game.future[FTBEAM] += game.optime
;
+
postpone(FTBEAM, game.optime)
;
game.damage[DRADIO] += game.optime;
}
newqad(0);
game.damage[DRADIO] += game.optime;
}
newqad(0);
@@
-845,7
+849,7
@@
void probe(void)
prout("Engineer Scott- \"The probe launcher is damaged, Sir.\"");
return;
}
prout("Engineer Scott- \"The probe launcher is damaged, Sir.\"");
return;
}
- if (
game.future[FDSPROB] != FOREVER
) {
+ if (
is_scheduled(FDSPROB)
) {
chew();
skip(1);
if (game.damage[DRADIO] != 0 && game.condit != IHDOCKED) {
chew();
skip(1);
if (game.damage[DRADIO] != 0 && game.condit != IHDOCKED) {
@@
-865,16
+869,16
@@
void probe(void)
if (ja()==0) return;
}
if (ja()==0) return;
}
- game.isarmed =
FALSE
;
+ game.isarmed =
false
;
if (key == IHALPHA && strcmp(citem,"armed") == 0) {
if (key == IHALPHA && strcmp(citem,"armed") == 0) {
- game.isarmed =
TRUE
;
+ game.isarmed =
true
;
key = scan();
}
else if (key == IHEOL) {
proutn("Arm NOVAMAX warhead? ");
game.isarmed = ja();
}
key = scan();
}
else if (key == IHEOL) {
proutn("Arm NOVAMAX warhead? ");
game.isarmed = ja();
}
- getcd(
TRUE
, key);
+ getcd(
true
, key);
if (game.direc == -1.0) return;
game.nprobes--;
angle = ((15.0 - game.direc) * 0.5235988);
if (game.direc == -1.0) return;
game.nprobes--;
angle = ((15.0 - game.direc) * 0.5235988);
@@
-888,11
+892,10
@@
void probe(void)
game.probeiny /= bigger;
game.probeinx /= bigger;
game.proben = 10.0*game.dist*bigger +0.5;
game.probeiny /= bigger;
game.probeinx /= bigger;
game.proben = 10.0*game.dist*bigger +0.5;
- game.probex = game.quadx*QUADSIZE + game.sectx - 1; // We will use better packing than original
- game.probey = game.quady*QUADSIZE + game.secty - 1;
- game.probecx = game.quadx;
- game.probecy = game.quady;
- game.future[FDSPROB] = game.state.date + 0.01; // Time to move one sector
+ game.probex = game.quadrant.x*QUADSIZE + game.sector.x - 1; // We will use better packing than original
+ game.probey = game.quadrant.y*QUADSIZE + game.sector.y - 1;
+ game.probec = game.quadrant;
+ schedule(FDSPROB, 0.01); // Time to move one sector
prout("Ensign Chekov- \"The deep space probe is launched, Captain.\"");
game.ididit = 1;
return;
prout("Ensign Chekov- \"The deep space probe is launched, Captain.\"");
game.ididit = 1;
return;
@@
-926,42
+929,41
@@
void mayday(void)
}
/* OK -- call for help from nearest starbase */
game.nhelp++;
}
/* OK -- call for help from nearest starbase */
game.nhelp++;
- if (game.basex!=0) {
+ if (game.base
.
x!=0) {
/* There's one in this quadrant */
/* There's one in this quadrant */
- ddist = sqrt(square(game.base
x-game.sectx)+square(game.basey-game.sect
y));
+ ddist = sqrt(square(game.base
.x-game.sector.x)+square(game.base.y-game.sector.
y));
}
else {
ddist = FOREVER;
for_starbases(l) {
}
else {
ddist = FOREVER;
for_starbases(l) {
- xdist=10.0*sqrt(square(game.state.baseq
x[l]-game.quadx)+square(game.state.baseqy[l]-game.quad
y));
+ xdist=10.0*sqrt(square(game.state.baseq
[l].x-game.quadrant.x)+square(game.state.baseq[l].y-game.quadrant.
y));
if (xdist < ddist) {
ddist = xdist;
line = l;
}
}
/* Since starbase not in quadrant, set up new quadrant */
if (xdist < ddist) {
ddist = xdist;
line = l;
}
}
/* Since starbase not in quadrant, set up new quadrant */
- game.quadx = game.state.baseqx[line];
- game.quady = game.state.baseqy[line];
+ game.quadrant = game.state.baseq[line];
newqad(1);
}
/* dematerialize starship */
newqad(1);
}
/* dematerialize starship */
- game.quad[game.sect
x][game.sect
y]=IHDOT;
- proutn("Starbase in %s responds--", cramlc(quadrant, game.quad
x, game.quady
));
+ game.quad[game.sect
or.x][game.sector.
y]=IHDOT;
+ proutn("Starbase in %s responds--", cramlc(quadrant, game.quad
rant
));
proutn("");
crmshp();
prout(" dematerializes.");
proutn("");
crmshp();
prout(" dematerializes.");
- game.sectx=0;
+ game.sect
or.
x=0;
for (l = 1; l <= 5; l++) {
for (l = 1; l <= 5; l++) {
- ix = game.basex+3.0*Rand()-1;
- iy = game.basey+3.0*Rand()-1;
+ ix = game.base
.
x+3.0*Rand()-1;
+ iy = game.base
.
y+3.0*Rand()-1;
if (VALID_SECTOR(ix,iy) && game.quad[ix][iy]==IHDOT) {
/* found one -- finish up */
if (VALID_SECTOR(ix,iy) && game.quad[ix][iy]==IHDOT) {
/* found one -- finish up */
- game.sectx=ix;
- game.secty=iy;
+ game.sect
or.
x=ix;
+ game.sect
or.
y=iy;
break;
}
}
break;
}
}
- if (game.sectx==0){
+ if (game.sect
or.
x==0){
prout("You have been lost in space...");
finish(FMATERIALIZE);
return;
prout("You have been lost in space...");
finish(FMATERIALIZE);
return;