X-Git-Url: https://jxself.org/git/?p=super-star-trek.git;a=blobdiff_plain;f=moving.c;h=a5d11b3e25b7fba12bacd3d2726b8456365a220c;hp=2ba016a960af967b52f70f4f3e5d1978ddd3a66a;hb=1268b882a9dc50ce93658979aaf1147b1cfbe11a;hpb=e536fe754b3a9be00dcaee8f6ec50ea2d8c7a184 diff --git a/moving.c b/moving.c index 2ba016a..a5d11b3 100644 --- a/moving.c +++ b/moving.c @@ -43,12 +43,12 @@ void imove(void) for (l = 1; l <= n; l++) { ix = (x += deltax) + 0.5; iy = (y += deltay) + 0.5; - if (ix < 1 || ix > QUADSIZE || iy < 1 || iy > QUADSIZE) { + if (!VALID_SECTOR(ix, iy)) { /* Leaving quadrant -- allow final enemy attack */ /* Don't do it if being pushed by Nova */ if (nenhere != 0 && iattak != 2) { newcnd(); - for (l = 1; l <= nenhere; l++) { + for_local_enemies(l) { finald = sqrt((ix-game.kx[l])*(double)(ix-game.kx[l]) + (iy-game.ky[l])*(double)(iy-game.ky[l])); game.kavgd[l] = 0.5 * (finald+game.kdist[l]); @@ -97,9 +97,10 @@ void imove(void) finish(FNEG3); return; } - prout("\n\rYOU HAVE ATTEMPTED TO CROSS THE NEGATIVE ENERGY BARRIER\n\r" - "AT THE EDGE OF THE GALAXY. THE THIRD TIME YOU TRY THIS,\n\r" - "YOU WILL BE DESTROYED.\n\r"); + skip(1); + prout("YOU HAVE ATTEMPTED TO CROSS THE NEGATIVE ENERGY BARRIER"); + prout("AT THE EDGE OF THE GALAXY. THE THIRD TIME YOU TRY THIS,"); + prout("YOU WILL BE DESTROYED."); } /* Compute final position in new quadrant */ if (trbeam) return; /* Don't bother if we are to be beamed */ @@ -107,7 +108,8 @@ void imove(void) quady = (iy+(QUADSIZE-1))/QUADSIZE; sectx = ix - QUADSIZE*(quadx-1); secty = iy - QUADSIZE*(quady-1); - prout("\n\rEntering %s.", + skip(1); + prout("Entering %s.", cramlc(quadrant, quadx, quady)); game.quad[sectx][secty] = ship; newqad(0); @@ -151,7 +153,7 @@ void imove(void) if (game.damage[l]>0) n++; probf=pow(1.4,(energy+shield)/5000.0-1.0)*pow(1.3,1.0/(n+1)-1.0); - if (Rand()>probf) + if ((game.options & OPTION_BLKHOLE) && Rand()>probf) timwrp(); else finish(FHOLE); @@ -193,7 +195,7 @@ no_quad_change: /* No quadrant change -- compute new avg enemy distances */ game.quad[sectx][secty] = ship; if (nenhere) { - for (l = 1; l <= nenhere; l++) { + for_local_enemies(l) { finald = sqrt((ix-game.kx[l])*(double)(ix-game.kx[l]) + (iy-game.ky[l])*(double)(iy-game.ky[l])); game.kavgd[l] = 0.5 * (finald+game.kdist[l]); @@ -202,11 +204,12 @@ no_quad_change: sortkl(); if (!game.state.galaxy[quadx][quady].supernova && iattak == 0) attack(0); - for (l = 1 ; l <= nenhere; l++) game.kavgd[l] = game.kdist[l]; + for_local_enemies(l) game.kavgd[l] = game.kdist[l]; } newcnd(); iattak = 0; drawmaps(0); + setwnd(message_window); return; } @@ -233,8 +236,8 @@ void dock(int l) shield = inshld; torps = intorps; lsupres = inlsr; - if (stdamtim != 1e30 && - (game.future[FCDBAS] < 1e30 || isatb == 1) && iseenit == 0) { + if (game.damage[DRADIO] == 0.0 && + (game.future[FCDBAS] < FOREVER || isatb == 1) && iseenit == 0) { /* get attack report from base */ prout("Lt. Uhura- \"Captain, an important message from the starbase:\""); attakreport(0); @@ -372,11 +375,10 @@ static void getcd(int isprobe, int akey) { } itemp = 1; } - if (irowq<1 || irowq > GALSIZE || icolq<1 || icolq > GALSIZE || - irows<1 || irows > QUADSIZE || icols<1 || icols > QUADSIZE) { - huh(); - return; - } + if (!VALID_QUADRANT(icolq,irowq)||!VALID_SECTOR(icols,irows)) { + huh(); + return; + } skip(1); if (!isprobe) { if (itemp) { @@ -589,10 +591,9 @@ void warp(int i) for (l = 1; l <= n; l++) { x += deltax; ix = x + 0.5; - if (ix < 1 || ix > QUADSIZE) break; y += deltay; iy = y +0.5; - if (iy < 1 || iy > QUADSIZE) break; + if (!VALID_SECTOR(ix, iy)) break; if (game.quad[ix][iy] != IHDOT) { blooey = 0; twarp = 0; @@ -641,8 +642,8 @@ void setwrp(void) return; } if (game.damage[DWARPEN] > 0.0 && aaitem > 4.0) { - prout("Engineer Scott- \"I'm doing my best, Captain,\n" - " but right now we can only go warp 4.\""); + prout("Engineer Scott- \"I'm doing my best, Captain,"); + prout(" but right now we can only go warp 4.\""); return; } if (aaitem > 10.0) { @@ -762,7 +763,7 @@ void atover(int igrab) } while /* Repeat if another snova */ (game.state.galaxy[quadx][quady].supernova); - if (game.state.remkl==0) + if (KLINGREM==0) finish(FWON); /* Snova killed remaining enemy. */ } @@ -785,7 +786,7 @@ void timwrp() be sooner */ if (game.state.nscrem) game.future[FSCMOVE] = 0.2777; isatb = 0; - game.future[FCDBAS] = game.future[FSCDBAS] = 1e30; + game.future[FCDBAS] = game.future[FSCDBAS] = FOREVER; batx = baty = 0; /* Make sure Galileo is consistant -- Snapshot may have been taken @@ -844,7 +845,7 @@ void probe(void) prout("Engineer Scott- \"The probe launcher is damaged, Sir.\""); return; } - if (game.future[FDSPROB] != 1e30) { + if (game.future[FDSPROB] != FOREVER) { chew(); skip(1); if (game.damage[DRADIO] != 0 && condit != IHDOCKED) { @@ -930,8 +931,8 @@ void help(void) ddist = sqrt(square(basex-sectx)+square(basey-secty)); } else { - ddist = 1e30; - for (l = 1; l <= game.state.rembase; l++) { + ddist = FOREVER; + for_starbases(l) { xdist=10.0*sqrt(square(game.state.baseqx[l]-quadx)+square(game.state.baseqy[l]-quady)); if (xdist < ddist) { ddist = xdist; @@ -953,11 +954,10 @@ void help(void) for (l = 1; l <= 5; l++) { ix = basex+3.0*Rand()-1; iy = basey+3.0*Rand()-1; - if (ix>=1 && ix<=QUADSIZE && iy>=1 && iy<=QUADSIZE && game.quad[ix][iy]==IHDOT) { + if (VALID_SECTOR(ix,iy) && game.quad[ix][iy]==IHDOT) { /* found one -- finish up */ sectx=ix; secty=iy; - game.quad[ix][iy]=IHMATER0; break; } } @@ -976,22 +976,26 @@ void help(void) } proutn(" attempt to re-materialize "); crmshp(); - warble(); - if (Rand() > probf) break; switch (l){ - case 1: game.quad[ix][iy]=IHMATER1; + case 1: game.quad[ix][iy]=IHMATER0; break; - case 2: game.quad[ix][iy]=IHMATER2; + case 2: game.quad[ix][iy]=IHMATER1; break; - case 3: game.quad[ix][iy]=IHQUEST; + case 3: game.quad[ix][iy]=IHMATER2; break; } textcolor(RED); + warble(); + if (Rand() > probf) break; prout("fails."); delay(500); textcolor(DEFAULT); } if (l > 3) { + game.quad[ix][iy]=IHQUEST; + alive = 0; + drawmaps(1); + setwnd(message_window); finish(FMATERIALIZE); return; }