factor: usage(): mark __dead

[bsdgames-darwin.git] / sail / pl_5.c

diff --git a/sail/pl_5.c b/sail/pl_5.c
index c8d9229e19b7b28c82e92ab8c6fd6f3a7cb9dddb..240ac0b9d90df16b786287762048e7a8749104c3 100644 (file)
--- a/sail/pl_5.c
+++ b/sail/pl_5.c
@@ -1,4 +1,4 @@
-/*     $NetBSD: pl_5.c,v 1.16 2003/08/07 09:37:44 agc Exp $    */
+/*     $NetBSD: pl_5.c,v 1.26 2019/02/03 03:19:25 mrg Exp $    */
 
 /*
  * Copyright (c) 1983, 1993
@@ -34,12 +34,11 @@
 #if 0
 static char sccsid[] = "@(#)pl_5.c     8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: pl_5.c,v 1.16 2003/08/07 09:37:44 agc Exp $");
+__RCSID("$NetBSD: pl_5.c,v 1.26 2019/02/03 03:19:25 mrg Exp $");
 #endif
 #endif /* not lint */
 
 #include <ctype.h>
-#include <curses.h>
 #include <signal.h>
 #include <stdio.h>
 #include <string.h>
@@ -49,17 +48,17 @@ __RCSID("$NetBSD: pl_5.c,v 1.16 2003/08/07 09:37:44 agc Exp $");
 
 #define turnfirst(x) (*x == 'r' || *x == 'l')
 
-static void    parties(struct ship *, int *, int, int);
+static void parties(struct ship *, int *, int, int);
 
 void
 acceptmove(void)
 {
        int ta;
        int ma;
-       char af;
-       int moved = 0;
+       bool af;
+       bool moved = false;
        int vma, dir;
-       char prompt[60];
+       char promptstr[60];
        char buf[60], last = '\0';
        char *p;
 
@@ -70,14 +69,16 @@ acceptmove(void)
 
        ta = maxturns(ms, &af);
        ma = maxmove(ms, mf->dir, 0);
-       sprintf(prompt, "move (%d,%c%d): ", ma, af ? '\'' : ' ', ta);
-       sgetstr(prompt, buf, sizeof buf);
+       snprintf(promptstr, sizeof(promptstr),
+               "move (%d,%c%d): ", ma, af ? '\'' : ' ', ta);
+       sgetstr(promptstr, buf, sizeof buf);
        dir = mf->dir;
        vma = ma;
        for (p = buf; *p; p++)
                switch (*p) {
                case 'l':
                        dir -= 2;
+                       /* FALLTHROUGH */
                case 'r':
                        if (++dir == 0)
                                dir = 8;
@@ -115,14 +116,14 @@ acceptmove(void)
                                *p-- = '\0';
                        }
                        last = '0';
-                       moved = 1;
+                       moved = true;
                        ma -= *p - '0';
                        vma -= *p - '0';
                        if ((ta < 0 && moved) || (vma < 0 && moved))
                                *p-- = '\0';
                        break;
                default:
-                       if (!isspace(*p)) {
+                       if (!isspace((unsigned char)*p)) {
                                Msg("Input error.");
                                *p-- = '\0';
                        }
@@ -132,7 +133,7 @@ acceptmove(void)
                Msg("Movement error.");
                if (ta < 0 && moved) {
                        if (mf->FS == 1) {
-                               Write(W_FS, ms, 0, 0, 0, 0);
+                               send_fs(ms, 0);
                                Msg("No hands to set full sails.");
                        }
                } else if (ma >= 0)
@@ -140,15 +141,15 @@ acceptmove(void)
        }
        if (af && !moved) {
                if (mf->FS == 1) {
-                       Write(W_FS, ms, 0, 0, 0, 0);
+                       send_fs(ms, 0);
                        Msg("No hands to set full sails.");
                }
        }
        if (*buf)
-               strcpy(movebuf, buf);
+               strlcpy(movebuf, buf, sizeof(movebuf));
        else
-               strcpy(movebuf, "d");
-       Writestr(W_MOVE, ms, movebuf);
+               strlcpy(movebuf, "d", sizeof(movebuf));
+       send_move(ms, movebuf);
        Msg("Helm: %s.", movebuf);
 }
 
@@ -191,7 +192,8 @@ acceptboard(void)
                                sp, 1);
                        parties(sp, crew, 0, c);
                } else if ((fouled2(ms, sp) || grappled2(ms, sp)) && crew[2]) {
-                       c = sgetch("Crew sections to board the $$ (3 max) ?", sp, 1);
+                       c = sgetch("Crew sections to board the $$ (3 max) ?",
+                                  sp, 1);
                        parties(sp, crew, 0, c);
                }
        }
@@ -200,25 +202,22 @@ acceptboard(void)
                        (struct ship *)0, 1);
                parties(ms, crew, 1, c);
        }
-       blockalarm();
-       draw_slot();
-       unblockalarm();
 }
 
 static void
 parties(struct ship *to, int *crew, int isdefense, int buf)
 {
-       int k, j, men; 
+       int k, j, men;
        struct BP *ptr;
        int temp[3];
 
        for (k = 0; k < 3; k++)
                temp[k] = crew[k];
        if (isdigit(buf)) {
-               ptr = isdefense ? to->file->DBP : to->file->OBP; 
+               ptr = isdefense ? to->file->DBP : to->file->OBP;
                for (j = 0; j < NBP && ptr[j].turnsent; j++)
                        ;
-               if (!ptr[j].turnsent && buf > '0') {
+               if (j < NBP && !ptr[j].turnsent && buf > '0') {
                        men = 0;
                        for (k = 0; k < 3 && buf > '0'; k++) {
                                men += crew[k]
@@ -229,30 +228,22 @@ parties(struct ship *to, int *crew, int isdefense, int buf)
                        }
                        if (buf > '0')
                                Msg("Sending all crew sections.");
-                       Write(isdefense ? W_DBP : W_OBP, ms,
-                               j, turn, to->file->index, men);
                        if (isdefense) {
-                               wmove(slot_w, 2, 0);
+                               send_dbp(ms, j, turn, to->file->index, men);
+                       } else {
+                               send_obp(ms, j, turn, to->file->index, men);
+                       }
+                       if (isdefense) {
                                for (k=0; k < NBP; k++)
-                                       if (temp[k] && !crew[k])
-                                               waddch(slot_w, k + '1');
-                                       else
-                                               wmove(slot_w, 2, 1 + k);
-                               mvwaddstr(slot_w, 3, 0, "DBP");
+                                       display_set_dbp(k,
+                                                        temp[k] && !crew[k]);
                                makemsg(ms, "repelling boarders");
                        } else {
-                               wmove(slot_w, 0, 0);
                                for (k=0; k < NBP; k++)
-                                       if (temp[k] && !crew[k])
-                                               waddch(slot_w, k + '1');
-                                       else
-                                               wmove(slot_w, 0, 1 + k);
-                               mvwaddstr(slot_w, 1, 0, "OBP");
+                                       display_set_obp(k,
+                                                        temp[k] && !crew[k]);
                                makesignal(ms, "boarding the $$", to);
                        }
-                       blockalarm();
-                       wrefresh(slot_w);
-                       unblockalarm();
                } else
                        Msg("Sending no crew sections.");
        }