This patch fixes a -Wcast-qual warning in wump(6).

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

diff --git a/sail/pl_5.c b/sail/pl_5.c
index 089faf1117ebb3d6247986428a625351e34c445a..4fd747861a9c6933af691664cf4d441447357f70 100644 (file)
--- a/sail/pl_5.c
+++ b/sail/pl_5.c
@@ -1,4 +1,4 @@
-/*     $NetBSD: pl_5.c,v 1.5 1997/10/13 19:45:26 christos Exp $        */
+/*     $NetBSD: pl_5.c,v 1.7 1999/02/10 00:45:46 hubertf Exp $ */
 
 /*
  * Copyright (c) 1983, 1993
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)pl_5.c     8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: pl_5.c,v 1.5 1997/10/13 19:45:26 christos Exp $");
+__RCSID("$NetBSD: pl_5.c,v 1.7 1999/02/10 00:45:46 hubertf Exp $");
 #endif
 #endif /* not lint */
 
@@ -127,7 +127,7 @@ acceptmove()
                Msg("Movement error.");
                if (ta < 0 && moved) {
                        if (mf->FS == 1) {
-                               Write(W_FS, ms, 0, 0, 0, 0, 0);
+                               Write(W_FS, ms, 0, 0, 0, 0);
                                Msg("No hands to set full sails.");
                        }
                } else if (ma >= 0)
@@ -135,7 +135,7 @@ acceptmove()
        }
        if (af && !moved) {
                if (mf->FS == 1) {
-                       Write(W_FS, ms, 0, 0, 0, 0, 0);
+                       Write(W_FS, ms, 0, 0, 0, 0);
                        Msg("No hands to set full sails.");
                }
        }
@@ -143,7 +143,7 @@ acceptmove()
                (void) strcpy(movebuf, buf);
        else
                (void) strcpy(movebuf, "d");
-       Write(W_MOVE, ms, 1, (long)movebuf, 0, 0, 0);
+       Writestr(W_MOVE, ms, movebuf);
        Msg("Helm: %s.", movebuf);
 }
 
@@ -182,11 +182,11 @@ acceptboard()
                if (ms->nationality == capship(sp)->nationality)
                        continue;
                if (meleeing(ms, sp) && crew[2]) {
-                       c = sgetch("How many more to board the %s (%c%c)? ",
+                       c = sgetch("How many more to board the $$? ",
                                sp, 1);
                        parties(crew, sp, 0, c);
                } else if ((fouled2(ms, sp) || grappled2(ms, sp)) && crew[2]) {
-                       c = sgetch("Crew sections to board the %s (%c%c) (3 max) ?", sp, 1);
+                       c = sgetch("Crew sections to board the $$ (3 max) ?", sp, 1);
                        parties(crew, sp, 0, c);
                }
        }
@@ -228,7 +228,7 @@ char buf;
                        }
                        if (buf > '0')
                                Msg("Sending all crew sections.");
-                       Write(isdefense ? W_DBP : W_OBP, ms, 0,
+                       Write(isdefense ? W_DBP : W_OBP, ms,
                                j, turn, to->file->index, men);
                        if (isdefense) {
                                (void) wmove(slot_w, 2, 0);
@@ -238,8 +238,7 @@ char buf;
                                        else
                                                (void) wmove(slot_w, 2, 1 + k);
                                (void) mvwaddstr(slot_w, 3, 0, "DBP");
-                               makesignal(ms, "repelling boarders",
-                                       (struct ship *)0);
+                               makemsg(ms, "repelling boarders");
                        } else {
                                (void) wmove(slot_w, 0, 0);
                                for (k=0; k < NBP; k++)
@@ -248,7 +247,7 @@ char buf;
                                        else
                                                (void) wmove(slot_w, 0, 1 + k);
                                (void) mvwaddstr(slot_w, 1, 0, "OBP");
-                               makesignal(ms, "boarding the %s (%c%c)", to);
+                               makesignal(ms, "boarding the $$", to);
                        }
                        blockalarm();
                        (void) wrefresh(slot_w);