X-Git-Url: https://jxself.org/git/?p=super-star-trek.git;a=blobdiff_plain;f=battle.c;h=9b35e4f0ad838da1523e79f5a4852a83350eeeef;hp=df1314839df4fe18ce90622869bbe0974f857c86;hb=2ca70710fc39e85aac386ec041318369d148f5ce;hpb=89e52d61fcf689e15a8f831dea084a33ceaa8217 diff --git a/battle.c b/battle.c index df13148..9b35e4f 100644 --- a/battle.c +++ b/battle.c @@ -186,9 +186,9 @@ void torpedo(double course, double r, int inx, int iny, double *hit, int wait, i deltax /= bigger; deltay /= bigger; if (game.damage[DSRSENS]==0 || condit==IHDOCKED) - setwnd(SRSCAN_WINDOW); + setwnd(srscan_window); else - setwnd(LOWER_WINDOW); + setwnd(message_window); /* Loop to move a single torpedo */ for (l=1; l <= 15; l++) { x += deltax; @@ -202,7 +202,8 @@ void torpedo(double course, double r, int inx, int iny, double *hit, int wait, i wait = 1; if (iquad==IHDOT) continue; /* hit something */ - setwnd(LOWER_WINDOW); + setwnd(message_window); + prout(""); /* start new line after text track */ switch(iquad) { case IHE: /* Hit our ship */ case IHF: @@ -319,7 +320,7 @@ void torpedo(double course, double r, int inx, int iny, double *hit, int wait, i plnetx = plnety = 0; game.quad[ix][iy] = IHDOT; if (landed==1) { - /* captain parishes on planet */ + /* captain perishes on planet */ finish(FDPLANET); } return; @@ -397,8 +398,8 @@ void torpedo(double course, double r, int inx, int iny, double *hit, int wait, i } break; } - if(curwnd!=LOWER_WINDOW) { - setwnd(LOWER_WINDOW); + if(curwnd!=message_window) { + setwnd(message_window); } if (shoved) { game.quad[jx][jy]=iquad;