From: Eric S. Raymond <esr@thyrsus.com>
Date: Wed, 20 Sep 2006 04:35:23 +0000 (+0000)
Subject: Still more application of coord type.
X-Git-Tag: 2.0~220
X-Git-Url: https://jxself.org/git/?a=commitdiff_plain;h=3fad5b50fc2950c556a55e39a78e7129353af0b1;p=super-star-trek.git

Still more application of coord type.
---

diff --git a/src/ai.c b/src/ai.c
index e596571..889aafe 100644
--- a/src/ai.c
+++ b/src/ai.c
@@ -208,7 +208,7 @@ static void movebaddy(coord com, int loccom, int ienm)
 		/* See if we should ram ship */
 		if (game.quad[lookx][looky] == game.ship &&
 		    (ienm == IHC || ienm == IHS)) {
-		    ram(1, ienm, com);
+		    ram(true, ienm, com);
 		    return;
 		}
 		if (krawlx != mx && my != 0) {
diff --git a/src/battle.c b/src/battle.c
index 20b35ef..69abfaa 100644
--- a/src/battle.c
+++ b/src/battle.c
@@ -153,7 +153,7 @@ void ram(bool ibumpd, int ienm, coord w)
     crmena(false, ienm, sector, w);
     if (ibumpd) proutn(_(" (original position)"));
     skip(1);
-    deadkl(w, ienm, game.sector.x, game.sector.y);
+    deadkl(w, ienm, game.sector);
     proutn("***");
     crmshp();
     prout(_(" heavily damaged."));
@@ -178,7 +178,7 @@ void ram(bool ibumpd, int ienm, coord w)
     return;
 }
 
-void torpedo(double course, double r, int inx, int iny, double *hit, int i, int n)
+void torpedo(double course, double r, coord in, double *hit, int i, int n)
 /* let a photon torpedo fly */
 {
     int l, iquad=0, ll;
@@ -186,7 +186,7 @@ void torpedo(double course, double r, int inx, int iny, double *hit, int i, int
     double ac=course + 0.25*r;
     double angle = (15.0-ac)*0.5235988;
     double bullseye = (15.0 - course)*0.5235988;
-    double deltax=-sin(angle), deltay=cos(angle), x=inx, y=iny, bigger;
+    double deltax=-sin(angle), deltay=cos(angle), x=in.x, y=in.y, bigger;
     double ang, temp, xx, yy, kp, h1;
     struct quadrant *q = &game.state.galaxy[game.quadrant.x][game.quadrant.y];
     coord w, jw;
@@ -221,8 +221,7 @@ void torpedo(double course, double r, int inx, int iny, double *hit, int i, int
 	    crmshp();
 	    prout(".");
 	    *hit = 700.0 + 100.0*Rand() -
-		1000.0*sqrt(square(w.x-inx)+square(w.y-iny))*
-		fabs(sin(bullseye-angle));
+		1000.0 * distance(w, in) * fabs(sin(bullseye-angle));
 	    *hit = fabs(*hit);
 	    newcnd(); /* we're blown out of dock */
 	    /* We may be displaced. */
@@ -243,8 +242,7 @@ void torpedo(double course, double r, int inx, int iny, double *hit, int i, int
 		/* can't move into object */
 		return;
 	    }
-	    game.sector.x = jw.x;
-	    game.sector.y = jw.y;
+	    game.sector = jw;
 	    crmshp();
 	    shoved = true;
 	    break;
@@ -261,16 +259,16 @@ void torpedo(double course, double r, int inx, int iny, double *hit, int i, int
 	case IHK:
 	    /* find the enemy */
 	    for_local_enemies(ll)
-		if (w.x==game.ks[ll].x && w.y==game.ks[ll].y) break;
+		if (same(w, game.ks[ll]))
+		    break;
 	    kp = fabs(game.kpower[ll]);
 	    h1 = 700.0 + 100.0*Rand() -
-		1000.0*sqrt(square(w.x-inx)+square(w.y-iny))*
-		fabs(sin(bullseye-angle));
+		1000.0 * distance(w, in) * fabs(sin(bullseye-angle));
 	    h1 = fabs(h1);
 	    if (kp < h1) h1 = kp;
 	    game.kpower[ll] -= (game.kpower[ll]<0 ? -h1 : h1);
 	    if (game.kpower[ll] == 0) {
-		deadkl(w, iquad, w.x, w.y);
+		deadkl(w, iquad, w);
 		return;
 	    }
 	    crmena(true, iquad, sector, w);
@@ -288,7 +286,7 @@ void torpedo(double course, double r, int inx, int iny, double *hit, int i, int
 	    }
 	    if (game.quad[jw.x][jw.y]==IHBLANK) {
 		prout(_(" buffeted into black hole."));
-		deadkl(w, iquad, jw.x, jw.y);
+		deadkl(w, iquad, jw);
 		return;
 	    }
 	    if (game.quad[jw.x][jw.y]!=IHDOT) {
@@ -297,8 +295,7 @@ void torpedo(double course, double r, int inx, int iny, double *hit, int i, int
 		return;
 	    }
 	    proutn(_(" damaged--"));
-	    game.ks[ll].x = jw.x;
-	    game.ks[ll].y = jw.y;
+	    game.ks[ll] = jw;
 	    shoved = true;
 	    break;
 	case IHB: /* Hit a base */
@@ -366,7 +363,7 @@ void torpedo(double course, double r, int inx, int iny, double *hit, int i, int
 		proutn(_("Mr. Spock-"));
 		prouts(_("  \"Fascinating!\""));
 		skip(1);
-		deadkl(w, iquad, w.x, w.y);
+		deadkl(w, iquad, w);
 	    } else {
 		/*
 		 * Stas Sergeev added the possibility that
@@ -388,14 +385,13 @@ void torpedo(double course, double r, int inx, int iny, double *hit, int i, int
 	    return;
 	case IHT:  /* Hit a Tholian */
 	    h1 = 700.0 + 100.0*Rand() -
-		1000.0*sqrt(square(w.x-inx)+square(w.y-iny))*
-		fabs(sin(bullseye-angle));
+		1000.0 * distance(w, in) * fabs(sin(bullseye-angle));
 	    h1 = fabs(h1);
 	    if (h1 >= 600) {
 		game.quad[w.x][w.y] = IHDOT;
 		game.ithere = false;
 		game.tholian.x = game.tholian.y = 0;
-		deadkl(w, iquad, w.x, w.y);
+		deadkl(w, iquad, w);
 		return;
 	    }
 	    skip(1);
@@ -536,7 +532,7 @@ void attack(bool torps_ok)
 	    prout("  ");
 	    r = (Rand()+Rand())*0.5 -0.5;
 	    r += 0.002*game.kpower[loop]*r;
-	    torpedo(course, r, jay.x, jay.y, &hit, 1, 1);
+	    torpedo(course, r, jay, &hit, 1, 1);
 	    if (KLINGREM==0) 
 		finish(FWON); /* Klingons did themselves in! */
 	    if (game.state.galaxy[game.quadrant.x][game.quadrant.y].supernova || game.alldone) 
@@ -619,14 +615,12 @@ void attack(bool torps_ok)
     return;
 }
 		
-void deadkl(coord w, int type, int ixx, int iyy)
+void deadkl(coord w, int type, coord mv)
 /* kill a Klingon, Tholian, Romulan, or Thingy */
 {
-    /* Added ixx and iyy allow enemy to "move" before dying */
-    coord mv;
+    /* Added mv to allow enemy to "move" before dying */
     int i,j;
 
-    mv.x = ixx; mv.y = iyy;
     skip(1);
     crmena(true, type, sector, mv);
     /* Decide what kind of enemy it is and update approriately */
@@ -847,7 +841,7 @@ void photon(void)
 	}
 	if (game.shldup || game.condit == IHDOCKED) 
 	    r *= 1.0 + 0.0001*game.shield;
-	torpedo(course[i], r, game.sector.x, game.sector.y, &dummy, i, n);
+	torpedo(course[i], r, game.sector, &dummy, i, n);
 	if (game.alldone || game.state.galaxy[game.quadrant.x][game.quadrant.y].supernova)
 	    return;
     }
@@ -1236,7 +1230,7 @@ void hittem(double *hits)
 	crmena(false,ienm,sector,w);
 	skip(1);
 	if (kpow == 0) {
-	    deadkl(w, ienm, w.x, w.y);
+	    deadkl(w, ienm, w);
 	    if (KLINGREM==0) finish(FWON);
 	    if (game.alldone) return;
 	    kk--; /* don't do the increment */
diff --git a/src/events.c b/src/events.c
index 1e04dd0..8fed80a 100644
--- a/src/events.c
+++ b/src/events.c
@@ -171,7 +171,7 @@ void events(void)
 		 (game.torps < 5 || damaged(DPHOTON)))) {
 		/* Tractor-beam her! */
 		istract = true;
-		yank = square(game.state.kscmdr.x-game.quadrant.x) + square(game.state.kscmdr.y-game.quadrant.y);
+		yank = distance(game.state.kscmdr, game.quadrant);
 		/********* fall through to FTBEAM code ***********/
 	    }
 	    else return;
@@ -714,7 +714,7 @@ void nova(coord nov)
 			kount++;
 			break;
 		    case IHK: /* kill klingon */
-			deadkl(scratch,iquad, scratch.x, scratch.y);
+			deadkl(scratch,iquad, scratch);
 			break;
 		    case IHC: /* Damage/destroy big enemies */
 		    case IHS:
@@ -723,7 +723,7 @@ void nova(coord nov)
 			    if (same(game.ks[ll], scratch)) break;
 			game.kpower[ll] -= 800.0; /* If firepower is lost, die */
 			if (game.kpower[ll] <= 0.0) {
-			    deadkl(scratch, iquad, scratch.x, scratch.y);
+			    deadkl(scratch, iquad, scratch);
 			    break;
 			}
 			newc.x = scratch.x + scratch.x - hits[mm][1];
@@ -740,7 +740,7 @@ void nova(coord nov)
 			    proutn(_(", blasted into "));
 			    crmena(false, IHBLANK, sector, newc);
 			    skip(1);
-			    deadkl(scratch, iquad, newc.x, newc.y);
+			    deadkl(scratch, iquad, newc);
 			    break;
 			}
 			if (iquad1 != IHDOT) {
diff --git a/src/finish.c b/src/finish.c
index 570be4e..ac21d07 100644
--- a/src/finish.c
+++ b/src/finish.c
@@ -62,7 +62,7 @@ void kaboom(void)
 	int l=1;
 	while (l <= game.nenhere) {
 	    if (game.kpower[l]*game.kdist[l] <= whammo) 
-		deadkl(game.ks[l], game.quad[game.ks[l].x][game.ks[l].y], game.ks[l].x, game.ks[l].y);
+		deadkl(game.ks[l], game.quad[game.ks[l].x][game.ks[l].y], game.ks[l]);
 	    l++;
 	}
     }
diff --git a/src/moving.c b/src/moving.c
index 348d165..11142a3 100644
--- a/src/moving.c
+++ b/src/moving.c
@@ -131,7 +131,7 @@ void imove(void)
 		case IHR:
 		case IHQUEST:
 		    game.sector = w;
-		    ram(0, iquad, game.sector);
+		    ram(false, iquad, game.sector);
 		    final = game.sector;
 		    break;
 		case IHBLANK:
diff --git a/src/planets.c b/src/planets.c
index e0c75a6..52bc32d 100644
--- a/src/planets.c
+++ b/src/planets.c
@@ -436,7 +436,7 @@ void deathray(void)
 	prouts(_("Sulu- \"Captain!  It's working!\""));
 	skip(2);
 	while (game.nenhere > 0)
-	    deadkl(game.ks[1], game.quad[game.ks[1].x][game.ks[1].y],game.ks[1].x,game.ks[1].y);
+	    deadkl(game.ks[1], game.quad[game.ks[1].x][game.ks[1].y],game.ks[1]);
 	prout(_("Ensign Chekov-  \"Congratulations, Captain!\""));
 	if (KLINGREM == 0) finish(FWON);
 	if ((game.options & OPTION_PLAIN) == 0) {
diff --git a/src/sst.h b/src/sst.h
index 89cb16f..9aaf5a5 100644
--- a/src/sst.h
+++ b/src/sst.h
@@ -383,10 +383,10 @@ void sortkl(void);
 void imove(void);
 void ram(bool, int, coord);
 void crmena(bool, int, enum loctype, coord w);
-void deadkl(coord, int, int, int);
+void deadkl(coord, int, coord);
 void timwrp(void);
 void movcom(void);
-void torpedo(double, double, int, int, double *, int, int);
+void torpedo(double, double, coord, double *, int, int);
 void huh(void);
 void pause_game(int);
 void nova(coord);