Create some abstraction for sending messages.

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

diff --git a/sail/pl_4.c b/sail/pl_4.c
index 163594d7ed003f291d38195c2f35f28af6e73e2b..710be027a0b3a121b1e7ab3350c2473c8f9db4e1 100644 (file)
--- a/sail/pl_4.c
+++ b/sail/pl_4.c
@@ -1,4 +1,4 @@
-/*     $NetBSD: pl_4.c,v 1.7 1999/02/10 00:45:46 hubertf Exp $ */
+/*     $NetBSD: pl_4.c,v 1.16 2009/03/14 22:52:52 dholland Exp $       */
 
 /*
  * Copyright (c) 1983, 1993
@@ -12,11 +12,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *     This product includes software developed by the University of
- *     California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -38,14 +34,17 @@
 #if 0
 static char sccsid[] = "@(#)pl_4.c     8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: pl_4.c,v 1.7 1999/02/10 00:45:46 hubertf Exp $");
+__RCSID("$NetBSD: pl_4.c,v 1.16 2009/03/14 22:52:52 dholland Exp $");
 #endif
 #endif /* not lint */
 
+#include <sys/types.h>
+#include <ctype.h>
+#include "extern.h"
 #include "player.h"
 
 void
-changesail()
+changesail(void)
 {
        int rig, full;
 
@@ -58,12 +57,12 @@ changesail()
                        if (sgetch("Increase to Full sails? ",
                                (struct ship *)0, 1) == 'y') {
                                changed = 1;
-                               Write(W_FS, ms, 1, 0, 0, 0);
+                               send_fs(ms, 1);
                        }
                } else {
                        if (sgetch("Reduce to Battle sails? ",
                                (struct ship *)0, 1) == 'y') {
-                               Write(W_FS, ms, 0, 0, 0, 0);
+                               send_fs(ms, 0);
                                changed = 1;
                        }
                }
@@ -72,7 +71,7 @@ changesail()
 }
 
 void
-acceptsignal()
+acceptsignal(void)
 {
        char buf[60];
        char *p = buf;
@@ -83,11 +82,11 @@ acceptsignal()
                ;
        p[-1] = '"';
        *p = 0;
-       Writestr(W_SIGNAL, ms, buf);
+       send_signal(ms, buf);
 }
 
 void
-lookout()
+lookout(void)
 {
        struct ship *sp;
        char buf[3];
@@ -96,7 +95,7 @@ lookout()
        sgetstr("What ship? ", buf, sizeof buf);
        foreachship(sp) {
                c = *countryname[sp->nationality];
-               if ((c == *buf || tolower(c) == *buf || colours(sp) == *buf)
+               if ((tolower((unsigned char)c) == *buf || colours(sp) == *buf)
                    && (sp->file->stern == buf[1] || sterncolour(sp) == buf[1]
                        || buf[1] == '?')) {
                        eyeball(sp);
@@ -104,10 +103,8 @@ lookout()
        }
 }
 
-char *
-saywhat(sp, flag)
-struct ship *sp;
-char flag;
+const char *
+saywhat(struct ship *sp, int flag)
 {
        if (sp->file->captain[0])
                return sp->file->captain;
@@ -122,8 +119,7 @@ char flag;
 }
 
 void
-eyeball(ship)
-struct ship *ship;
+eyeball(struct ship *ship)
 {
        int i;