projects
/
super-star-trek.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Get rid of obnoxious iattak global.
[super-star-trek.git]
/
src
/
events.c
diff --git
a/src/events.c
b/src/events.c
index 1c5ec94dbce929ff21b98cf04da42cd3315851a8..b4d465888957c1a71c68c0db4394e7d92b19ad84 100644
(file)
--- a/
src/events.c
+++ b/
src/events.c
@@
-244,7
+244,7
@@
void events(void)
newqad(false);
/* Adjust finish time to time of tractor beaming */
fintim = game.state.date+game.optime;
newqad(false);
/* Adjust finish time to time of tractor beaming */
fintim = game.state.date+game.optime;
- attack(
0
);
+ attack(
false
);
if (game.state.remcom <= 0) unschedule(FTBEAM);
else schedule(FTBEAM, game.optime+expran(1.5*game.intime/game.state.remcom));
break;
if (game.state.remcom <= 0) unschedule(FTBEAM);
else schedule(FTBEAM, game.optime+expran(1.5*game.intime/game.state.remcom));
break;
@@
-453,7
+453,7
@@
void events(void)
if (!damaged(DRADIO) || game.condition == docked)
{
prout("Uhura- Captain, %s in %s reports it is under attack",
if (!damaged(DRADIO) || game.condition == docked)
{
prout("Uhura- Captain, %s in %s reports it is under attack",
- syst
emname(q->planet)
, cramlc(quadrant, w));
+ syst
names[q->planet]
, cramlc(quadrant, w));
prout("by a Klingon invasion fleet.");
if (cancelrest())
return;
prout("by a Klingon invasion fleet.");
if (cancelrest())
return;
@@
-477,7
+477,7
@@
void events(void)
if (!damaged(DRADIO) || game.condition == docked)
{
prout("Uhura- We've lost contact with starsystem %s",
if (!damaged(DRADIO) || game.condition == docked)
{
prout("Uhura- We've lost contact with starsystem %s",
- syst
emname(q->planet)
);
+ syst
names[q->planet]
);
prout("in %s.\n", cramlc(quadrant, ev->quadrant));
}
break;
prout("in %s.\n", cramlc(quadrant, ev->quadrant));
}
break;
@@
-531,11
+531,11
@@
void events(void)
{
if (same(game.quadrant, w)) {
prout("Spock- sensors indicate the Klingons have");
{
if (same(game.quadrant, w)) {
prout("Spock- sensors indicate the Klingons have");
- prout("launched a warship from %s.",
systemname(q->planet)
);
+ prout("launched a warship from %s.",
systnames[q->planet]
);
} else {
prout("Uhura- Starfleet reports increased Klingon activity");
if (q->planet != NOPLANET)
} else {
prout("Uhura- Starfleet reports increased Klingon activity");
if (q->planet != NOPLANET)
- proutn("near %s", syst
emname(q->planet)
);
+ proutn("near %s", syst
names[q->planet]
);
prout("in %s.\n", cramlc(quadrant, w));
}
}
prout("in %s.\n", cramlc(quadrant, w));
}
}
@@
-585,7
+585,7
@@
void wait(void)
if (rtime < temp) temp = rtime;
game.optime = temp;
}
if (rtime < temp) temp = rtime;
game.optime = temp;
}
- if (game.optime < delay) attack(
0
);
+ if (game.optime < delay) attack(
false
);
if (game.alldone) return;
events();
game.ididit = true;
if (game.alldone) return;
events();
game.ididit = true;
@@
-784,8
+784,7
@@
void nova(coord nov)
game.optime = 10.0*game.dist/16.0;
skip(1);
prout(_("Force of nova displaces starship."));
game.optime = 10.0*game.dist/16.0;
skip(1);
prout(_("Force of nova displaces starship."));
- game.iattak=2; /* Eliminates recursion problem */
- imove();
+ imove(true);
game.optime = 10.0*game.dist/16.0;
return;
}
game.optime = 10.0*game.dist/16.0;
return;
}