X-Git-Url: https://jxself.org/git/?p=super-star-trek.git;a=blobdiff_plain;f=src%2Fevents.c;h=7acb042fa8ba76803a2e57773b68f6fcb51e9a1b;hp=b4d465888957c1a71c68c0db4394e7d92b19ad84;hb=4207ce95e80fe7e2d5114079fa4255e0ad506618;hpb=f5a89916bc70a66b6fa6a3abc4c36023503cd380;ds=sidebyside

diff --git a/src/events.c b/src/events.c
index b4d4658..7acb042 100644
--- a/src/events.c
+++ b/src/events.c
@@ -317,7 +317,7 @@ void events(void)
 		if (i > game.state.remcom || game.state.rembase == 0 ||
 		    !game.state.galaxy[game.battle.x][game.battle.y].starbase) {
 		    /* No action to take after all */
-		    game.battle.x = game.battle.y = 0;
+		    invalidate(game.battle);
 		    break;
 		}
 	    }
@@ -358,9 +358,8 @@ void events(void)
 		game.battle = hold;
 		game.isatb = 0;
 	    }
-	    else {
-		game.battle.x = game.battle.y = 0;
-	    }
+	    else
+		invalidate(game.battle);
 	    break;
 	case FSCMOVE: /* Supercommander moves */
 	    schedule(FSCMOVE, 0.2777);
@@ -676,7 +675,8 @@ void nova(coord nov)
 			crmena(true, IHP, sector, scratch);
 			prout(_(" destroyed."));
 			DESTROY(&game.state.plnets[game.iplnet]);
-			game.iplnet = game.plnet.x = game.plnet.y = 0;
+			game.iplnet = 0;
+			invalidate(game.plnet);
 			if (game.landed) {
 			    finish(FPNOVA);
 			    return;
@@ -690,7 +690,7 @@ void nova(coord nov)
 				break;
 			game.state.baseq[i] = game.state.baseq[game.state.rembase];
 			game.state.rembase--;
-			game.base.x = game.base.y = 0;
+			invalidate(game.base);
 			game.state.basekl++;
 			newcnd();
 			crmena(true, IHB, sector, scratch);
@@ -875,7 +875,7 @@ void snova(bool induced, coord *w)
 	for (l = 1; l <= maxloop; l++) {
 	    if (same(game.state.kcmdr[l], nq)) {
 		game.state.kcmdr[l] = game.state.kcmdr[game.state.remcom];
-		game.state.kcmdr[game.state.remcom].x = game.state.kcmdr[game.state.remcom].y = 0;
+		invalidate(game.state.kcmdr[game.state.remcom]);
 		game.state.remcom--;
 		kldead--;
 		if (game.state.remcom==0) unschedule(FTBEAM);
@@ -902,7 +902,7 @@ void snova(bool induced, coord *w)
 	for (loop = 1; loop <= maxloop; loop++)
 	    if (same(game.state.baseq[loop], nq)) {
 		game.state.baseq[loop] = game.state.baseq[game.state.rembase];
-		game.state.baseq[game.state.rembase].x = game.state.baseq[game.state.rembase].y = 0;
+		invalidate(game.state.baseq[game.state.rembase]);
 		game.state.rembase--;
 		break;
 	    }