projects
/
super-star-trek.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
More boolean cleanups. More consistent use of coord type
[super-star-trek.git]
/
src
/
ai.c
diff --git
a/src/ai.c
b/src/ai.c
index e524a8e09ec8e5c9324b4e74c1525837328a268d..e59657144774c73ba2ef8fdb48ee6c001d5e02b5 100644
(file)
--- a/
src/ai.c
+++ b/
src/ai.c
@@
-45,14
+45,13
@@
static bool tryexit(int lookx, int looky, int ienm, int loccom, int irun)
game.state.galaxy[game.quadrant.x][game.quadrant.y].klingons--;
game.state.galaxy[iq.x][iq.y].klingons++;
if (ienm==IHS) {
game.state.galaxy[game.quadrant.x][game.quadrant.y].klingons--;
game.state.galaxy[iq.x][iq.y].klingons++;
if (ienm==IHS) {
- game.ishere
=0
;
- game.iscate
=
0;
- game.ientesc
=0
;
- game.isatb
=
0;
+ game.ishere
= false
;
+ game.iscate
=
0;
+ game.ientesc
= false
;
+ game.isatb
=
0;
schedule(FSCMOVE, 0.2777);
unschedule(FSCDBAS);
schedule(FSCMOVE, 0.2777);
unschedule(FSCDBAS);
- game.state.kscmdr.x=iq.x;
- game.state.kscmdr.y=iq.y;
+ game.state.kscmdr=iq;
}
else {
for_commanders(n) {
}
else {
for_commanders(n) {
@@
-242,8
+241,7
@@
static void movebaddy(coord com, int loccom, int ienm)
/* it moved */
game.ks[loccom].x = next.x;
game.ks[loccom].y = next.y;
/* it moved */
game.ks[loccom].x = next.x;
game.ks[loccom].y = next.y;
- game.kdist[loccom] = game.kavgd[loccom] =
- sqrt(square(game.sector.x-next.x)+square(game.sector.y-next.y));
+ game.kdist[loccom] = game.kavgd[loccom] = distance(game.sector, next);
if (!damaged(DSRSENS) || game.condit == IHDOCKED) {
proutn("***");
cramen(ienm);
if (!damaged(DSRSENS) || game.condit == IHDOCKED) {
proutn("***");
cramen(ienm);
@@
-317,8
+315,8
@@
static bool movescom(coord iq, bool flag, bool *ipage)
/* SC has scooted, Remove him from current quadrant */
game.iscate=0;
game.isatb=0;
/* SC has scooted, Remove him from current quadrant */
game.iscate=0;
game.isatb=0;
- game.ishere
=0
;
- game.ientesc
=0
;
+ game.ishere
= false
;
+ game.ientesc
= false
;
unschedule(FSCDBAS);
for_local_enemies(i)
if (game.quad[game.ks[i].x][game.ks[i].y] == IHS) break;
unschedule(FSCDBAS);
for_local_enemies(i)
if (game.quad[game.ks[i].x][game.ks[i].y] == IHS) break;
@@
-388,9
+386,7
@@
void scom(bool *ipage)
sc = game.state.kscmdr;
for_starbases(i) {
basetbl[i] = i;
sc = game.state.kscmdr;
for_starbases(i) {
basetbl[i] = i;
- ibq.x = game.state.baseq[i].x;
- ibq.y = game.state.baseq[i].y;
- bdist[i] = sqrt(square(ibq.x-sc.x) + square(ibq.y-sc.y));
+ bdist[i] = distance(game.state.baseq[i], sc);
}
if (game.state.rembase > 1) {
/* sort into nearest first order */
}
if (game.state.rembase > 1) {
/* sort into nearest first order */
@@
-533,9
+529,8
@@
void movetho(void)
/* move the Tholian */
{
int idx, idy, im, i;
/* move the Tholian */
{
int idx, idy, im, i;
- coord dummy;
/* Move the Tholian */
/* Move the Tholian */
- if (
game.ithere==0 || game.justin == 1
) return;
+ if (
!game.ithere || game.justin
) return;
if (game.tholian.x == 1 && game.tholian.y == 1) {
idx = 1; idy = QUADSIZE;
if (game.tholian.x == 1 && game.tholian.y == 1) {
idx = 1; idy = QUADSIZE;
@@
-551,7
+546,7
@@
void movetho(void)
}
else {
/* something is wrong! */
}
else {
/* something is wrong! */
- game.ithere =
0
;
+ game.ithere =
false
;
return;
}
return;
}
@@
-587,10
+582,11
@@
void movetho(void)
}
/* All plugged up -- Tholian splits */
game.quad[game.tholian.x][game.tholian.y]=IHWEB;
}
/* All plugged up -- Tholian splits */
game.quad[game.tholian.x][game.tholian.y]=IHWEB;
- dropin(IHBLANK
, &dummy
);
+ dropin(IHBLANK);
crmena(true, IHT, sector, game.tholian);
prout(_(" completes web."));
crmena(true, IHT, sector, game.tholian);
prout(_(" completes web."));
- game.ithere = game.tholian.x = game.tholian.y = 0;
+ game.ithere = false;
+ game.tholian.x = game.tholian.y = 0;
game.nenhere--;
return;
}
game.nenhere--;
return;
}