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
/
ai.c
diff --git
a/src/ai.c
b/src/ai.c
index 1fd1b9ba6971326cfa4d148bc3db1e8ba0475a43..7adbfdf060ed4aac060fde3a45aa1af2f7dcd85f 100644
(file)
--- a/
src/ai.c
+++ b/
src/ai.c
@@
-27,8
+27,8
@@
static bool tryexit(coord look, int ienm, int loccom, bool irun)
/* print escape message and move out of quadrant.
We know this if either short or long range sensors are working */
if (!damaged(DSRSENS) || !damaged(DLRSENS) ||
/* print escape message and move out of quadrant.
We know this if either short or long range sensors are working */
if (!damaged(DSRSENS) || !damaged(DLRSENS) ||
- game.condit
== IHDOCKED
) {
- crmena(
1
, ienm, sector, game.ks[loccom]);
+ game.condit
ion == docked
) {
+ crmena(
true
, ienm, sector, game.ks[loccom]);
prout(_(" escapes to %s (and regains strength)."),
cramlc(quadrant, iq));
}
prout(_(" escapes to %s (and regains strength)."),
cramlc(quadrant, iq));
}
@@
-40,7
+40,7
@@
static bool tryexit(coord look, int ienm, int loccom, bool irun)
game.kdist[loccom] = game.kdist[game.nenhere];
game.klhere--;
game.nenhere--;
game.kdist[loccom] = game.kdist[game.nenhere];
game.klhere--;
game.nenhere--;
- if (game.condit
!= IHDOCKED
) newcnd();
+ if (game.condit
ion != docked
) newcnd();
/* Handle global matters related to escape */
game.state.galaxy[game.quadrant.x][game.quadrant.y].klingons--;
game.state.galaxy[iq.x][iq.y].klingons++;
/* Handle global matters related to escape */
game.state.galaxy[game.quadrant.x][game.quadrant.y].klingons--;
game.state.galaxy[iq.x][iq.y].klingons++;
@@
-66,7
+66,7
@@
static bool tryexit(coord look, int ienm, int loccom, bool irun)
}
}
-static void movebaddy(coord com, int loccom,
int
ienm)
+static void movebaddy(coord com, int loccom,
feature
ienm)
/* tactical movement for the bad guys */
{
int motion, mdist, nsteps, mx, my, ll;
/* tactical movement for the bad guys */
{
int motion, mdist, nsteps, mx, my, ll;
@@
-85,7
+85,7
@@
static void movebaddy(coord com, int loccom, int ienm)
/* If SC, check with spy to see if should hi-tail it */
if (ienm==IHS &&
/* If SC, check with spy to see if should hi-tail it */
if (ienm==IHS &&
- (game.kpower[loccom] <= 500.0 || (game.condit
==IHDOCKED
&& !damaged(DPHOTON)))) {
+ (game.kpower[loccom] <= 500.0 || (game.condit
ion==docked
&& !damaged(DPHOTON)))) {
irun = true;
motion = -QUADSIZE;
}
irun = true;
motion = -QUADSIZE;
}
@@
-146,12
+146,12
@@
static void movebaddy(coord com, int loccom, int ienm)
forces += 1000.0;
}
motion = 0;
forces += 1000.0;
}
motion = 0;
- if (forces <= 1000.0 && game.condit
!= IHDOCKED
) /* Typical situation */
+ if (forces <= 1000.0 && game.condit
ion != docked
) /* Typical situation */
motion = ((forces+200.0*Rand())/150.0) - 5.0;
else {
if (forces > 1000.0) /* Very strong -- move in for kill */
motion = (1.0-square(Rand()))*dist1 + 1.0;
motion = ((forces+200.0*Rand())/150.0) - 5.0;
else {
if (forces > 1000.0) /* Very strong -- move in for kill */
motion = (1.0-square(Rand()))*dist1 + 1.0;
- if (game.condit
==IHDOCKED
&& (game.options & OPTION_BASE)) /* protected by base -- back off ! */
+ if (game.condit
ion==docked
&& (game.options & OPTION_BASE)) /* protected by base -- back off ! */
motion -= game.skill*(2.0-square(Rand()));
}
if (idebug)
motion -= game.skill*(2.0-square(Rand()));
}
if (idebug)
@@
-239,7
+239,7
@@
static void movebaddy(coord com, int loccom, int ienm)
/* it moved */
game.ks[loccom] = next;
game.kdist[loccom] = game.kavgd[loccom] = distance(game.sector, next);
/* it moved */
game.ks[loccom] = next;
game.kdist[loccom] = game.kavgd[loccom] = distance(game.sector, next);
- if (!damaged(DSRSENS) || game.condit
== IHDOCKED
) {
+ if (!damaged(DSRSENS) || game.condit
ion == docked
) {
proutn("***");
cramen(ienm);
proutn(_(" from %s"), cramlc(2, com));
proutn("***");
cramen(ienm);
proutn(_(" from %s"), cramlc(2, com));
@@
-324,7
+324,7
@@
static bool movescom(coord iq, bool flag, bool *ipage)
game.kpower[i] = game.kpower[game.nenhere];
game.klhere--;
game.nenhere--;
game.kpower[i] = game.kpower[game.nenhere];
game.klhere--;
game.nenhere--;
- if (game.condit
!=IHDOCKED
) newcnd();
+ if (game.condit
ion!=docked
) newcnd();
sortkl();
}
/* check for a helpful planet */
sortkl();
}
/* check for a helpful planet */
@@
-334,8
+334,8
@@
static bool movescom(coord iq, bool flag, bool *ipage)
/* destroy the planet */
DESTROY(&game.state.plnets[i]);
game.state.galaxy[game.state.kscmdr.x][game.state.kscmdr.y].planet = NOPLANET;
/* destroy the planet */
DESTROY(&game.state.plnets[i]);
game.state.galaxy[game.state.kscmdr.x][game.state.kscmdr.y].planet = NOPLANET;
- if (!damaged(DRADIO) || game.condit
== IHDOCKED
) {
- if (*ipage==0) pause_game(
1
);
+ if (!damaged(DRADIO) || game.condit
ion == docked
) {
+ if (*ipage==0) pause_game(
true
);
*ipage = 1;
prout(_("Lt. Uhura- \"Captain, Starfleet Intelligence reports"));
proutn(_(" a planet in "));
*ipage = 1;
prout(_("Lt. Uhura- \"Captain, Starfleet Intelligence reports"));
proutn(_(" a planet in "));
@@
-487,10
+487,10
@@
void scom(bool *ipage)
schedule(FSCDBAS, 1.0 +2.0*Rand());
if (is_scheduled(FCDBAS))
postpone(FSCDBAS, scheduled(FCDBAS)-game.state.date);
schedule(FSCDBAS, 1.0 +2.0*Rand());
if (is_scheduled(FCDBAS))
postpone(FSCDBAS, scheduled(FCDBAS)-game.state.date);
- if (damaged(DRADIO) && game.condit
!= IHDOCKED
)
+ if (damaged(DRADIO) && game.condit
ion != docked
)
return; /* no warning */
game.iseenit = true;
return; /* no warning */
game.iseenit = true;
- if (*ipage == 0) pause_game(
1
);
+ if (*ipage == 0) pause_game(
true
);
*ipage=1;
proutn(_("Lt. Uhura- \"Captain, the starbase in "));
proutn(cramlc(quadrant, game.state.kscmdr));
*ipage=1;
proutn(_("Lt. Uhura- \"Captain, the starbase in "));
proutn(cramlc(quadrant, game.state.kscmdr));
@@
-510,10
+510,10
@@
void scom(bool *ipage)
if (
!idebug &&
(Rand() > 0.2 ||
if (
!idebug &&
(Rand() > 0.2 ||
- (damaged(DRADIO) && game.condit
!= IHDOCKED
) ||
+ (damaged(DRADIO) && game.condit
ion != docked
) ||
!game.state.galaxy[game.state.kscmdr.x][game.state.kscmdr.y].charted))
return;
!game.state.galaxy[game.state.kscmdr.x][game.state.kscmdr.y].charted))
return;
- if (*ipage==0) pause_game(
1
);
+ if (*ipage==0) pause_game(
true
);
*ipage = 1;
prout(_("Lt. Uhura- \"Captain, Starfleet Intelligence reports"));
proutn(_(" the Super-commander is in "));
*ipage = 1;
prout(_("Lt. Uhura- \"Captain, Starfleet Intelligence reports"));
proutn(_(" the Super-commander is in "));