projects
/
super-star-trek.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Replace more #defines with enums.
[super-star-trek.git]
/
src
/
moving.c
diff --git
a/src/moving.c
b/src/moving.c
index 348d1655a193c1db69ac5fd7bc73c0fe8fdb0c95..c02f1c4c63ab234eae9eac9be8e5b17ecdb37da6 100644
(file)
--- a/
src/moving.c
+++ b/
src/moving.c
@@
-9,7
+9,8
@@
void imove(void)
{
double angle, deltax, deltay, bigger, x, y,
finald, stopegy, probf;
{
double angle, deltax, deltay, bigger, x, y,
finald, stopegy, probf;
- int n, m, kink, kinks, iquad;
+ int n, m, kink, kinks;
+ feature iquad;
coord w, final;
bool trbeam = false;
coord w, final;
bool trbeam = false;
@@
-33,7
+34,7
@@
void imove(void)
/* If tractor beam is to occur, don't move full distance */
if (game.state.date+game.optime >= scheduled(FTBEAM)) {
trbeam = true;
/* If tractor beam is to occur, don't move full distance */
if (game.state.date+game.optime >= scheduled(FTBEAM)) {
trbeam = true;
- game.condit
= IHRED
;
+ game.condit
ion = red
;
game.dist = game.dist*(scheduled(FTBEAM)-game.state.date)/game.optime + 0.1;
game.optime = scheduled(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;
}
@@
-57,7
+58,7
@@
void imove(void)
game.kavgd[m] = 0.5 * (finald + game.kdist[m]);
}
/*
game.kavgd[m] = 0.5 * (finald + game.kdist[m]);
}
/*
- * Stas Sergeev added the
game.
condition
+ * Stas Sergeev added the condition
* 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.
*/
@@
-131,7
+132,7
@@
void imove(void)
case IHR:
case IHQUEST:
game.sector = w;
case IHR:
case IHQUEST:
game.sector = w;
- ram(
0
, iquad, game.sector);
+ ram(
false
, iquad, game.sector);
final = game.sector;
break;
case IHBLANK:
final = game.sector;
break;
case IHBLANK:
@@
-211,7
+212,7
@@
void dock(bool verbose)
/* dock our ship at a starbase */
{
chew();
/* dock our ship at a starbase */
{
chew();
- if (game.condit
== IHDOCKED
&& verbose) {
+ if (game.condit
ion == docked
&& verbose) {
prout(_("Already docked."));
return;
}
prout(_("Already docked."));
return;
}
@@
-224,7
+225,7
@@
void dock(bool verbose)
prout(_(" not adjacent to base."));
return;
}
prout(_(" not adjacent to base."));
return;
}
- game.condit
= IHDOCKED
;
+ game.condit
ion = docked
;
if (verbose) prout(_("Docked."));
game.ididit = true;
if (game.energy < game.inenrg) game.energy = game.inenrg;
if (verbose) prout(_("Docked."));
game.ididit = true;
if (game.energy < game.inenrg) game.energy = game.inenrg;
@@
-233,11
+234,11
@@
void dock(bool verbose)
game.lsupres = game.inlsr;
game.state.crew = FULLCREW;
if (!damaged(DRADIO) &&
game.lsupres = game.inlsr;
game.state.crew = FULLCREW;
if (!damaged(DRADIO) &&
- (is_scheduled(FCDBAS) || game.isatb == 1) &&
game.iseenit == 0
) {
+ (is_scheduled(FCDBAS) || game.isatb == 1) &&
!game.iseenit
) {
/* get attack report from base */
prout(_("Lt. Uhura- \"Captain, an important message from the starbase:\""));
attakreport(false);
/* get attack report from base */
prout(_("Lt. Uhura- \"Captain, an important message from the starbase:\""));
attakreport(false);
- game.iseenit =
1
;
+ game.iseenit =
true
;
}
}
}
}
@@
-774,7
+775,8
@@
void atover(bool igrab)
void timwrp()
/* let's do the time warp again */
{
void timwrp()
/* let's do the time warp again */
{
- int l, gotit;
+ int l;
+ bool gotit;
prout(_("***TIME WARP ENTERED."));
if (game.state.snap && Rand() < 0.5) {
/* Go back in time */
prout(_("***TIME WARP ENTERED."));
if (game.state.snap && Rand() < 0.5) {
/* Go back in time */
@@
-798,10
+800,10
@@
void timwrp()
/* 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! */
- gotit =
0
;
+ gotit =
false
;
for (l = 0; l < game.inplan; l++) {
if (game.state.plnets[l].known == shuttle_down) {
for (l = 0; l < game.inplan; l++) {
if (game.state.plnets[l].known == shuttle_down) {
- gotit =
1
;
+ gotit =
true
;
if (game.iscraft==1 && game.ship==IHE) {
prout(_("Checkov- \"Security reports the Galileo has disappeared, Sir!"));
game.iscraft = 0;
if (game.iscraft==1 && game.ship==IHE) {
prout(_("Checkov- \"Security reports the Galileo has disappeared, Sir!"));
game.iscraft = 0;
@@
-810,7
+812,7
@@
void timwrp()
}
/* Likewise, if in the original time the Galileo was abandoned, but
was on ship earlier, it would have vanished -- lets restore it */
}
/* Likewise, if in the original time the Galileo was abandoned, but
was on ship earlier, it would have vanished -- lets restore it */
- if (game.iscraft==0 &&
gotit==0
&& game.damage[DSHUTTL] >= 0.0) {
+ if (game.iscraft==0 &&
!gotit
&& game.damage[DSHUTTL] >= 0.0) {
prout(_("Checkov- \"Security reports the Galileo has reappeared in the dock!\""));
game.iscraft = 1;
}
prout(_("Checkov- \"Security reports the Galileo has reappeared in the dock!\""));
game.iscraft = 1;
}
@@
-856,7
+858,7
@@
void probe(void)
if (is_scheduled(FDSPROB)) {
chew();
skip(1);
if (is_scheduled(FDSPROB)) {
chew();
skip(1);
- if (damaged(DRADIO) && game.condit
!= IHDOCKED
) {
+ if (damaged(DRADIO) && game.condit
ion != docked
) {
prout(_("Spock- \"Records show the previous probe has not yet"));
prout(_(" reached its destination.\""));
}
prout(_("Spock- \"Records show the previous probe has not yet"));
prout(_(" reached its destination.\""));
}
@@
-913,8
+915,8
@@
void mayday(void)
int line = 0, m, ix, iy;
chew();
int line = 0, m, ix, iy;
chew();
- /* Test for
game.
conditions which prevent calling for help */
- if (game.condit
== IHDOCKED
) {
+ /* Test for conditions which prevent calling for help */
+ if (game.condit
ion == docked
) {
prout(_("Lt. Uhura- \"But Captain, we're already docked.\""));
return;
}
prout(_("Lt. Uhura- \"But Captain, we're already docked.\""));
return;
}