X-Git-Url: https://jxself.org/git/?p=super-star-trek.git;a=blobdiff_plain;f=src%2Fbattle.c;h=59d2d9340b23791e033804244024156fb0fff526;hp=ca77cd461236b245176ecd1ece01c966852ed06b;hb=c94108fede4723af905386473f6435467e96e630;hpb=c0682ebb9ae828d035d59892a65e1849d85963b7

diff --git a/src/battle.c b/src/battle.c
index ca77cd4..59d2d93 100644
--- a/src/battle.c
+++ b/src/battle.c
@@ -1,6 +1,6 @@
 #include "sst.h"
 
-void doshield(int i) 
+void doshield(bool raise) 
 /* change shield status */
 {
     int key;
@@ -8,7 +8,8 @@ void doshield(int i)
 
     game.ididit = false;
 
-    if (i == 2) action = SHUP;
+    if (raise) 
+	action = SHUP;
     else {
 	key = scan();
 	if (key == IHALPHA) {
@@ -62,7 +63,7 @@ void doshield(int i)
 	}
 	game.shldup = true;
 	game.shldchg = 1;
-	if (game.condit != IHDOCKED) game.energy -= 50.0;
+	if (game.condition != docked) game.energy -= 50.0;
 	prout(_("Shields raised."));
 	if (game.energy <= 0) {
 	    skip(1);
@@ -130,10 +131,10 @@ void doshield(int i)
     }
 }
 
-void ram(bool ibumpd, int ienm, coord w)
+void ram(bool ibumpd, feature ienm, coord w)
 /* make our ship ram something */
 {
-    double type = 1.0, extradm;
+    double hardness, extradm;
     int icas, m;
 	
     prouts(_("***RED ALERT!  RED ALERT!"));
@@ -143,11 +144,12 @@ void ram(bool ibumpd, int ienm, coord w)
     proutn("***");
     crmshp();
     switch (ienm) {
-    case IHR: type = 1.5; break;
-    case IHC: type = 2.0; break;
-    case IHS: type = 2.5; break;
-    case IHT: type = 0.5; break;
-    case IHQUEST: type = 4.0; break;
+    case IHR: hardness = 1.5; break;
+    case IHC: hardness = 2.0; break;
+    case IHS: hardness = 2.5; break;
+    case IHT: hardness = 0.5; break;
+    case IHQUEST: hardness = 4.0; break;
+    default: hardness = 1.0; break;
     }
     proutn(ibumpd ? _(" rammed by ") : _(" rams "));
     crmena(false, ienm, sector, w);
@@ -166,12 +168,12 @@ void ram(bool ibumpd, int ienm, coord w)
 	    continue; // Don't damage deathray 
 	if (game.damage[m] < 0) 
 	    continue;
-	extradm = (10.0*type*Rand()+1.0)*game.damfac;
+	extradm = (10.0*hardness*Rand()+1.0)*game.damfac;
 	game.damage[m] += game.optime + extradm; /* Damage for at least time of travel! */
     }
     game.shldup = false;
     if (KLINGREM) {
-	pause_game(2);
+	pause_game(true);
 	dreprt();
     }
     else finish(FWON);
@@ -196,7 +198,7 @@ void torpedo(double course, double r, coord in, double *hit, int i, int n)
     if (fabs(deltay) > bigger) bigger = fabs(deltay);
     deltax /= bigger;
     deltay /= bigger;
-    if (!damaged(DSRSENS) || game.condit==IHDOCKED) 
+    if (!damaged(DSRSENS) || game.condition==docked) 
 	setwnd(srscan_window);
     else 
 	setwnd(message_window);
@@ -225,7 +227,7 @@ void torpedo(double course, double r, coord in, double *hit, int i, int n)
 	    *hit = fabs(*hit);
 	    newcnd(); /* we're blown out of dock */
 	    /* We may be displaced. */
-	    if (game.landed==1 || game.condit==IHDOCKED) return; /* Cheat if on a planet */
+	    if (game.landed==1 || game.condition==docked) return; /* Cheat if on a planet */
 	    ang = angle + 2.5*(Rand()-0.5);
 	    temp = fabs(sin(ang));
 	    if (fabs(cos(ang)) > temp) temp = fabs(cos(ang));
@@ -500,7 +502,7 @@ void attack(bool torps_ok)
 	/* compute hit strength and diminsh shield power */
 	r = Rand();
 	/* Increase chance of photon torpedos if docked or enemy energy low */
-	if (game.condit == IHDOCKED) r *= 0.25;
+	if (game.condition == docked) r *= 0.25;
 	if (game.kpower[loop] < 500) r *= 0.25; 
 	jay = game.ks[loop];
 	iquad = game.quad[jay.x][jay.y];
@@ -512,7 +514,7 @@ void attack(bool torps_ok)
 	    (iquad==IHQUEST && r > 0.05);
 	if (itflag) {
 	    /* Enemy uses phasers */
-	    if (game.condit == IHDOCKED) continue; /* Don't waste the effort! */
+	    if (game.condition == docked) continue; /* Don't waste the effort! */
 	    attempt = true; /* Attempt to attack */
 	    dustfac = 0.8+0.05*Rand();
 	    hit = game.kpower[loop]*pow(dustfac,game.kavgd[loop]);
@@ -537,9 +539,9 @@ void attack(bool torps_ok)
 		return; /* Supernova or finished */
 	    if (hit == 0) continue;
 	}
-	if (game.shldup || game.shldchg != 0 || game.condit==IHDOCKED) {
+	if (game.shldup || game.shldchg != 0 || game.condition==docked) {
 	    /* shields will take hits */
-	    double absorb, hitsh, propor = pfac*game.shield*(game.condit==IHDOCKED ? 2.1 : 1.0);
+	    double absorb, hitsh, propor = pfac*game.shield*(game.condition==docked ? 2.1 : 1.0);
 	    if(propor < 0.1) propor = 0.1;
 	    hitsh = propor*chgfac*hit+1.0;
 	    atackd = true;
@@ -547,7 +549,7 @@ void attack(bool torps_ok)
 	    if (absorb > game.shield) absorb = game.shield;
 	    game.shield -= absorb;
 	    hit -= hitsh;
-	    if (game.condit==IHDOCKED) dock(false);
+	    if (game.condition==docked) dock(false);
 	    if (propor > 0.1 && hit < 0.005*game.energy) continue;
 	}
 	/* It's a hit -- print out hit size */
@@ -570,7 +572,7 @@ void attack(bool torps_ok)
 	hittot += hit;
 	fry(hit);
 	game.energy -= hit;
-	if (game.condit==IHDOCKED) 
+	if (game.condition==docked) 
 	    dock(false);
     }
     if (game.energy <= 0) {
@@ -578,7 +580,7 @@ void attack(bool torps_ok)
 	finish(FBATTLE);
 	return;
     }
-    if (!attempt && game.condit == IHDOCKED)
+    if (!attempt && game.condition == docked)
 	prout(_("***Enemies decide against attacking your ship."));
     if (!atackd) return;
     percent = 100.0*pfac*game.shield+0.5;
@@ -613,7 +615,7 @@ void attack(bool torps_ok)
     return;
 }
 		
-void deadkl(coord w, int type, coord mv)
+void deadkl(coord w, feature type, coord mv)
 /* kill a Klingon, Tholian, Romulan, or Thingy */
 {
     /* Added mv to allow enemy to "move" before dying */
@@ -664,6 +666,9 @@ void deadkl(coord w, int type, coord mv)
 	    unschedule(FSCMOVE);
 	    unschedule(FSCDBAS);
 	    break;
+	default:	/* avoids a gcc warning */
+	    prout("*** Internal error, deadkl() called on %c\n", type);
+	    break;
 	}
     }
 
@@ -674,7 +679,7 @@ void deadkl(coord w, int type, coord mv)
 
     game.state.remtime = game.state.remres/(game.state.remkl + 4*game.state.remcom);
 
-    /* Remove enemy ship from arrays describing local game.conditions */
+    /* Remove enemy ship from arrays describing local conditions */
     if (is_scheduled(FCDBAS) && game.battle.x==game.quadrant.x && game.battle.y==game.quadrant.y && type==IHC)
 	unschedule(FCDBAS);
     for_local_enemies(i)
@@ -818,7 +823,7 @@ void photon(void)
     /* Loop for moving <n> torpedoes */
     osuabor = false;
     for (i = 1; i <= n && !osuabor; i++) {
-	if (game.condit != IHDOCKED) game.torps--;
+	if (game.condition != docked) game.torps--;
 	r = (Rand()+Rand())*0.5 -0.5;
 	if (fabs(r) >= 0.47) {
 	    /* misfire! */
@@ -837,7 +842,7 @@ void photon(void)
 		break;
 	    }
 	}
-	if (game.shldup || game.condit == IHDOCKED) 
+	if (game.shldup || game.condition == docked) 
 	    r *= 1.0 + 0.0001*game.shield;
 	torpedo(course[i], r, game.sector, &dummy, i, n);
 	if (game.alldone || game.state.galaxy[game.quadrant.x][game.quadrant.y].supernova)
@@ -917,7 +922,7 @@ void phasers(void)
     skip(1);
     /* SR sensors and Computer */
     if (damaged(DSRSENS) || damaged(DCOMPTR)) ipoop = false;
-    if (game.condit == IHDOCKED) {
+    if (game.condition == docked) {
 	prout(_("Phasers can't be fired through base shields."));
 	chew();
 	return;