}
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);
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."));
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;
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;
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);
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));
/* can't move into object */
return;
}
- game.sector.x = jw.x;
- game.sector.y = jw.y;
+ game.sector = jw;
crmshp();
shoved = true;
break;
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);
}
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) {
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 */
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
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);
prout(_(" disappears."));
game.quad[w.x][w.y] = IHWEB;
game.ithere = false;
- game.tholian.x = game.tholian.y = 0;
game.nenhere--;
dropin(IHBLANK);
return;
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();
/* 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];
(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]);
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;
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 */
hittot += hit;
fry(hit);
game.energy -= hit;
- if (game.condit==IHDOCKED)
+ if (game.condition==docked)
dock(false);
}
if (game.energy <= 0) {
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;
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 */
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];
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)
/* 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! */
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;
}
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;
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 */
projects / super-star-trek.git / blobdiff