projects
/
super-star-trek.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Typo fix.
[super-star-trek.git]
/
src
/
events.c
diff --git
a/src/events.c
b/src/events.c
index aeefdb49c8fdddbcc4d4b76d39e5d2c67567c9a8..3362fddf818368d526d4ceb6372207c797ac8502 100644
(file)
--- a/
src/events.c
+++ b/
src/events.c
@@
-22,7
+22,7
@@
int is_scheduled(int evtype)
return game.future[evtype].date != FOREVER;
}
return game.future[evtype].date != FOREVER;
}
-
extern
double scheduled(int evtype)
+double scheduled(int evtype)
/* when will this event happen? */
{
return game.future[evtype].date;
/* when will this event happen? */
{
return game.future[evtype].date;
@@
-36,7
+36,7
@@
event *schedule(int evtype, double offset)
}
void postpone(int evtype, double offset)
}
void postpone(int evtype, double offset)
-/* po
i
stpone a scheduled event */
+/* postpone a scheduled event */
{
game.future[evtype].date += offset;
}
{
game.future[evtype].date += offset;
}
@@
-62,12
+62,11
@@
void events(void)
{
int evcode, i=0, j, k, l;
double fintim = game.state.date + game.optime, datemin, xtime, repair, yank=0;
{
int evcode, i=0, j, k, l;
double fintim = game.state.date + game.optime, datemin, xtime, repair, yank=0;
- bool
radio_was_broken,
ictbeam = false, istract = false;
+ bool ictbeam = false, istract = false;
struct quadrant *pdest, *q;
coord w, hold;
event *ev, *ev2;
struct quadrant *pdest, *q;
coord w, hold;
event *ev, *ev2;
-
- pause_reset();
+ bool fixed_dev[NDEVICES];
if (idebug) {
prout("=== EVENTS from %.2f to %.2f:", game.state.date, fintim);
if (idebug) {
prout("=== EVENTS from %.2f to %.2f:", game.state.date, fintim);
@@
-82,7
+81,7
@@
void events(void)
case FSCDBAS: proutn("=== SC Base Destroy "); break;
case FDSPROB: proutn("=== Probe Move "); break;
case FDISTR: proutn("=== Distress Call "); break;
case FSCDBAS: proutn("=== SC Base Destroy "); break;
case FDSPROB: proutn("=== Probe Move "); break;
case FDISTR: proutn("=== Distress Call "); break;
- case FENSLV: proutn("=== En
lavement
"); break;
+ case FENSLV: proutn("=== En
slavement
"); break;
case FREPRO: proutn("=== Klingon Build "); break;
}
if (is_scheduled(i))
case FREPRO: proutn("=== Klingon Build "); break;
}
if (is_scheduled(i))
@@
-93,8
+92,6
@@
void events(void)
}
}
}
}
- radio_was_broken = damaged(DRADIO);
-
hold.x = hold.y = 0;
for (;;) {
/* Select earliest extraneous event, evcode==0 if no events */
hold.x = hold.y = 0;
for (;;) {
/* Select earliest extraneous event, evcode==0 if no events */
@@
-113,7
+110,8
@@
void events(void)
game.state.date = datemin;
/* Decrement Federation resources and recompute remaining time */
game.state.remres -= (game.state.remkl+4*game.state.remcom)*xtime;
game.state.date = datemin;
/* Decrement Federation resources and recompute remaining time */
game.state.remres -= (game.state.remkl+4*game.state.remcom)*xtime;
- game.state.remtime = game.state.remres/(game.state.remkl+4*game.state.remcom);
+ game.state.remtime = game.state.remkl + game.state.remcom > 0 ?
+ game.state.remres/(game.state.remkl + 4*game.state.remcom) : 99;
if (game.state.remtime <=0) {
finish(FDEPLETE);
return;
if (game.state.remtime <=0) {
finish(FDEPLETE);
return;
@@
-138,11
+136,18
@@
void events(void)
if (game.condition == docked)
repair /= game.docfac;
/* Don't fix Deathray here */
if (game.condition == docked)
repair /= game.docfac;
/* Don't fix Deathray here */
- for (l=0; l<NDEVICES; l++)
- if (game.damage[l] > 0.0 && l != DDRAY)
- game.damage[l] -= (game.damage[l]-repair > 0.0 ? repair : game.damage[l]);
+ for (l=0; l<NDEVICES; l++) {
+ fixed_dev[l] = false;
+ if (game.damage[l] > 0.0 && l != DDRAY) {
+ double reminder = (game.damage[l] > repair ?
+ game.damage[l] - repair : .0);
+ game.damage[l] = reminder;
+ if (!(reminder > 0))
+ fixed_dev[l] = true;
+ }
+ }
/* If radio repaired, update star chart and attack reports */
/* If radio repaired, update star chart and attack reports */
- if (
radio_was_broken && !damaged(DRADIO)
) {
+ if (
fixed_dev[DRADIO]
) {
prout(_("Lt. Uhura- \"Captain, the sub-space radio is working and"));
prout(_(" surveillance reports are coming in."));
skip(1);
prout(_("Lt. Uhura- \"Captain, the sub-space radio is working and"));
prout(_(" surveillance reports are coming in."));
skip(1);
@@
-150,15
+155,16
@@
void events(void)
attackreport(false);
game.iseenit = true;
}
attackreport(false);
game.iseenit = true;
}
- rechart();
prout(_(" The star chart is now up to date.\""));
skip(1);
}
prout(_(" The star chart is now up to date.\""));
skip(1);
}
+ if (fixed_dev[DRADIO] || fixed_dev[DLRSENS] || fixed_dev[DSRSENS])
+ rechart();
/* Cause extraneous event EVCODE to occur */
game.optime -= xtime;
switch (evcode) {
case FSNOVA: /* Supernova */
/* Cause extraneous event EVCODE to occur */
game.optime -= xtime;
switch (evcode) {
case FSNOVA: /* Supernova */
-
pause_game(true
);
+
announce(
);
supernova(false, NULL);
schedule(FSNOVA, expran(0.5*game.intime));
if (game.state.galaxy[game.quadrant.x][game.quadrant.y].supernova)
supernova(false, NULL);
schedule(FSNOVA, expran(0.5*game.intime));
if (game.state.galaxy[game.quadrant.x][game.quadrant.y].supernova)
@@
-167,7
+173,8
@@
void events(void)
case FSPY: /* Check with spy to see if S.C. should tractor beam */
if (game.state.nscrem == 0 ||
ictbeam || istract ||
case FSPY: /* Check with spy to see if S.C. should tractor beam */
if (game.state.nscrem == 0 ||
ictbeam || istract ||
- game.condition==docked || game.isatb==1 || game.iscate) return;
+ game.condition==docked || game.isatb==1 || game.iscate)
+ return;
if (game.ientesc ||
(game.energy < 2000 && game.torps < 4 && game.shield < 1250) ||
(damaged(DPHASER) && (damaged(DPHOTON) || game.torps < 4)) ||
if (game.ientesc ||
(game.energy < 2000 && game.torps < 4 && game.shield < 1250) ||
(damaged(DPHASER) && (damaged(DPHOTON) || game.torps < 4)) ||
@@
-198,7
+205,7
@@
void events(void)
}
/* tractor beaming cases merge here */
yank = sqrt(yank);
}
/* tractor beaming cases merge here */
yank = sqrt(yank);
-
pause_game(true
);
+
announce(
);
game.optime = (10.0/(7.5*7.5))*yank; /* 7.5 is yank rate (warp 7.5) */
ictbeam = true;
skip(1);
game.optime = (10.0/(7.5*7.5))*yank; /* 7.5 is yank rate (warp 7.5) */
ictbeam = true;
skip(1);
@@
-297,7
+304,7
@@
void events(void)
if (!damaged(DRADIO) && game.condition != docked)
break; /* No warning :-( */
game.iseenit = true;
if (!damaged(DRADIO) && game.condition != docked)
break; /* No warning :-( */
game.iseenit = true;
-
pause_game(true
);
+
announce(
);
skip(1);
proutn(_("Lt. Uhura- \"Captain, the starbase in "));
prout(cramlc(quadrant, game.battle));
skip(1);
proutn(_("Lt. Uhura- \"Captain, the starbase in "));
prout(cramlc(quadrant, game.battle));
@@
-344,7
+351,7
@@
void events(void)
else if (game.state.rembase != 1 &&
(!damaged(DRADIO) || game.condition == docked)) {
/* Get word via subspace radio */
else if (game.state.rembase != 1 &&
(!damaged(DRADIO) || game.condition == docked)) {
/* Get word via subspace radio */
- pause_game(true);
+ announce();
skip(1);
prout(_("Lt. Uhura- \"Captain, Starfleet Command reports that"));
proutn(_(" the starbase in "));
skip(1);
prout(_("Lt. Uhura- \"Captain, Starfleet Command reports that"));
proutn(_(" the starbase in "));
@@
-389,7
+396,7
@@
void events(void)
game.state.galaxy[game.probec.x][game.probec.y].supernova) {
// Left galaxy or ran into supernova
if (!damaged(DRADIO) || game.condition == docked) {
game.state.galaxy[game.probec.x][game.probec.y].supernova) {
// Left galaxy or ran into supernova
if (!damaged(DRADIO) || game.condition == docked) {
-
pause_game(true
);
+
announce(
);
skip(1);
proutn(_("Lt. Uhura- \"The deep space probe "));
if (!VALID_QUADRANT(j, i))
skip(1);
proutn(_("Lt. Uhura- \"The deep space probe "));
if (!VALID_QUADRANT(j, i))
@@
-402,7
+409,7
@@
void events(void)
break;
}
if (!damaged(DRADIO) || game.condition == docked) {
break;
}
if (!damaged(DRADIO) || game.condition == docked) {
-
pause_game(true
);
+
announce(
);
skip(1);
proutn(_("Lt. Uhura- \"The deep space probe is now in "));
proutn(cramlc(quadrant, game.probec));
skip(1);
proutn(_("Lt. Uhura- \"The deep space probe is now in "));
proutn(cramlc(quadrant, game.probec));
@@
-442,6
+449,7
@@
void events(void)
q = &game.state.galaxy[w.x][w.y];
} while (--i &&
(same(game.quadrant, w) || q->planet == NOPLANET ||
q = &game.state.galaxy[w.x][w.y];
} while (--i &&
(same(game.quadrant, w) || q->planet == NOPLANET ||
+ game.state.planets[q->planet].inhabited == UNINHABITED ||
q->supernova || q->status!=secure || q->klingons<=0));
if (i == 0) {
/* can't seem to find one; ignore this call */
q->supernova || q->status!=secure || q->klingons<=0));
if (i == 0) {
/* can't seem to find one; ignore this call */
@@
-458,9
+466,9
@@
void events(void)
/* tell the captain about it if we can */
if (!damaged(DRADIO) || game.condition == docked)
{
/* tell the captain about it if we can */
if (!damaged(DRADIO) || game.condition == docked)
{
- prout(
"Uhura- Captain, %s in %s reports it is under attack"
,
+ prout(
_("Uhura- Captain, %s in %s reports it is under attack")
,
systnames[q->planet], cramlc(quadrant, w));
systnames[q->planet], cramlc(quadrant, w));
- prout(
"by a Klingon invasion fleet."
);
+ prout(
_("by a Klingon invasion fleet.")
);
if (cancelrest())
return;
}
if (cancelrest())
return;
}
@@
-482,9
+490,9
@@
void events(void)
/* report the disaster if we can */
if (!damaged(DRADIO) || game.condition == docked)
{
/* report the disaster if we can */
if (!damaged(DRADIO) || game.condition == docked)
{
- prout(
"Uhura- We've lost contact with starsystem %s"
,
+ prout(
_("Uhura- We've lost contact with starsystem %s")
,
systnames[q->planet]);
systnames[q->planet]);
- prout(
"in %s.\n"
, cramlc(quadrant, ev->quadrant));
+ prout(
_("in %s.\n")
, cramlc(quadrant, ev->quadrant));
}
break;
case FREPRO: /* Klingon reproduces */
}
break;
case FREPRO: /* Klingon reproduces */
@@
-529,18
+537,19
@@
void events(void)
newkling(++game.klhere);
/* recompute time left */
newkling(++game.klhere);
/* recompute time left */
- game.state.remtime = game.state.remres/(game.state.remkl+4*game.state.remcom);
+ game.state.remtime = game.state.remkl + game.state.remcom > 0 ?
+ game.state.remres/(game.state.remkl + 4*game.state.remcom) : 99;
/* report the disaster if we can */
if (!damaged(DRADIO) || game.condition == docked)
{
if (same(game.quadrant, w)) {
/* report the disaster if we can */
if (!damaged(DRADIO) || game.condition == docked)
{
if (same(game.quadrant, w)) {
- prout(
"Spock- sensors indicate the Klingons have"
);
- prout(
"launched a warship from %s."
, systnames[q->planet]);
+ prout(
_("Spock- sensors indicate the Klingons have")
);
+ prout(
_("launched a warship from %s.")
, systnames[q->planet]);
} else {
} else {
- prout(
"Uhura- Starfleet reports increased Klingon activity"
);
+ prout(
_("Uhura- Starfleet reports increased Klingon activity")
);
if (q->planet != NOPLANET)
if (q->planet != NOPLANET)
- proutn(
"near %s"
, systnames[q->planet]);
- prout(
"in %s.\n"
, cramlc(quadrant, w));
+ proutn(
_("near %s ")
, systnames[q->planet]);
+ prout(
_("in %s.\n")
, cramlc(quadrant, w));
}
}
break;
}
}
break;
@@
-689,7
+698,7
@@
void nova(coord nov)
game.state.nplankl++;
crmena(true, IHP, sector, scratch);
prout(_(" destroyed."));
game.state.nplankl++;
crmena(true, IHP, sector, scratch);
prout(_(" destroyed."));
-
DESTROY(&game.state.planets[game.iplnet])
;
+
game.state.planets[game.iplnet].pclass = destroyed
;
game.iplnet = 0;
invalidate(game.plnet);
if (game.landed) {
game.iplnet = 0;
invalidate(game.plnet);
if (game.landed) {
@@
-815,7
+824,7
@@
void nova(coord nov)
void supernova(bool induced, coord *w)
/* star goes supernova */
{
void supernova(bool induced, coord *w)
/* star goes supernova */
{
- int num = 0, nrmdead, npdead
, kldead
;
+ int num = 0, nrmdead, npdead
= 0, kldead, loop
;
coord nq;
if (w != NULL)
coord nq;
if (w != NULL)
@@
-893,7
+902,11
@@
void supernova(bool induced, coord *w)
game.state.nscrem = game.state.kscmdr.x = game.state.kscmdr.y = game.isatb = 0;
game.iscate = false;
unschedule(FSCMOVE);
game.state.nscrem = game.state.kscmdr.x = game.state.kscmdr.y = game.isatb = 0;
game.iscate = false;
unschedule(FSCMOVE);
+ }
+ if (same(nq, game.battle)) {
unschedule(FSCDBAS);
unschedule(FSCDBAS);
+ unschedule(FCDBAS);
+ invalidate(game.battle);
}
if (game.state.remcom) {
int maxloop = game.state.remcom, l;
}
if (game.state.remcom) {
int maxloop = game.state.remcom, l;
@@
-914,13
+927,12
@@
void supernova(bool induced, coord *w)
nrmdead = game.state.galaxy[nq.x][nq.y].romulans;
game.state.galaxy[nq.x][nq.y].romulans = 0;
game.state.nromrem -= nrmdead;
nrmdead = game.state.galaxy[nq.x][nq.y].romulans;
game.state.galaxy[nq.x][nq.y].romulans = 0;
game.state.nromrem -= nrmdead;
- npdead = num - nrmdead*10;
- if (npdead) {
- int loop;
- for (loop = 0; loop < game.inplan; loop++)
- if (same(game.state.planets[loop].w, nq)) {
- DESTROY(&game.state.planets[loop]);
- }
+ /* Destroy planets */
+ for (loop = 0; loop < game.inplan; loop++) {
+ if (same(game.state.planets[loop].w, nq)) {
+ game.state.planets[loop].pclass = destroyed;
+ npdead++;
+ }
}
/* Destroy any base in supernovaed quadrant */
if (game.state.rembase) {
}
/* Destroy any base in supernovaed quadrant */
if (game.state.rembase) {
@@
-943,7
+955,7
@@
void supernova(bool induced, coord *w)
if (same(game.quadrant, nq) || !damaged(DRADIO) || game.condition == docked)
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.condition == docked)
game.state.galaxy[nq.x][nq.y].supernova = true;
/* If supernova destroys last Klingons give special message */
- if (
KLINGREM
==0 && !same(nq, game.quadrant)) {
+ if (
(game.state.remkl + game.state.remcom + game.state.nscrem)
==0 && !same(nq, game.quadrant)) {
skip(2);
if (!induced)
prout(_("Lucky you!"));
skip(2);
if (!induced)
prout(_("Lucky you!"));