X-Git-Url: https://jxself.org/git/?p=super-star-trek.git;a=blobdiff_plain;f=battle.c;h=df1314839df4fe18ce90622869bbe0974f857c86;hp=6e35e122d7621469e3ffcfe1bdb8921550c6069d;hb=89e52d61fcf689e15a8f831dea084a33ceaa8217;hpb=fb225a29a207cea8436c2deeced27f366492b227

diff --git a/battle.c b/battle.c
index 6e35e12..df13148 100644
--- a/battle.c
+++ b/battle.c
@@ -1,8 +1,4 @@
-#ifdef SERGEEV
-#include <conio.h>
 #include <unistd.h>
-#include "sstlinux.h"
-#endif /* SERGEEV */
 #include "sst.h"
 
 void doshield(int i) {
@@ -176,12 +172,9 @@ void ram(int ibumpd, int ienm, int ix, int iy) {
 	return;
 }
 
-void torpedo(double course, double r, int inx, int iny, double *hit, int wait) {
+void torpedo(double course, double r, int inx, int iny, double *hit, int wait, int i, int n) {
         int l, iquad=0, ix=0, iy=0, jx=0, jy=0, shoved=0, ll;
-#ifdef SERGEEV
-	int crx,cry;
 	
-#endif /* SERGEEV */
 	double ac=course + 0.25*r;
 	double angle = (15.0-ac)*0.5235988;
 	double bullseye = (15.0 - course)*0.5235988;
@@ -192,12 +185,10 @@ void torpedo(double course, double r, int inx, int iny, double *hit, int wait) {
 	if (fabs(deltay) > bigger) bigger = fabs(deltay);
 	deltax /= bigger;
 	deltay /= bigger;
-#ifdef SERGEEV
-        crx=wherex();
-        cry=wherey();
-        if (game.damage[DSRSENS]==0 || condit==IHDOCKED) setwnd(LEFTUPPER_WINDOW);
-	else setwnd(LOWER_WINDOW);
-#endif /* SERGEEV */
+        if (game.damage[DSRSENS]==0 || condit==IHDOCKED) 
+	    setwnd(SRSCAN_WINDOW);
+	else 
+	    setwnd(LOWER_WINDOW);
 	/* Loop to move a single torpedo */
 	for (l=1; l <= 15; l++) {
 		x += deltax;
@@ -206,49 +197,12 @@ void torpedo(double course, double r, int inx, int iny, double *hit, int wait) {
 		y += deltay;
 		iy = y + 0.5;
 		if (iy < 1 || iy > 10) break;
-#ifndef SERGEEV
-		if (l==4 || l==9) skip(1);
-		proutn("%d - %d   ", (int)x, (int)y);
 		iquad=game.quad[ix][iy];
-#else
-                iquad=game.quad[ix][iy];
-                if (game.damage[DSRSENS]==0 || condit==IHDOCKED){
-                   drawmaps(2);
-                   delay((wait!=1)*400);
-                   wait=1;
-                   gotoxy(iy*2+3,ix+2);
-                   if ((game.quad[ix][iy]==IHDOT)||(game.quad[ix][iy]==IHBLANK)){
-                      game.quad[ix][iy]='+';
-                      drawmaps(2);
-                      game.quad[ix][iy]=iquad;
-                      sound(l*10);
-                      delay(100);
-                      nosound();
-                   }
-                   else {
-                        game.quad[ix][iy]|=128;
-                        drawmaps(2);
-                        game.quad[ix][iy]=iquad;
-                        _setcursortype(_NOCURSOR);
-                        sound(500);
-                        delay(1000);
-                        nosound();
-                        lowvideo();
-                        _setcursortype(_NORMALCURSOR);
-                   }
-                }
-                else {
-		  proutn("%d - %d   ", (int)x, (int)y);
-		}
-#endif /* SERGEEV */
+		tracktorpedo(x, y, ix, iy, wait, l, i, n, iquad);
+		wait = 1;
 		if (iquad==IHDOT) continue;
 		/* hit something */
-#ifndef SERGEEV
-		skip(1);
-#else
 		setwnd(LOWER_WINDOW);
-	        gotoxy(crx,cry);
-#endif
 		switch(iquad) {
 			case IHE: /* Hit our ship */
 			case IHF:
@@ -412,15 +366,10 @@ void torpedo(double course, double r, int inx, int iny, double *hit, int wait) {
 					 fabs(sin(bullseye-angle));
 				h1 = fabs(h1);
 				if (h1 >= 600) {
-#ifndef SERGEEV
-					prout(" destroyed.");
-#endif /* SERGEEV */
 					game.quad[ix][iy] = IHDOT;
 					ithere = 0;
 					ithx = ithy = 0;
-#ifdef SERGEEV
                                         deadkl(ix, iy, iquad, ix, iy);
-#endif /* SERGEEV */
 					return;
 				}
 				skip(1);
@@ -448,12 +397,9 @@ void torpedo(double course, double r, int inx, int iny, double *hit, int wait) {
 		}
 		break;
 	}
-#ifdef SERGEEV
         if(curwnd!=LOWER_WINDOW) {
 	    setwnd(LOWER_WINDOW);
-	    gotoxy(crx,cry);
 	}
-#endif /* SERGEEV */
 	if (shoved) {
 		game.quad[jx][jy]=iquad;
 		game.quad[ix][iy]=IHDOT;
@@ -463,9 +409,7 @@ void torpedo(double course, double r, int inx, int iny, double *hit, int wait) {
 		sortkl();
 		return;
 	}
-#ifndef SERGEEV
 	skip(1);
-#endif /* SERGEEV */
 	prout("Torpedo missed.");
 	return;
 }
@@ -566,7 +510,7 @@ void attack(int k) {
 			prout("  ");
 			r = (Rand()+Rand())*0.5 -0.5;
 			r += 0.002*game.kpower[l]*r;
-			torpedo(course, r, jx, jy, &hit, 0);
+			torpedo(course, r, jx, jy, &hit, 0, 1, 1);
 			if (game.state.remkl==0) finish(FWON); /* Klingons did themselves in! */
 			if (game.state.galaxy[quadx][quady] == 1000 ||
 				alldone) return; /* Supernova or finished */
@@ -869,17 +813,7 @@ void photon(void) {
 			}
 		}
 		if (shldup || condit == IHDOCKED) r *= 1.0 + 0.0001*shield;
-#ifndef SERGEEV
-		if (n != 1) {
-			skip(1);
-			proutn("Track for torpedo number %d-  ", i);
-		}
-		else {
-			skip(1);
-			proutn("Torpedo track- ");
-		}
-#endif /* SERGEEV */
-		torpedo(course[i], r, sectx, secty, &dummy, i);
+		torpedo(course[i], r, sectx, secty, &dummy, 0, i, n);
 		if (alldone || game.state.galaxy[quadx][quady]==1000) return;
 	}
 	if (game.state.remkl==0) finish(FWON);
@@ -1230,9 +1164,6 @@ void phasers(void) {
 
 void hittem(double *hits) {
 	double kp, kpow, wham, hit, dustfac, kpini;
-#ifdef SERGEEV
-	int crx, cry;
-#endif /* SERGEEV */
 	int nenhr2=nenhere, k=1, kk=1, ii, jj, ienm;
 
 	skip(1);
@@ -1249,27 +1180,8 @@ void hittem(double *hits) {
 		ii = game.kx[kk];
 		jj = game.ky[kk];
 		if (hit > 0.005) {
-#ifdef SERGEEV
-                        if (game.damage[DSRSENS]==0){
-                           crx=wherex();
-                           cry=wherey();
-                           setwnd(LEFTUPPER_WINDOW);
-                           drawmaps(2);
-                           gotoxy(jj*2+3,ii+2);
-                           highvideo();
-                           proutn("%c", game.quad[ii][jj]);
-                           gotoxy(wherex()-1,wherey());
-                           sound(500);
-                           delay(1000);
-                           nosound();
-                           lowvideo();
-                           proutn("%c", game.quad[ii][jj]);
-                           setwnd(LOWER_WINDOW);
-                           gotoxy(crx,cry);
-                           _setcursortype(_NORMALCURSOR);
-                           delay(500);
-                        }
-#endif /* SERGEEV */
+                        if (game.damage[DSRSENS]==0)
+			    boom(ii, jj);
 			proutn("%d unit hit on ", (int)hit);
 		}
 		else