I was bored, so... simplify(?) this code a bit.

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

diff --git a/sail/pl_5.c b/sail/pl_5.c
index 369fae93957199b298af69fe660b7af022e90c46..44c37c22da6f889dabc12b7b4a03ff259741a84c 100644 (file)
--- a/sail/pl_5.c
+++ b/sail/pl_5.c
@@ -1,4 +1,4 @@
-/*     $NetBSD: pl_5.c,v 1.10 2001/01/04 03:21:17 jwise Exp $  */
+/*     $NetBSD: pl_5.c,v 1.15 2001/02/05 01:10:11 christos Exp $       */
 
 /*
  * Copyright (c) 1983, 1993
@@ -38,18 +38,22 @@
 #if 0
 static char sccsid[] = "@(#)pl_5.c     8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: pl_5.c,v 1.10 2001/01/04 03:21:17 jwise Exp $");
+__RCSID("$NetBSD: pl_5.c,v 1.15 2001/02/05 01:10:11 christos Exp $");
 #endif
 #endif /* not lint */
 
+#include <ctype.h>
+#include <curses.h>
+#include <signal.h>
 #include <stdio.h>
+#include <string.h>
+#include "extern.h"
 #include "player.h"
+#include "display.h"
 
 #define turnfirst(x) (*x == 'r' || *x == 'l')
 
-void   acceptmove(void);
-void   acceptboard(void);
-static void    parties(int *, struct ship *, int, int);
+static void    parties(struct ship *, int *, int, int);
 
 void
 acceptmove(void)
@@ -189,16 +193,16 @@ acceptboard(void)
                if (meleeing(ms, sp) && crew[2]) {
                        c = sgetch("How many more to board the $$? ",
                                sp, 1);
-                       parties(crew, sp, 0, c);
+                       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);
-                       parties(crew, sp, 0, c);
+                       parties(sp, crew, 0, c);
                }
        }
        if (crew[2]) {
                c = sgetch("How many sections to repel boarders? ",
                        (struct ship *)0, 1);
-               parties(crew, ms, 1, c);
+               parties(ms, crew, 1, c);
        }
        blockalarm();
        draw_slot();
@@ -206,7 +210,7 @@ acceptboard(void)
 }
 
 static void
-parties(int *crew, struct ship *to, int isdefense, int buf)
+parties(struct ship *to, int *crew, int isdefense, int buf)
 {
        int k, j, men; 
        struct BP *ptr;