X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=battle.c;h=f6c485f5e1566a142c192a4044747a223c8278d8;hb=5fd1629b862b1a1bba3f70d4d06ba0b0859ec0e6;hp=845aa832937bcd98f2fd2c2052ce6aacceba8fed;hpb=ba71f219a8543b5510a53c59ce793339b84903a7;p=super-star-trek.git

diff --git a/battle.c b/battle.c
index 845aa83..f6c485f 100644
--- a/battle.c
+++ b/battle.c
@@ -260,9 +260,7 @@ void torpedo(double course, double r, int inx, int iny, double *hit, int wait) {
 					   1000.0*sqrt(square(ix-inx)+square(iy-iny))*
 					   fabs(sin(bullseye-angle));
 				*hit = fabs(*hit);
-#ifndef SERGEEV
-				newcnd(); /* undock */
-#endif /* SERGEEV */
+				newcnd(); /* we're blown out of dock */
 				/* We may be displaced. */
 				if (landed==1 || condit==IHDOCKED) return; /* Cheat if on a planet */
 				ang = angle + 2.5*(Rand()-0.5);
@@ -654,9 +652,7 @@ void deadkl(int ix, int iy, int type, int ixx, int iyy) {
 
 	int i,j;
 
-#ifdef SERGEEV	
         skip(1);
-#endif /* SERGEEV */
 	crmena(1, type, 2, ixx, iyy);
 	/* Decide what kind of enemy it is and update approriately */
 	if (type == IHR) {
@@ -1235,7 +1231,7 @@ void phasers(void) {
 void hittem(double *hits) {
 	double kp, kpow, wham, hit, dustfac, kpini;
 #ifdef SERGEEV
-	int cx, cy;
+	int crx, cry;
 #endif /* SERGEEV */
 	int nenhr2=nenhere, k=1, kk=1, ii, jj, ienm;