projects
/
super-star-trek.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Simplified the logic for refeshing starcharts.
[super-star-trek.git]
/
moving.c
diff --git
a/moving.c
b/moving.c
index f44aff4c2bd98f98ac10409bfd9b1a9f8e2d9464..7dee9e5f8089b3f521b8ec54c6751f9b5c679678 100644
(file)
--- a/
moving.c
+++ b/
moving.c
@@
-233,8
+233,8
@@
void dock(int l)
shield = inshld;
torps = intorps;
lsupres = inlsr;
shield = inshld;
torps = intorps;
lsupres = inlsr;
- if (
stdamtim != 1e3
0 &&
- (game.future[FCDBAS] <
1e30
|| isatb == 1) && iseenit == 0) {
+ if (
game.damage[DRADIO] == 0.
0 &&
+ (game.future[FCDBAS] <
FOREVER
|| isatb == 1) && 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);
@@
-783,7
+783,7
@@
void timwrp()
be sooner */
if (game.state.nscrem) game.future[FSCMOVE] = 0.2777;
isatb = 0;
be sooner */
if (game.state.nscrem) game.future[FSCMOVE] = 0.2777;
isatb = 0;
- game.future[FCDBAS] = game.future[FSCDBAS] =
1e30
;
+ game.future[FCDBAS] = game.future[FSCDBAS] =
FOREVER
;
batx = baty = 0;
/* Make sure Galileo is consistant -- Snapshot may have been taken
batx = baty = 0;
/* Make sure Galileo is consistant -- Snapshot may have been taken
@@
-842,7
+842,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] !=
1e30
) {
+ if (game.future[FDSPROB] !=
FOREVER
) {
chew();
skip(1);
if (game.damage[DRADIO] != 0 && condit != IHDOCKED) {
chew();
skip(1);
if (game.damage[DRADIO] != 0 && condit != IHDOCKED) {
@@
-928,7
+928,7
@@
void help(void)
ddist = sqrt(square(basex-sectx)+square(basey-secty));
}
else {
ddist = sqrt(square(basex-sectx)+square(basey-secty));
}
else {
- ddist =
1e30
;
+ ddist =
FOREVER
;
for_starbases(l) {
xdist=10.0*sqrt(square(game.state.baseqx[l]-quadx)+square(game.state.baseqy[l]-quady));
if (xdist < ddist) {
for_starbases(l) {
xdist=10.0*sqrt(square(game.state.baseqx[l]-quadx)+square(game.state.baseqy[l]-quady));
if (xdist < ddist) {