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 and explanator comments.
[super-star-trek.git]
/
src
/
events.c
diff --git
a/src/events.c
b/src/events.c
index 995440148009341200d19fe9f21e9a877e0c9ab3..eef7033591b947bba23f293b9f829c77d3eebb88 100644
(file)
--- a/
src/events.c
+++ b/
src/events.c
@@
-42,11
+42,12
@@
void postpone(int evtype, double offset)
}
static bool cancelrest(void)
}
static bool cancelrest(void)
+/* rest period is interrupted by event */
{
if (game.resting) {
skip(1);
proutn(_("Mr. Spock- \"Captain, shall we cancel the rest period?\""));
{
if (game.resting) {
skip(1);
proutn(_("Mr. Spock- \"Captain, shall we cancel the rest period?\""));
- if (ja()) {
+ if (ja()
== true
) {
game.resting = false;
game.optime = 0.0;
return true;
game.resting = false;
game.optime = 0.0;
return true;
@@
-57,6
+58,7
@@
static bool cancelrest(void)
}
void events(void)
}
void events(void)
+/* run through the event queue looking for things to do */
{
int istract=0, evcode, i=0, j, k, l;
double fintim = game.state.date + game.optime, datemin, xtime, repair, yank=0;
{
int istract=0, evcode, i=0, j, k, l;
double fintim = game.state.date + game.optime, datemin, xtime, repair, yank=0;
@@
-139,7
+141,7
@@
void events(void)
prout(_(" surveillance reports are coming in."));
skip(1);
if (game.iseenit==0) {
prout(_(" surveillance reports are coming in."));
skip(1);
if (game.iseenit==0) {
- attakreport(
0
);
+ attakreport(
false
);
game.iseenit = 1;
}
rechart();
game.iseenit = 1;
}
rechart();
@@
-198,7
+200,7
@@
void events(void)
crmshp();
prout(_(" caught in long range tractor beam--"));
/* If Kirk & Co. screwing around on planet, handle */
crmshp();
prout(_(" caught in long range tractor beam--"));
/* If Kirk & Co. screwing around on planet, handle */
- atover(
1); /* atover(1
) is Grab */
+ atover(
true); /* atover(true
) is Grab */
if (game.alldone) return;
if (game.icraft == 1) { /* Caught in Galileo? */
finish(FSTRACTOR);
if (game.alldone) return;
if (game.icraft == 1) { /* Caught in Galileo? */
finish(FSTRACTOR);
@@
-238,7
+240,7
@@
void events(void)
}
else prout(_("(Shields not currently useable.)"));
}
}
else prout(_("(Shields not currently useable.)"));
}
- newqad(
0
);
+ newqad(
false
);
/* Adjust finish time to time of tractor beaming */
fintim = game.state.date+game.optime;
attack(0);
/* Adjust finish time to time of tractor beaming */
fintim = game.state.date+game.optime;
attack(0);
@@
-543,11
+545,12
@@
void events(void)
void wait(void)
void wait(void)
+/* wait on events */
{
int key;
double temp, delay, origTime;
{
int key;
double temp, delay, origTime;
- game.ididit =
0
;
+ game.ididit =
false
;
for (;;) {
key = scan();
if (key != IHEOL) break;
for (;;) {
key = scan();
if (key != IHEOL) break;
@@
-562,7
+565,7
@@
void wait(void)
if (delay <= 0.0) return;
if (delay >= game.state.remtime || game.nenhere != 0) {
proutn(_("Are you sure? "));
if (delay <= 0.0) return;
if (delay >= game.state.remtime || game.nenhere != 0) {
proutn(_("Are you sure? "));
- if (ja() ==
0
) return;
+ if (ja() ==
false
) return;
}
/* Alternate resting periods (events) with attacks */
}
/* Alternate resting periods (events) with attacks */
@@
-584,7
+587,7
@@
void wait(void)
if (game.optime < delay) attack(0);
if (game.alldone) return;
events();
if (game.optime < delay) attack(0);
if (game.alldone) return;
events();
- game.ididit =
1
;
+ game.ididit =
true
;
if (game.alldone) return;
delay -= temp;
/* Repair Deathray if long rest at starbase */
if (game.alldone) return;
delay -= temp;
/* Repair Deathray if long rest at starbase */
@@
-599,6
+602,7
@@
void wait(void)
}
void nova(int ix, int iy)
}
void nova(int ix, int iy)
+/* star goes nova */
{
static double course[] =
{0.0, 10.5, 12.0, 1.5, 9.0, 0.0, 3.0, 7.5, 6.0, 4.5};
{
static double course[] =
{0.0, 10.5, 12.0, 1.5, 9.0, 0.0, 3.0, 7.5, 6.0, 4.5};
@@
-615,7
+619,7
@@
void nova(int ix, int iy)
/* handle initial nova */
game.quad[ix][iy] = IHDOT;
/* handle initial nova */
game.quad[ix][iy] = IHDOT;
- crmena(
1, IHSTAR, 2
, nov);
+ crmena(
false, IHSTAR, sector
, nov);
prout(_(" novas."));
game.state.galaxy[game.quadrant.x][game.quadrant.y].stars--;
game.state.starkl++;
prout(_(" novas."));
game.state.galaxy[game.quadrant.x][game.quadrant.y].stars--;
game.state.starkl++;
@@
-654,14
+658,14
@@
void nova(int ix, int iy)
hits[top2][2]=scratch.y;
game.state.galaxy[game.quadrant.x][game.quadrant.y].stars -= 1;
game.state.starkl++;
hits[top2][2]=scratch.y;
game.state.galaxy[game.quadrant.x][game.quadrant.y].stars -= 1;
game.state.starkl++;
- crmena(
1, IHSTAR, 2
, scratch);
+ crmena(
true, IHSTAR, sector
, scratch);
prout(_(" novas."));
game.quad[scratch.x][scratch.y] = IHDOT;
break;
case IHP: /* Destroy planet */
game.state.galaxy[game.quadrant.x][game.quadrant.y].planet = NOPLANET;
game.state.nplankl++;
prout(_(" novas."));
game.quad[scratch.x][scratch.y] = IHDOT;
break;
case IHP: /* Destroy planet */
game.state.galaxy[game.quadrant.x][game.quadrant.y].planet = NOPLANET;
game.state.nplankl++;
- crmena(
1, IHP, 2
, scratch);
+ crmena(
true, IHP, sector
, scratch);
prout(_(" destroyed."));
DESTROY(&game.state.plnets[game.iplnet]);
game.iplnet = game.plnet.x = game.plnet.y = 0;
prout(_(" destroyed."));
DESTROY(&game.state.plnets[game.iplnet]);
game.iplnet = game.plnet.x = game.plnet.y = 0;
@@
-681,7
+685,7
@@
void nova(int ix, int iy)
game.base.x = game.base.y = 0;
game.state.basekl++;
newcnd();
game.base.x = game.base.y = 0;
game.state.basekl++;
newcnd();
- crmena(
1, IHB, 2
, scratch);
+ crmena(
true, IHB, sector
, scratch);
prout(_(" destroyed."));
game.quad[scratch.x][scratch.y] = IHDOT;
break;
prout(_(" destroyed."));
game.quad[scratch.x][scratch.y] = IHDOT;
break;
@@
-724,7
+728,7
@@
void nova(int ix, int iy)
}
newc.x = scratch.x + scratch.x - hits[mm][1];
newc.y = scratch.y + scratch.y - hits[mm][2];
}
newc.x = scratch.x + scratch.x - hits[mm][1];
newc.y = scratch.y + scratch.y - hits[mm][2];
- crmena(
1, iquad, 2
, scratch);
+ crmena(
true, iquad, sector
, scratch);
proutn(_(" damaged"));
if (!VALID_SECTOR(newc.x, newc.y)) {
/* can't leave quadrant */
proutn(_(" damaged"));
if (!VALID_SECTOR(newc.x, newc.y)) {
/* can't leave quadrant */
@@
-734,7
+738,7
@@
void nova(int ix, int iy)
iquad1 = game.quad[newc.x][newc.y];
if (iquad1 == IHBLANK) {
proutn(_(", blasted into "));
iquad1 = game.quad[newc.x][newc.y];
if (iquad1 == IHBLANK) {
proutn(_(", blasted into "));
- crmena(
0, IHBLANK, 2
, newc);
+ crmena(
false, IHBLANK, sector
, newc);
skip(1);
deadkl(scratch, iquad, newc.x, newc.y);
break;
skip(1);
deadkl(scratch, iquad, newc.x, newc.y);
break;
@@
-782,10
+786,11
@@
void nova(int ix, int iy)
void snova(int insx, int insy)
void snova(int insx, int insy)
+/* star goes supernova */
{
int comdead, nsx, nsy, num=0, kldead, iscdead;
int nrmdead, npdead;
{
int comdead, nsx, nsy, num=0, kldead, iscdead;
int nrmdead, npdead;
-
int incipient=0
;
+
bool incipient = false
;
coord nq;
nq.x = nq.y = 0;
coord nq;
nq.x = nq.y = 0;
@@
-817,7
+822,7
@@
void snova(int insx, int insy)
}
if (idebug) {
proutn("=== Super nova here?");
}
if (idebug) {
proutn("=== Super nova here?");
- if (ja()
==1
) {
+ if (ja()
== true
) {
nq.x = game.quadrant.x;
nq.y = game.quadrant.y;
}
nq.x = game.quadrant.x;
nq.y = game.quadrant.y;
}
@@
-835,7
+840,7
@@
void snova(int insx, int insy)
}
else {
/* we are in the quadrant! */
}
else {
/* we are in the quadrant! */
- incipient =
1
;
+ incipient =
true
;
num = Rand()* game.state.galaxy[nq.x][nq.y].stars + 1;
for_sectors(nsx) {
for_sectors(nsy) {
num = Rand()* game.state.galaxy[nq.x][nq.y].stars + 1;
for_sectors(nsx) {
for_sectors(nsy) {
@@
-849,7
+854,7
@@
void snova(int insx, int insy)
}
}
else {
}
}
else {
- incipient =
1
;
+ incipient =
true
;
}
if (incipient) {
}
if (incipient) {
@@
-900,18
+905,18
@@
void snova(int insx, int insy)
game.state.nromrem -= nrmdead;
npdead = num - nrmdead*10;
if (npdead) {
game.state.nromrem -= nrmdead;
npdead = num - nrmdead*10;
if (npdead) {
- int l;
- for (l
= 0; l < game.inplan; l
++)
- if (same(game.state.plnets[l].w, nq)) {
- DESTROY(&game.state.plnets[l]);
+ int l
oop
;
+ for (l
oop = 0; loop < game.inplan; loop
++)
+ if (same(game.state.plnets[l
oop
].w, nq)) {
+ DESTROY(&game.state.plnets[l
oop
]);
}
}
/* Destroy any base in supernovaed quadrant */
if (game.state.rembase) {
}
}
/* Destroy any base in supernovaed quadrant */
if (game.state.rembase) {
- int maxloop = game.state.rembase, l;
- for (l
= 1; l <= maxloop; l
++)
- if (same(game.state.baseq[l], nq)) {
- game.state.baseq[l] = game.state.baseq[game.state.rembase];
+ int maxloop = game.state.rembase, l
oop
;
+ for (l
oop = 1; loop <= maxloop; loop
++)
+ if (same(game.state.baseq[l
oop
], nq)) {
+ game.state.baseq[l
oop
] = game.state.baseq[game.state.rembase];
game.state.baseq[game.state.rembase].x = game.state.baseq[game.state.rembase].y = 0;
game.state.rembase--;
break;
game.state.baseq[game.state.rembase].x = game.state.baseq[game.state.rembase].y = 0;
game.state.rembase--;
break;
@@
-927,7
+932,7
@@
void snova(int insx, int insy)
if (same(game.quadrant, nq) || !damaged(DRADIO) || game.condit == IHDOCKED)
game.state.galaxy[nq.x][nq.y].supernova = true;
/* If supernova destroys last Klingons give special message */
if (same(game.quadrant, nq) || !damaged(DRADIO) || game.condit == IHDOCKED)
game.state.galaxy[nq.x][nq.y].supernova = true;
/* If supernova destroys last Klingons give special message */
- if (KLINGREM==0 &&
(nq.x != game.quadrant.x || nq.y != game.quadrant.y
)) {
+ if (KLINGREM==0 &&
!same(nq, game.quadrant
)) {
skip(2);
if (insx == 0) prout(_("Lucky you!"));
proutn(_("A supernova in %s has just destroyed the last Klingons."),
skip(2);
if (insx == 0) prout(_("Lucky you!"));
proutn(_("A supernova in %s has just destroyed the last Klingons."),