This completely merges the line-oriented and screen I/O managers,

[super-star-trek.git] / battle.c

diff --git a/battle.c b/battle.c
index bcfd70788b72210b4350eee8d58f4aa5d08faf6b..df1314839df4fe18ce90622869bbe0974f857c86 100644 (file)
--- a/battle.c
+++ b/battle.c
@@ -1,6 +1,4 @@
 #include <unistd.h>
-#include "conio.h"
-#include "sstlinux.h"
 #include "sst.h"
 
 void doshield(int i) {
@@ -176,7 +174,6 @@ void ram(int ibumpd, int ienm, int ix, int iy) {
 
 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;
-       int crx,cry;
        
        double ac=course + 0.25*r;
        double angle = (15.0-ac)*0.5235988;
@@ -188,10 +185,10 @@ void torpedo(double course, double r, int inx, int iny, double *hit, int wait, i
        if (fabs(deltay) > bigger) bigger = fabs(deltay);
        deltax /= bigger;
        deltay /= bigger;
-        crx=wherex();
-        cry=wherey();
-        if (game.damage[DSRSENS]==0 || condit==IHDOCKED) setwnd(LEFTUPPER_WINDOW);
-       else setwnd(LOWER_WINDOW);
+        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,7 +203,6 @@ void torpedo(double course, double r, int inx, int iny, double *hit, int wait, i
                if (iquad==IHDOT) continue;
                /* hit something */
                setwnd(LOWER_WINDOW);
-               gotoxy(crx,cry);
                switch(iquad) {
                        case IHE: /* Hit our ship */
                        case IHF:
@@ -403,7 +399,6 @@ void torpedo(double course, double r, int inx, int iny, double *hit, int wait, i
        }
         if(curwnd!=LOWER_WINDOW) {
            setwnd(LOWER_WINDOW);
-           gotoxy(crx,cry);
        }
        if (shoved) {
                game.quad[jx][jy]=iquad;