From c5c08c8b43daf955ad447af2b72ade2f8579b0d2 Mon Sep 17 00:00:00 2001
From: "Eric S. Raymond" <esr@thyrsus.com>
Date: Sat, 5 Feb 2005 18:41:54 +0000
Subject: [PATCH] Move cursor restoration into io.c.

---
 battle.c | 11 ++++-------
 io.c     |  4 ++++
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/battle.c b/battle.c
index 5389821..7904338 100644
--- a/battle.c
+++ b/battle.c
@@ -175,7 +175,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;
@@ -187,10 +186,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(LEFTUPPER_WINDOW);
+	else 
+	    setwnd(LOWER_WINDOW);
 	/* Loop to move a single torpedo */
 	for (l=1; l <= 15; l++) {
 		x += deltax;
@@ -205,7 +204,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:
@@ -402,7 +400,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;
diff --git a/io.c b/io.c
index 025aa16..d87d097 100644
--- a/io.c
+++ b/io.c
@@ -415,6 +415,9 @@ void tracktorpedo(int x, int y, int ix, int iy, int wait, int l, int i, int n, i
     proutn("%d - %d   ", (int)x, (int)y);
 #else
     if (game.damage[DSRSENS]==0 || condit==IHDOCKED) {
+	int crx, cry;
+	crx = wherex();
+	cry = wherey();
 	drawmaps(2);
 	delay((wait!=1)*400);
 	gotoxy(iy*2+3,ix+2);
@@ -437,6 +440,7 @@ void tracktorpedo(int x, int y, int ix, int iy, int wait, int l, int i, int n, i
 	    lowvideo();
 	    _setcursortype(_NORMALCURSOR);
 	}
+	gotoxy(crx, cry);
     } else {
 	proutn("%d - %d   ", (int)x, (int)y);
     }
-- 
2.31.1