X-Git-Url: https://jxself.org/git/?p=super-star-trek.git;a=blobdiff_plain;f=src%2Fbattle.c;h=d9e815436c0fa415b1e7bd9df81287c5575c5919;hp=b36f86ac05f8859c1b5bde63575b8d36e0c0bbfa;hb=2c5438d3c22fe863ad8054d214f2afdd061ad43a;hpb=f9acc563cce04f40f3d622f34ce5fd6263bfc619 diff --git a/src/battle.c b/src/battle.c index b36f86a..d9e8154 100644 --- a/src/battle.c +++ b/src/battle.c @@ -39,7 +39,8 @@ void doshield(bool raise) } else if (game.shldup) { proutn(_("Shields are up. Do you want them down? ")); - if (ja() == true) action = SHDN; + if (ja() == true) + action = SHDN; else { chew(); return; @@ -47,7 +48,8 @@ void doshield(bool raise) } else { proutn(_("Shields are down. Do you want them up? ")); - if (ja() == true) action = SHUP; + if (ja() == true) + action = SHUP; else { chew(); return; @@ -62,8 +64,9 @@ void doshield(bool raise) return; } game.shldup = true; - game.shldchg = 1; - if (game.condition != docked) game.energy -= 50.0; + game.shldchg = true; + if (game.condition != docked) + game.energy -= 50.0; prout(_("Shields raised.")); if (game.energy <= 0) { skip(1); @@ -79,7 +82,7 @@ void doshield(bool raise) return; } game.shldup=false; - game.shldchg=1; + game.shldchg=true; prout(_("Shields lowered.")); game.ididit = true; return; @@ -89,7 +92,8 @@ void doshield(bool raise) proutn(_("Energy to transfer to shields- ")); } chew(); - if (aaitem==0) return; + if (aaitem==0) + return; if (aaitem > game.energy) { prout(_("Insufficient ship energy.")); return; @@ -208,7 +212,8 @@ void ram(bool ibumpd, feature ienm, coord w) } proutn(ibumpd ? _(" rammed by ") : _(" rams ")); crmena(false, ienm, sector, w); - if (ibumpd) proutn(_(" (original position)")); + if (ibumpd) + proutn(_(" (original position)")); skip(1); deadkl(w, ienm, game.sector); proutn("***"); @@ -236,9 +241,10 @@ void ram(bool ibumpd, feature ienm, coord w) prout(_("***Shields are down.")); if (KLINGREM) { pause_game(true); - dreprt(); + damagereport(); } - else finish(FWON); + else + finish(FWON); return; } @@ -257,7 +263,8 @@ void torpedo(double course, double r, coord in, double *hit, int i, int n) w.x = w.y = jw.x = jw.y = 0; bigger = fabs(deltax); - if (fabs(deltay) > bigger) bigger = fabs(deltay); + if (fabs(deltay) > bigger) + bigger = fabs(deltay); deltax /= bigger; deltay /= bigger; if (!damaged(DSRSENS) || game.condition==docked) @@ -270,13 +277,16 @@ void torpedo(double course, double r, coord in, double *hit, int i, int n) w.x = x + 0.5; y += deltay; w.y = y + 0.5; - if (!VALID_SECTOR(w.x, w.y)) break; + if (!VALID_SECTOR(w.x, w.y)) + break; iquad=game.quad[w.x][w.y]; tracktorpedo(w, l, i, n, iquad); - if (iquad==IHDOT) continue; + if (iquad==IHDOT) + continue; /* hit something */ setwnd(message_window); - skip(1); /* start new line after text track */ + if (damaged(DSRSENS) && !game.condition==docked) + skip(1); /* start new line after text track */ switch(iquad) { case IHE: /* Hit our ship */ case IHF: @@ -289,15 +299,18 @@ 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.condition==docked) return; /* Cheat if on a planet */ + if (game.landed || 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)); + if (fabs(cos(ang)) > temp) + temp = fabs(cos(ang)); xx = -sin(ang)/temp; yy = cos(ang)/temp; jw.x=w.x+xx+0.5; jw.y=w.y+yy+0.5; - if (!VALID_SECTOR(jw.x, jw.y)) return; + if (!VALID_SECTOR(jw.x, jw.y)) + return; if (game.quad[jw.x][jw.y]==IHBLANK) { finish(FHOLE); return; @@ -322,14 +335,15 @@ void torpedo(double course, double r, coord in, double *hit, int i, int n) case IHR: /* Hit a regular enemy */ case IHK: /* find the enemy */ - for_local_enemies(ll) + for (ll = 1; ll <= game.nenhere; ll++) if (same(w, game.ks[ll])) break; kp = fabs(game.kpower[ll]); h1 = 700.0 + 100.0*Rand() - 1000.0 * distance(w, in) * fabs(sin(bullseye-angle)); h1 = fabs(h1); - if (kp < h1) h1 = kp; + if (kp < h1) + h1 = kp; game.kpower[ll] -= (game.kpower[ll]<0 ? -h1 : h1); if (game.kpower[ll] == 0) { deadkl(w, iquad, w); @@ -339,7 +353,8 @@ void torpedo(double course, double r, coord in, double *hit, int i, int n) /* If enemy damaged but not destroyed, try to displace */ ang = angle + 2.5*(Rand()-0.5); temp = fabs(sin(ang)); - if (fabs(cos(ang)) > temp) temp = fabs(cos(ang)); + if (fabs(cos(ang)) > temp) + temp = fabs(cos(ang)); xx = -sin(ang)/temp; yy = cos(ang)/temp; jw.x=w.x+xx+0.5; @@ -365,7 +380,7 @@ void torpedo(double course, double r, coord in, double *hit, int i, int n) case IHB: /* Hit a base */ skip(1); prout(_("***STARBASE DESTROYED..")); - for_starbases(ll) { + for (ll = 1; ll <= game.state.rembase; ll++) { if (same(game.state.baseq[ll], game.quadrant)) { game.state.baseq[ll]=game.state.baseq[game.state.rembase]; break; @@ -384,11 +399,11 @@ void torpedo(double course, double r, coord in, double *hit, int i, int n) prout(_(" destroyed.")); game.state.nplankl++; q->planet = NOPLANET; - DESTROY(&game.state.plnets[game.iplnet]); + game.state.planets[game.iplnet].pclass = destroyed; game.iplnet = 0; - game.plnet.x = game.plnet.y = 0; + invalidate(game.plnet); game.quad[w.x][w.y] = IHDOT; - if (game.landed==1) { + if (game.landed) { /* captain perishes on planet */ finish(FDPLANET); } @@ -398,16 +413,16 @@ void torpedo(double course, double r, coord in, double *hit, int i, int n) prout(_(" destroyed.")); game.state.nworldkl++; q->planet = NOPLANET; - DESTROY(&game.state.plnets[game.iplnet]); + game.state.planets[game.iplnet].pclass = destroyed; game.iplnet = 0; - game.plnet.x = game.plnet.y = 0; + invalidate(game.plnet); game.quad[w.x][w.y] = IHDOT; - if (game.landed==1) { + if (game.landed) { /* captain perishes on planet */ finish(FDPLANET); } - prout("You have just destroyed an inhabited planet."); - prout("Celebratory rallies are being held on the Klingon homeworld."); + prout(_("You have just destroyed an inhabited planet.")); + prout(_("Celebratory rallies are being held on the Klingon homeworld.")); return; case IHSTAR: /* Hit a star */ if (Rand() > 0.10) { @@ -486,9 +501,9 @@ void torpedo(double course, double r, coord in, double *hit, int i, int n) game.quad[w.x][w.y]=IHDOT; game.quad[jw.x][jw.y]=iquad; prout(_(" displaced by blast to %s "), cramlc(sector, jw)); - for_local_enemies(ll) + for (ll = 1; ll <= game.nenhere; ll++) game.kdist[ll] = game.kavgd[ll] = distance(game.sector,game.ks[ll]); - sortkl(); + sortklings(); return; } skip(1); @@ -503,7 +518,8 @@ static void fry(double hit) int ktr=1, loop1, loop2, j, cdam[NDEVICES]; /* a critical hit occured */ - if (hit < (275.0-25.0*game.skill)*(1.0+0.5*Rand())) return; + if (hit < (275.0-25.0*game.skill)*(1.0+0.5*Rand())) + return; ncrit = 1.0 + hit/(500.0+100.0*Rand()); proutn(_("***CRITICAL HIT--")); @@ -513,15 +529,17 @@ static void fry(double hit) j = randdevice(); /* Cheat to prevent shuttle damage unless on ship */ } while - (game.damage[j]<0.0 || (j==DSHUTTL && game.iscraft!=1)); + (game.damage[j]<0.0 || (j==DSHUTTL && game.iscraft != onship)); cdam[loop1] = j; extradm = (hit*game.damfac)/(ncrit*(75.0+25.0*Rand())); game.damage[j] += extradm; if (loop1 > 0) { - for (loop2=2; loop2<=loop1 && j != cdam[loop2-1]; loop2++) ; - if (loop2<=loop1) continue; + for (loop2 = 0; loop2 < loop1 && j != cdam[loop2]; loop2++) ; + if (loop2 < loop1) + continue; ktr += 1; - if (ktr==3) skip(1); + if (ktr==3) + skip(1); proutn(_(" and ")); } proutn(device[j]); @@ -538,51 +556,77 @@ void attack(bool torps_ok) { /* torps_ok == false forces use of phasers in an attack */ int percent, loop, iquad; - bool itflag, atackd = false, attempt = false, ihurt = false; + bool usephasers, atackd = false, attempt = false, ihurt = false; double hit, pfac, dustfac, hitmax=0.0, hittot=0.0, chgfac=1.0, r; coord jay; enum loctype where = neither; - game.iattak = 1; - if (game.alldone) return; - if (idebug) prout("=== ATTACK!"); + /* game could be over at this point, check */ + if (game.alldone) + return; - if (game.ithere) movetho(); + if (idebug) + prout("=== ATTACK!"); + /* Tholian gewts to move before attacking */ + if (game.ithere) + movetholian(); + + /* if you have just entered the RNZ, you'll get a warning */ if (game.neutz) { /* The one chance not to be attacked */ game.neutz = false; return; } - if ((((game.comhere || game.ishere) && !game.justin) || game.skill == SKILL_EMERITUS) && torps_ok) movcom(); - if (game.nenhere==0 || (game.nenhere==1 && iqhere && !iqengry)) return; + + /* commanders get a chance to tac-move towards you */ + if ((((game.comhere || game.ishere) && !game.justin) || game.skill == SKILL_EMERITUS) && torps_ok) + moveklings(); + + /* if no enemies remain after movement, we're done */ + if (game.nenhere==0 || (game.nenhere==1 && iqhere && !iqengry)) + return; + + /* set up partial hits if attack happens during shield status change */ pfac = 1.0/game.inshld; - if (game.shldchg == 1) chgfac = 0.25+0.5*Rand(); + if (game.shldchg) + chgfac = 0.25+0.5*Rand(); + skip(1); - if (game.skill <= SKILL_FAIR) where = sector; - for_local_enemies(loop) { - if (game.kpower[loop] < 0) continue; /* too weak to attack */ - /* compute hit strength and diminsh shield power */ + + /* message verbosity control */ + if (game.skill <= SKILL_FAIR) + where = sector; + + for (loop = 1; loop <= game.nenhere; loop++) { + if (game.kpower[loop] < 0) + continue; /* too weak to attack */ + /* compute hit strength and diminish shield power */ r = Rand(); /* Increase chance of photon torpedos if docked or enemy energy low */ - if (game.condition == docked) r *= 0.25; - if (game.kpower[loop] < 500) 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]; - if (iquad==IHT || (iquad==IHQUEST && !iqengry)) continue; - itflag = (iquad == IHK && r > 0.0005) || !torps_ok || + if (iquad==IHT || (iquad==IHQUEST && !iqengry)) + continue; + /* different enemies have different probabilities of throwing a torp */ + usephasers = !torps_ok || \ + (iquad == IHK && r > 0.0005) || (iquad==IHC && r > 0.015) || (iquad==IHR && r > 0.3) || (iquad==IHS && r > 0.07) || (iquad==IHQUEST && r > 0.05); - if (itflag) { - /* Enemy uses phasers */ - if (game.condition == docked) continue; /* Don't waste the effort! */ + if (usephasers) { /* Enemy uses phasers */ + 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]); game.kpower[loop] *= 0.75; } - else { /* Enemy used photon torpedo */ + else { /* Enemy uses photon torpedo */ double course = 1.90985*atan2((double)game.sector.y-jay.y, (double)jay.x-game.sector.x); hit = 0; proutn(_("***TORPEDO INCOMING")); @@ -599,43 +643,46 @@ void attack(bool torps_ok) finish(FWON); /* Klingons did themselves in! */ if (game.state.galaxy[game.quadrant.x][game.quadrant.y].supernova || game.alldone) return; /* Supernova or finished */ - if (hit == 0) continue; + if (hit == 0) + continue; } - if (game.shldup || game.shldchg != 0 || game.condition==docked) { + /* incoming phaser or torpedo, shields may dissipate it */ + if (game.shldup || game.shldchg || game.condition==docked) { /* shields will take hits */ double absorb, hitsh, propor = pfac*game.shield*(game.condition==docked ? 2.1 : 1.0); - if(propor < 0.1) propor = 0.1; + if (propor < 0.1) + propor = 0.1; hitsh = propor*chgfac*hit+1.0; - atackd = true; absorb = 0.8*hitsh; - if (absorb > game.shield) absorb = game.shield; + if (absorb > game.shield) + absorb = game.shield; game.shield -= absorb; hit -= hitsh; - if (game.condition==docked) dock(false); - if (propor > 0.1 && hit < 0.005*game.energy) continue; + /* taking a hit blasts us out of a starbase dock */ + if (game.condition == docked) + dock(false); + /* but the shields may take care of it */ + if (propor > 0.1 && hit < 0.005*game.energy) + continue; } - /* It's a hit -- print out hit size */ - atackd = true; /* We weren't going to check casualties, etc. if - shields were down for some strange reason. This - doesn't make any sense, so I've fixed it */ + /* hit from this opponent got through shields, so take damage */ ihurt = true; proutn(_("%d unit hit"), (int)hit); - if ((damaged(DSRSENS) && itflag) || game.skill<=SKILL_FAIR) { + if ((damaged(DSRSENS) && usephasers) || game.skill<=SKILL_FAIR) { proutn(_(" on the ")); crmshp(); } - if (!damaged(DSRSENS) && itflag) { + if (!damaged(DSRSENS) && usephasers) { proutn(_(" from ")); crmena(false, iquad, where, jay); } skip(1); /* Decide if hit is critical */ - if (hit > hitmax) hitmax = hit; + if (hit > hitmax) + hitmax = hit; hittot += hit; fry(hit); game.energy -= hit; - if (game.condition==docked) - dock(false); } if (game.energy <= 0) { /* Returning home upon your shield, not with it... */ @@ -644,7 +691,8 @@ void attack(bool torps_ok) } if (!attempt && game.condition == docked) prout(_("***Enemies decide against attacking your ship.")); - if (!atackd) return; + if (!atackd) + return; percent = 100.0*pfac*game.shield+0.5; if (!ihurt) { /* Shields fully protect ship */ @@ -654,9 +702,12 @@ void attack(bool torps_ok) /* Print message if starship suffered hit(s) */ skip(1); proutn(_("Energy left %2d shields "), (int)game.energy); - if (game.shldup) proutn(_("up ")); - else if (!damaged(DSHIELD)) proutn(_("down ")); - else proutn(_("damaged, ")); + if (game.shldup) + proutn(_("up ")); + else if (!damaged(DSHIELD)) + proutn(_("down ")); + else + proutn(_("damaged, ")); } prout(_("%d%%, torpedoes left %d"), percent, game.torps); /* Check if anyone was hurt */ @@ -671,9 +722,9 @@ void attack(bool torps_ok) } } /* After attack, reset average distance to enemies */ - for_local_enemies(loop) + for (loop = 1; loop <= game.nenhere; loop++) game.kavgd[loop] = game.kdist[loop]; - sortkl(); + sortklings(); return; } @@ -683,9 +734,8 @@ void deadkl(coord w, feature type, coord mv) /* Added mv to allow enemy to "move" before dying */ int i,j; - skip(1); crmena(true, type, sector, mv); - /* Decide what kind of enemy it is and update approriately */ + /* Decide what kind of enemy it is and update appropriately */ if (type == IHR) { /* chalk up a Romulan */ game.state.galaxy[game.quadrant.x][game.quadrant.y].romulans--; @@ -699,7 +749,7 @@ void deadkl(coord w, feature type, coord mv) else if (type == IHQUEST) { /* Killed a Thingy */ iqhere = iqengry = false; - thing.x =thing.y = 0; + invalidate(thing); } else { /* Some type of a Klingon */ @@ -708,8 +758,9 @@ void deadkl(coord w, feature type, coord mv) switch (type) { case IHC: game.comhere = false; - for_commanders (i) - if (game.state.kcmdr[i].x==game.quadrant.x && game.state.kcmdr[i].y==game.quadrant.y) break; + for (i = 1; i <= game.state.remcom; i++) + if (same(game.state.kcmdr[i], game.quadrant)) + break; game.state.kcmdr[i] = game.state.kcmdr[game.state.remcom]; game.state.kcmdr[game.state.remcom].x = 0; game.state.kcmdr[game.state.remcom].y = 0; @@ -724,7 +775,8 @@ void deadkl(coord w, feature type, coord mv) case IHS: game.state.nscrem--; game.ishere = false; - game.state.kscmdr.x = game.state.kscmdr.y = game.isatb = game.iscate = 0; + game.state.kscmdr.x = game.state.kscmdr.y = game.isatb = 0; + game.iscate = false; unschedule(FSCMOVE); unschedule(FSCDBAS); break; @@ -737,15 +789,17 @@ void deadkl(coord w, feature type, coord mv) /* For each kind of enemy, finish message to player */ prout(_(" destroyed.")); game.quad[w.x][w.y] = IHDOT; - if (KLINGREM==0) return; + if (KLINGREM==0) + return; game.state.remtime = game.state.remres/(game.state.remkl + 4*game.state.remcom); /* 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) + if (is_scheduled(FCDBAS) && same(game.battle, game.quadrant) && type==IHC) unschedule(FCDBAS); - for_local_enemies(i) - if (same(game.ks[i], w)) break; + for (i = 1; i <= game.nenhere; i++) + if (same(game.ks[i], w)) + break; game.nenhere--; if (i <= game.nenhere) { for (j=i; j<=game.nenhere; j++) { @@ -790,7 +844,6 @@ void photon(void) double targ[4][3], course[4]; double r, dummy; int key, n, i; - bool osuabor; game.ididit = false; @@ -827,7 +880,8 @@ void photon(void) key = IHEOL; return; } - if (n <= game.torps) break; + if (n <= game.torps) + break; chew(); key = IHEOL; } @@ -858,7 +912,8 @@ void photon(void) return; } targ[i][2] = aaitem; - if (targetcheck(targ[i][1], targ[i][2], &course[i])) return; + if (targetcheck(targ[i][1], targ[i][2], &course[i])) + return; } chew(); if (i == 1 && key == IHEOL) { @@ -878,14 +933,15 @@ void photon(void) } targ[i][2] = aaitem; chew(); - if (targetcheck(targ[i][1], targ[i][2], &course[i])) return; + if (targetcheck(targ[i][1], targ[i][2], &course[i])) + return; } } game.ididit = true; /* Loop for moving torpedoes */ - osuabor = false; - for (i = 1; i <= n && !osuabor; i++) { - if (game.condition != docked) game.torps--; + for (i = 1; i <= n; i++) { + if (game.condition != docked) + game.torps--; r = (Rand()+Rand())*0.5 -0.5; if (fabs(r) >= 0.47) { /* misfire! */ @@ -893,16 +949,16 @@ void photon(void) if (n>1) { prouts(_("***TORPEDO NUMBER %d MISFIRES"), i); } - else prouts(_("***TORPEDO MISFIRES.")); + else + prouts(_("***TORPEDO MISFIRES.")); skip(1); if (i < n) prout(_(" Remainder of burst aborted.")); - osuabor = true; if (Rand() <= 0.2) { prout(_("***Photon tubes damaged by misfire.")); game.damage[DPHOTON] = game.damfac*(1.0+2.0*Rand()); - break; } + break; } if (game.shldup || game.condition == docked) r *= 1.0 + 0.0001*game.shield; @@ -910,7 +966,8 @@ void photon(void) if (game.alldone || game.state.galaxy[game.quadrant.x][game.quadrant.y].supernova) return; } - if (KLINGREM==0) finish(FWON); + if (KLINGREM==0) + finish(FWON); } @@ -1076,20 +1133,22 @@ void phasers(void) } if (key != IHREAL && game.nenhere != 0) { prout(_("Phasers locked on target. Energy available: %.2f"), - ifast?game.energy-200.0:game.energy,1,2); + ifast?game.energy-200.0:game.energy); } irec=0; do { chew(); - if (!kz) for_local_enemies(i) - irec+=fabs(game.kpower[i])/(PHASEFAC*pow(0.90,game.kdist[i]))* - (1.01+0.05*Rand()) + 1.0; + if (!kz) + for (i = 1; i <= game.nenhere; i++) + irec += fabs(game.kpower[i])/(PHASEFAC*pow(0.90,game.kdist[i]))* + (1.01+0.05*Rand()) + 1.0; kz=1; - proutn(_("(%d) units required. "), irec); + proutn(_("%d units required. "), irec); chew(); proutn(_("Units to fire= ")); key = scan(); - if (key!=IHREAL) return; + if (key!=IHREAL) + return; rpow = aaitem; if (rpow > (ifast?game.energy-200:game.energy)) { proutn(_("Energy available= %.2f"), @@ -1108,7 +1167,8 @@ void phasers(void) } if (ifast) { game.energy -= 200; /* Go and do it! */ - if (checkshctrl(rpow)) return; + if (checkshctrl(rpow)) + return; } chew(); game.energy -= rpow; @@ -1116,25 +1176,30 @@ void phasers(void) if (game.nenhere) { extra = 0.0; powrem = rpow; - for_local_enemies(i) { + for (i = 1; i <= game.nenhere; i++) { hits[i] = 0.0; - if (powrem <= 0) continue; + if (powrem <= 0) + continue; hits[i] = fabs(game.kpower[i])/(PHASEFAC*pow(0.90,game.kdist[i])); over = (0.01 + 0.05*Rand())*hits[i]; temp = powrem; powrem -= hits[i] + over; - if (powrem <= 0 && temp < hits[i]) hits[i] = temp; - if (powrem <= 0) over = 0.0; + if (powrem <= 0 && temp < hits[i]) + hits[i] = temp; + if (powrem <= 0) + over = 0.0; extra += over; } - if (powrem > 0.0) extra += powrem; + if (powrem > 0.0) + extra += powrem; hittem(hits); game.ididit = true; } if (extra > 0 && !game.alldone) { if (game.ithere) { proutn(_("*** Tholian web absorbs ")); - if (game.nenhere>0) proutn(_("excess ")); + if (game.nenhere>0) + proutn(_("excess ")); prout(_("phaser energy.")); } else { @@ -1147,7 +1212,7 @@ void phasers(void) chew(); key = IHEOL; if (damaged(DCOMPTR)) - prout(_("Battle computer damaged, manual file only.")); + prout(_("Battle computer damaged, manual fire only.")); else { skip(1); prouts(_("---WORKING---")); @@ -1186,8 +1251,10 @@ void phasers(void) (1.01+0.05*Rand()) + 1.0; kz = k; proutn("("); - if (!damaged(DCOMPTR)) proutn("%d", irec); - else proutn("??"); + if (!damaged(DCOMPTR)) + proutn("%d", irec); + else + proutn("??"); proutn(") "); proutn(_("units to fire at ")); crmena(false, ienm, sector, aim); @@ -1195,7 +1262,7 @@ void phasers(void) key = scan(); } if (key == IHALPHA && isit("no")) { - no = 1; + no = true; key = scan(); continue; } @@ -1238,7 +1305,8 @@ void phasers(void) chew(); if (ifast) { game.energy -= 200.0; - if (checkshctrl(rpow)) return; + if (checkshctrl(rpow)) + return; } hittem(hits); game.ididit = true; @@ -1275,12 +1343,14 @@ void hittem(double *hits) skip(1); for (; k <= nenhr2; k++, kk++) { - if ((wham = hits[k])==0) continue; + if ((wham = hits[k])==0) + continue; dustfac = 0.9 + 0.01*Rand(); hit = wham*pow(dustfac,game.kdist[kk]); kpini = game.kpower[kk]; kp = fabs(kpini); - if (PHASEFAC*hit < kp) kp = PHASEFAC*hit; + if (PHASEFAC*hit < kp) + kp = PHASEFAC*hit; game.kpower[kk] -= (game.kpower[kk] < 0 ? -kp: kp); kpow = game.kpower[kk]; w = game.ks[kk]; @@ -1292,19 +1362,22 @@ void hittem(double *hits) else proutn(_("Very small hit on ")); ienm = game.quad[w.x][w.y]; - if (ienm==IHQUEST) iqengry = true; + if (ienm==IHQUEST) + iqengry = true; crmena(false,ienm,sector,w); skip(1); if (kpow == 0) { deadkl(w, ienm, w); - if (KLINGREM==0) finish(FWON); - if (game.alldone) return; + if (KLINGREM==0) + finish(FWON); + if (game.alldone) + return; kk--; /* don't do the increment */ } else /* decide whether or not to emasculate klingon */ if (kpow > 0 && Rand() >= 0.9 && kpow <= ((0.4 + 0.4*Rand())*kpini)) { - prout(_("***Mr. Spock- \"Captain, the vessel at "), + prout(_("***Mr. Spock- \"Captain, the vessel at %s"), cramlc(sector, w)); prout(_(" has just lost its firepower.\"")); game.kpower[kk] = -kpow;