X-Git-Url: https://jxself.org/git/?p=super-star-trek.git;a=blobdiff_plain;f=src%2Fbattle.c;h=59d2d9340b23791e033804244024156fb0fff526;hp=20b35ef3b296894d12a919be851b7c8e1e0192bf;hb=c94108fede4723af905386473f6435467e96e630;hpb=6332f1c7917206e23f408ebb505c483416b84e5b diff --git a/src/battle.c b/src/battle.c index 20b35ef..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,17 +144,18 @@ 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); 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.")); @@ -166,19 +168,19 @@ 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); 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 +188,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; @@ -196,7 +198,7 @@ void torpedo(double course, double r, int inx, int iny, double *hit, int i, int 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); @@ -221,12 +223,11 @@ 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. */ - 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)); @@ -243,8 +244,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 +261,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 +288,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 +297,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 +365,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 +387,12 @@ 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); @@ -407,7 +404,6 @@ void torpedo(double course, double r, int inx, int iny, double *hit, int i, int prout(_(" disappears.")); game.quad[w.x][w.y] = IHWEB; game.ithere = false; - game.tholian.x = game.tholian.y = 0; game.nenhere--; dropin(IHBLANK); return; @@ -492,7 +488,7 @@ void attack(bool torps_ok) if (game.ithere) movetho(); if (game.neutz) { /* The one chance not to be attacked */ - game.neutz = 0; + game.neutz = false; return; } if ((((game.comhere || game.ishere) && !game.justin) || game.skill == SKILL_EMERITUS) && torps_ok) movcom(); @@ -506,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]; @@ -518,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]); @@ -536,16 +532,16 @@ 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) 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; @@ -553,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 */ @@ -576,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) { @@ -584,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; @@ -619,14 +615,12 @@ void attack(bool torps_ok) return; } -void deadkl(coord w, int type, int ixx, int iyy) +void deadkl(coord w, feature 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 */ @@ -651,7 +645,7 @@ void deadkl(coord w, int type, int ixx, int iyy) game.klhere--; switch (type) { case IHC: - game.comhere = 0; + game.comhere = false; for_commanders (i) if (game.state.kcmdr[i].x==game.quadrant.x && game.state.kcmdr[i].y==game.quadrant.y) break; game.state.kcmdr[i] = game.state.kcmdr[game.state.remcom]; @@ -672,6 +666,9 @@ void deadkl(coord w, int type, int ixx, int iyy) unschedule(FSCMOVE); unschedule(FSCDBAS); break; + default: /* avoids a gcc warning */ + prout("*** Internal error, deadkl() called on %c\n", type); + break; } } @@ -682,7 +679,7 @@ void deadkl(coord w, int type, int ixx, int iyy) 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) @@ -826,7 +823,7 @@ void photon(void) /* Loop for moving 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! */ @@ -845,9 +842,9 @@ 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.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; } @@ -925,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; @@ -1236,7 +1233,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 */