projects
/
super-star-trek.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Abstract away the operations involving a sentinel value for coordinates.
[super-star-trek.git]
/
src
/
battle.c
diff --git
a/src/battle.c
b/src/battle.c
index 9fc6082a3a7ff11213bd77dddf86697b974622d3..f4c6e9070bb6069f67debf3d418621ece7ee7c15 100644
(file)
--- a/
src/battle.c
+++ b/
src/battle.c
@@
-387,7
+387,7
@@
void torpedo(double course, double r, coord in, double *hit, int i, int n)
q->planet = NOPLANET;
DESTROY(&game.state.plnets[game.iplnet]);
game.iplnet = 0;
q->planet = NOPLANET;
DESTROY(&game.state.plnets[game.iplnet]);
game.iplnet = 0;
-
game.plnet.x = game.plnet.y = 0
;
+
invalidate(game.plnet)
;
game.quad[w.x][w.y] = IHDOT;
if (game.landed) {
/* captain perishes on planet */
game.quad[w.x][w.y] = IHDOT;
if (game.landed) {
/* captain perishes on planet */
@@
-401,7
+401,7
@@
void torpedo(double course, double r, coord in, double *hit, int i, int n)
q->planet = NOPLANET;
DESTROY(&game.state.plnets[game.iplnet]);
game.iplnet = 0;
q->planet = NOPLANET;
DESTROY(&game.state.plnets[game.iplnet]);
game.iplnet = 0;
-
game.plnet.x = game.plnet.y = 0
;
+
invalidate(game.plnet)
;
game.quad[w.x][w.y] = IHDOT;
if (game.landed) {
/* captain perishes on planet */
game.quad[w.x][w.y] = IHDOT;
if (game.landed) {
/* captain perishes on planet */
@@
-719,7
+719,7
@@
void deadkl(coord w, feature type, coord mv)
else if (type == IHQUEST) {
/* Killed a Thingy */
iqhere = iqengry = false;
else if (type == IHQUEST) {
/* Killed a Thingy */
iqhere = iqengry = false;
-
thing.x =thing.y = 0
;
+
invalidate(thing)
;
}
else {
/* Some type of a Klingon */
}
else {
/* Some type of a Klingon */