X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=battle.c;h=1e6123fb3835257be1249ba2b82e647bfcfc6793;hb=10131f4148d32996badc7432cb5b9903dca873e0;hp=f6c485f5e1566a142c192a4044747a223c8278d8;hpb=475ba38226627871f8a932d7a06a3dbdfaac8ef0;p=super-star-trek.git

diff --git a/battle.c b/battle.c
index f6c485f..1e6123f 100644
--- a/battle.c
+++ b/battle.c
@@ -1,8 +1,6 @@
-#ifdef SERGEEV
-#include <conio.h>
 #include <unistd.h>
+#include "conio.h"
 #include "sstlinux.h"
-#endif /* SERGEEV */
 #include "sst.h"
 
 void doshield(int i) {
@@ -195,8 +193,8 @@ void torpedo(double course, double r, int inx, int iny, double *hit, int wait) {
 #ifdef SERGEEV
         crx=wherex();
         cry=wherey();
-        if (game.damage[DSRSENS]==0 || condit==IHDOCKED) setwnd(1);
-	else setwnd(4);
+        if (game.damage[DSRSENS]==0 || condit==IHDOCKED) setwnd(LEFTUPPER_WINDOW);
+	else setwnd(LOWER_WINDOW);
 #endif /* SERGEEV */
 	/* Loop to move a single torpedo */
 	for (l=1; l <= 15; l++) {
@@ -246,7 +244,7 @@ void torpedo(double course, double r, int inx, int iny, double *hit, int wait) {
 #ifndef SERGEEV
 		skip(1);
 #else
-		setwnd(4);
+		setwnd(LOWER_WINDOW);
 	        gotoxy(crx,cry);
 #endif
 		switch(iquad) {
@@ -449,8 +447,8 @@ void torpedo(double course, double r, int inx, int iny, double *hit, int wait) {
 		break;
 	}
 #ifdef SERGEEV
-        if(curwnd!=4) {
-	    setwnd(4);
+        if(curwnd!=LOWER_WINDOW) {
+	    setwnd(LOWER_WINDOW);
 	    gotoxy(crx,cry);
 	}
 #endif /* SERGEEV */
@@ -1253,7 +1251,7 @@ void hittem(double *hits) {
                         if (game.damage[DSRSENS]==0){
                            crx=wherex();
                            cry=wherey();
-                           setwnd(1);
+                           setwnd(LEFTUPPER_WINDOW);
                            drawmaps(2);
                            gotoxy(jj*2+3,ii+2);
                            highvideo();
@@ -1264,7 +1262,7 @@ void hittem(double *hits) {
                            nosound();
                            lowvideo();
                            proutn("%c", game.quad[ii][jj]);
-                           setwnd(4);
+                           setwnd(LOWER_WINDOW);
                            gotoxy(crx,cry);
                            _setcursortype(_NORMALCURSOR);
                            delay(500);