X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;ds=sidebyside;f=battle.c;h=0f760d9bb73b74e324abdb1a17c3db4fdad65017;hb=0dd845a602e289a5b3e5cd60a8cc2a7c4cbbbd5f;hp=df1314839df4fe18ce90622869bbe0974f857c86;hpb=292e2af0061f1a0e6c466f5ea067ffaed19c48f1;p=super-star-trek.git diff --git a/battle.c b/battle.c index df13148..0f760d9 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,7 @@ 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); switch(iquad) { case IHE: /* Hit our ship */ case IHF: @@ -397,8 +397,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;