X-Git-Url: https://jxself.org/git/?p=super-star-trek.git;a=blobdiff_plain;f=src%2Fevents.c;h=1e04dd0e2c8f3e09bf6465194be75b352ff2dc9f;hp=95a3c44517c1e37650a296e2321a4dec87c1f765;hb=093f7d420e9cf92fbaf751f57a199c56562ae4b5;hpb=ad1478c7cc24b761592a1e355015b44b243aeeda

diff --git a/src/events.c b/src/events.c
index 95a3c44..1e04dd0 100644
--- a/src/events.c
+++ b/src/events.c
@@ -93,6 +93,7 @@ void events(void)
 
     radio_was_broken = damaged(DRADIO);
 
+    hold.x = hold.y = 0;
     for (;;) {
 	/* Select earliest extraneous event, evcode==0 if no events */
 	evcode = FSPY;
@@ -223,7 +224,7 @@ void events(void)
 		game.quadrant = game.state.kscmdr;
 	    else
 		game.quadrant = game.state.kcmdr[i];
-	    iran(QUADSIZE, &game.sector.x, &game.sector.y);
+	    game.sector = iran(QUADSIZE);
 	    crmshp();
 	    proutn(_(" is pulled to "));
 	    proutn(cramlc(quadrant, game.quadrant));
@@ -431,7 +432,7 @@ void events(void)
 		   which has some stars which are inhabited and
 		   not already under attack, which is not
 		   supernova'ed, and which has some Klingons in it */
-		iran(GALSIZE, &w.x, &w.y);
+		w = iran(GALSIZE);
 		q = &game.state.galaxy[w.x][w.y];
 	    } while (--i &&
 		     (same(game.quadrant, w) || q->planet == NOPLANET ||
@@ -521,7 +522,7 @@ void events(void)
 	    game.state.remkl++;
 	    q->klingons++;
 	    if (same(game.quadrant, w))
-		newkling(++game.klhere, &hold);
+		newkling(++game.klhere);
 
 	    /* recompute time left */
 	    game.state.remtime = game.state.remres/(game.state.remkl+4*game.state.remcom);
@@ -752,8 +753,7 @@ void nova(coord nov)
 			game.quad[scratch.x][scratch.y] = IHDOT;
 			game.quad[newc.x][newc.y] = iquad;
 			game.ks[ll] = newc;
-			game.kavgd[ll] = sqrt(square(game.sector.x-newc.x)+square(game.sector.y-newc.y));
-			game.kdist[ll] = game.kavgd[ll];
+			game.kdist[ll] = game.kavgd[ll] = distance(game.sector, newc);
 			skip(1);
 			break;
 		    }
@@ -849,7 +849,7 @@ void snova(bool induced, coord *w)
 	    prouts("***************");
 	    skip(1);
 	    stars();
-	    game.alldone=1;
+	    game.alldone = true;
 	}
     }