turn window bigger, and block alarm when refreshing

[unix-history] / usr / src / games / sail / assorted.c

diff --git a/usr/src/games/sail/assorted.c b/usr/src/games/sail/assorted.c
index 96ba801..7c1acd5 100644 (file)
--- a/usr/src/games/sail/assorted.c
+++ b/usr/src/games/sail/assorted.c
@@ -1,5 +1,5 @@
 #ifndef lint
 #ifndef lint

-static char *sccsid = "@(#)assorted.c  1.2 83/07/20";
+static char *sccsid = "@(#)assorted.c  2.2 83/11/01";

 #endif
 
 #include "externs.h"
 #endif
 
 #include "externs.h"


@@ -173,7 +173,8 @@ int rig, shot, hittable, roll;
                }
                makesignal(on, message, (struct ship *)0);
        }
                }
                makesignal(on, message, (struct ship *)0);
        }

-       if (Chit > 1 && on->file->readyL&R_INITIAL && on->file->readyR&R_INITIAL || Chit == 4) {
+       /*
+       if (Chit > 1 && on->file->readyL&R_INITIAL && on->file->readyR&R_INITIAL) {

                on->specs->qual--;
                if (on->specs->qual <= 0) {
                        makesignal(on, "crew mutinying!", (struct ship *)0);
                on->specs->qual--;
                if (on->specs->qual <= 0) {
                        makesignal(on, "crew mutinying!", (struct ship *)0);


@@ -183,6 +184,7 @@ int rig, shot, hittable, roll;
                        makesignal(on, "crew demoralized", (struct ship *)0);
                Write(W_QUAL, on, 0, on->specs->qual, 0, 0, 0);
        }
                        makesignal(on, "crew demoralized", (struct ship *)0);
                Write(W_QUAL, on, 0, on->specs->qual, 0, 0, 0);
        }

+       */

        if (!hull)
                strike(on, from);
 }
        if (!hull)
                strike(on, from);
 }


@@ -195,7 +197,7 @@ int which;
        register struct snag *s = to->file->fouls;
 
        Write(W_FOUL, from, 0, which, 0, 0, 0);
        register struct snag *s = to->file->fouls;
 
        Write(W_FOUL, from, 0, which, 0, 0, 0);

-       for (n = 0; n < NSHIP && (s->turnfoul || s->toship != from); n++, s++)
+       for (n = 0; n < NSHIP && (!s->turnfoul || s->toship != from); n++, s++)

                ;
        if (n < NSHIP)
                Write(W_FOUL, to, 0, n, 0, 0, 0);
                ;
        if (n < NSHIP)
                Write(W_FOUL, to, 0, n, 0, 0, 0);


@@ -221,10 +223,10 @@ int which;
        register struct snag *s = to->file->grapples;
 
        Write(W_GRAP, from, 0, which, 0, 0, 0);
        register struct snag *s = to->file->grapples;
 
        Write(W_GRAP, from, 0, which, 0, 0, 0);

-       for (n = 0; n < NSHIP && (s->turnfoul || s->toship != from); n++, s++)
+       for (n = 0; n < NSHIP && (!s->turnfoul || s->toship != from); n++, s++)

                ;
        if (n < NSHIP)
                ;
        if (n < NSHIP)

-               Write(W_FOUL, to, 0, n, 0, 0, 0);
+               Write(W_GRAP, to, 0, n, 0, 0, 0);

        if (!snagged2(from, to)) {
                if (!fouled(from) && !grappled(from)) {
                        unboard(from, from, 1);         /* defense */
        if (!snagged2(from, to)) {
                if (!fouled(from) && !grappled(from)) {
                        unboard(from, from, 1);         /* defense */