Fix the old leftover license note

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

diff --git a/sail/pl_3.c b/sail/pl_3.c
index 9f4f07b67fa6752b4ca458e3b667078757add19a..b638acc4158d597c732af91bfeb12085a8d6fc03 100644 (file)
--- a/sail/pl_3.c
+++ b/sail/pl_3.c
@@ -1,4 +1,4 @@
-/*     $NetBSD: pl_3.c,v 1.14 2001/01/04 04:41:41 jwise Exp $  */
+/*     $NetBSD: pl_3.c,v 1.20 2009/03/15 03:33:56 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,7 +34,7 @@
 #if 0
 static char sccsid[] = "@(#)pl_3.c     8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: pl_3.c,v 1.14 2001/01/04 04:41:41 jwise Exp $");
+__RCSID("$NetBSD: pl_3.c,v 1.20 2009/03/15 03:33:56 dholland Exp $");
 #endif
 #endif /* not lint */
 
@@ -47,10 +43,6 @@ __RCSID("$NetBSD: pl_3.c,v 1.14 2001/01/04 04:41:41 jwise Exp $");
 #include "extern.h"
 #include "player.h"
 
-void   acceptcombat(void);
-void   grapungrap(void);
-void   unfoulplayer(void);
-
 void
 acceptcombat(void)
 {
@@ -93,7 +85,8 @@ acceptcombat(void)
                        guns = mc->gunL;
                        car = mc->carL;
                }
-               if ((!guns && !car) || load == L_EMPTY || (ready & R_LOADED) == 0)
+               if ((!guns && !car) || load == L_EMPTY ||
+                   (ready & R_LOADED) == 0)
                        goto cant;
                if (mf->struck || !crew[2])
                        goto cant;
@@ -203,7 +196,7 @@ acceptcombat(void)
                                        hhits = 0;
                                }
                        }
-                       table(shootat, load, hit, closest, ms, roll);
+                       table(ms, closest, shootat, load, hit, roll);
                }
                Msg("Damage inflicted on the %s:", closest->shipname);
                Msg("\t%d HULL, %d GUNS, %d CREW, %d RIGGING",
@@ -219,9 +212,6 @@ acceptcombat(void)
        cant:
                Msg("Unable to fire %s broadside", r ? "right" : "left");
        }
-       blockalarm();
-       draw_stat();
-       unblockalarm();
 }
 
 void
@@ -240,8 +230,8 @@ grapungrap(void)
                case 'g':
                        if (dieroll() < 3
                            || ms->nationality == capship(sp)->nationality) {
-                               Write(W_GRAP, ms, sp->file->index, 0, 0, 0);
-                               Write(W_GRAP, sp, player, 0, 0, 0);
+                               send_grap(ms, sp->file->index);
+                               send_grap(sp, player);
                                Msg("Attempt succeeds!");
                                makesignal(ms, "grappled with $$", sp);
                        } else