Fix merge conflicts

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

diff --git a/sail/dr_2.c b/sail/dr_2.c
index 9d166cfb6ff29f7d143a69f87cf63e62e5176092..40a24839d05359115eaa89b54963b3675f817ebd 100644 (file)
--- a/sail/dr_2.c
+++ b/sail/dr_2.c
@@ -1,4 +1,4 @@
-/*     $NetBSD: dr_2.c,v 1.19 2003/08/07 09:37:41 agc Exp $    */
+/*     $NetBSD: dr_2.c,v 1.27 2019/02/03 10:48:46 mrg Exp $    */

 
 /*
  * Copyright (c) 1983, 1993
 
 /*
  * Copyright (c) 1983, 1993


@@ -34,10 +34,11 @@
 #if 0
 static char sccsid[] = "@(#)dr_2.c     8.1 (Berkeley) 5/31/93";
 #else
 #if 0
 static char sccsid[] = "@(#)dr_2.c     8.1 (Berkeley) 5/31/93";
 #else

-__RCSID("$NetBSD: dr_2.c,v 1.19 2003/08/07 09:37:41 agc Exp $");
+__RCSID("$NetBSD: dr_2.c,v 1.27 2019/02/03 10:48:46 mrg Exp $");

 #endif
 #endif /* not lint */
 
 #endif
 #endif /* not lint */
 

+#include <stdbool.h>

 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>


@@ -46,11 +47,15 @@ __RCSID("$NetBSD: dr_2.c,v 1.19 2003/08/07 09:37:41 agc Exp $");
 
 #define couldwin(f,t) (f->specs->crew2 > t->specs->crew2 * 1.5)
 
 
 #define couldwin(f,t) (f->specs->crew2 > t->specs->crew2 * 1.5)
 

-static int     str_end(const char *);
-static int     score(struct ship *, struct ship *, char *, int);
-static void    move_ship(struct ship *, const char *, unsigned char *, short *, short *, char *);
-static void    try(struct ship *, struct ship *, char *, char *, int, int, int, int, int, int *, int);
-static void    rmend(char *);
+static int str_end(const char *);
+static int score(struct ship *, struct ship *, char *, size_t, int);
+static void move_ship(struct ship *, const char *, unsigned char *,
+                     short *, short *, int *);
+static void try(struct ship *f, struct ship *t,
+               char *command, size_t commandmax, char *temp, size_t tempmax,
+               int ma, int ta, bool af, int vma, int dir, int *high,
+               int rakeme);
+static void rmend(char *);

 
 const int dtab[] = {0,1,1,2,3,4,4,5};  /* diagonal distances in x==y */
 
 
 const int dtab[] = {0,1,1,2,3,4,4,5};  /* diagonal distances in x==y */
 


@@ -58,7 +63,7 @@ void
 thinkofgrapples(void)
 {
        struct ship *sp, *sq;
 thinkofgrapples(void)
 {
        struct ship *sp, *sq;

-       char friendly;
+       bool friendly;

 
        foreachship(sp) {
                if (sp->file->captain[0] || sp->file->dir == 0)
 
        foreachship(sp) {
                if (sp->file->captain[0] || sp->file->dir == 0)


@@ -70,12 +75,12 @@ thinkofgrapples(void)
                                        continue;
                                if (range(sp, sq) != 1)
                                        continue;
                                        continue;
                                if (range(sp, sq) != 1)
                                        continue;

-                               if (grappled2(sp, sq))
+                               if (grappled2(sp, sq)) {

                                        if (is_toughmelee(sp, sq, 0, 0))
                                                ungrap(sp, sq);
                                        else
                                                grap(sp, sq);
                                        if (is_toughmelee(sp, sq, 0, 0))
                                                ungrap(sp, sq);
                                        else
                                                grap(sp, sq);

-                               else if (couldwin(sp, sq)) {
+                               } else if (couldwin(sp, sq)) {

                                        grap(sp, sq);
                                        sp->file->loadwith = L_GRAPE;
                                }
                                        grap(sp, sq);
                                        sp->file->loadwith = L_GRAPE;
                                }


@@ -100,19 +105,26 @@ checkup(void)
                        continue;
                if (dieroll() < 5)
                        continue;
                        continue;
                if (dieroll() < 5)
                        continue;

-               Write(sink == 1 ? W_SINK : W_EXPLODE, sp, 2, 0, 0, 0);
-               Write(W_DIR, sp, 0, 0, 0, 0);
+               if (sink == 1) {
+                       send_sink(sp, 2);
+               } else {
+                       send_explode(sp, 2);
+               }
+               send_dir(sp, 0);

                if (snagged(sp))
                        foreachship(sq)
                                cleansnag(sp, sq, 1);
                if (sink != 1) {
                        makemsg(sp, "exploding!");
                        foreachship(sq) {
                if (snagged(sp))
                        foreachship(sq)
                                cleansnag(sp, sq, 1);
                if (sink != 1) {
                        makemsg(sp, "exploding!");
                        foreachship(sq) {

-                               if (sp != sq && sq->file->dir && range(sp, sq) < 4)
-                                       table(sp, sq, RIGGING, L_EXPLODE, sp->specs->guns/13, 6);
+                               if (sp != sq && sq->file->dir &&
+                                   range(sp, sq) < 4)
+                                       table(sp, sq, RIGGING, L_EXPLODE,
+                                             sp->specs->guns/13, 6);

                        }
                        }

-               } else
+               } else {

                        makemsg(sp, "sinking!");
                        makemsg(sp, "sinking!");

+               }

        }
 }
 
        }
 }
 


@@ -126,10 +138,13 @@ prizecheck(void)
                        continue;
                if (sp->file->struck || sp->file->dir == 0)
                        continue;
                        continue;
                if (sp->file->struck || sp->file->dir == 0)
                        continue;

-               if (sp->specs->crew1 + sp->specs->crew2 + sp->specs->crew3 > sp->file->pcrew * 6) {
-                       Writestr(W_SIGNAL, sp, "prize crew overthrown");
-                       Write(W_POINTS, sp->file->captured, sp->file->captured->file->points - 2 * sp->specs->pts, 0, 0, 0);
-                       Write(W_CAPTURED, sp, -1, 0, 0, 0);
+               if (sp->specs->crew1 + sp->specs->crew2 + sp->specs->crew3 >
+                   sp->file->pcrew * 6) {
+                       send_signal(sp, "prize crew overthrown");
+                       send_points(sp->file->captured,
+                             sp->file->captured->file->points
+                               - 2 * sp->specs->pts);
+                       send_captured(sp, -1);

                }
        }
 }
                }
        }
 }


@@ -145,20 +160,23 @@ str_end(const char *str)
 }
 
 void
 }
 
 void

-closeon(struct ship *from, struct ship *to, char *command, int ta, int ma, int af)
+closeon(struct ship *from, struct ship *to, char *command, size_t commandmax,
+       int ta, int ma, bool af)

 {
        int high;
        char temp[10];
 
        temp[0] = command[0] = '\0';
        high = -30000;
 {
        int high;
        char temp[10];
 
        temp[0] = command[0] = '\0';
        high = -30000;

-       try(from, to, command, temp, ma, ta, af, ma, from->file->dir, &high, 0);
+       try(from, to, command, commandmax, temp, sizeof(temp),
+           ma, ta, af, ma, from->file->dir, &high, 0);

 }
 
 static int
 }
 
 static int

-score(struct ship *ship, struct ship *to, char *movement, int onlytemp)
+score(struct ship *ship, struct ship *to, char *movement, size_t movementmax,
+      int onlytemp)

 {
 {

-       char drift;
+       int drift;

        int row, col, dir, total, ran;
        struct File *fp = ship->file;
 
        int row, col, dir, total, ran;
        struct File *fp = ship->file;
 


@@ -169,7 +187,7 @@ score(struct ship *ship, struct ship *to, char *movement, int onlytemp)
        drift = fp->drift;
        move_ship(ship, movement, &fp->dir, &fp->row, &fp->col, &drift);
        if (!*movement)
        drift = fp->drift;
        move_ship(ship, movement, &fp->dir, &fp->row, &fp->col, &drift);
        if (!*movement)

-               strcpy(movement, "d");
+               strlcpy(movement, "d", movementmax);

 
        ran = range(ship, to);
        total = -50 * ran;
 
        ran = range(ship, to);
        total = -50 * ran;


@@ -187,7 +205,8 @@ score(struct ship *ship, struct ship *to, char *movement, int onlytemp)
 }
 
 static void
 }
 
 static void

-move_ship(struct ship *ship, const char *p, unsigned char *dir, short *row, short *col, char *drift)
+move_ship(struct ship *ship, const char *p, unsigned char *dir,
+         short *row, short *col, int *drift)

 {
        int dist;
        char moved = 0;
 {
        int dist;
        char moved = 0;


@@ -227,43 +246,57 @@ move_ship(struct ship *ship, const char *p, unsigned char *dir, short *row, shor
 }
 
 static void
 }
 
 static void

-try(struct ship *f, struct ship *t, char *command, char *temp, int ma, int ta, int af, int vma, int dir, int *high, int rakeme)
+try(struct ship *f, struct ship *t,
+    char *command, size_t commandmax,
+    char *temp, size_t tempmax,
+    int ma, int ta, bool af, int vma, int dir, int *high, int rakeme)

 {
        int new, n;
 {
        int new, n;

-       char st[4];
+       char st[11];

 #define rakeyou (gunsbear(f, t) && !gunsbear(t, f))
 
        if ((n = str_end(temp)) < '1' || n > '9')
                for (n = 1; vma - n >= 0; n++) {
 #define rakeyou (gunsbear(f, t) && !gunsbear(t, f))
 
        if ((n = str_end(temp)) < '1' || n > '9')
                for (n = 1; vma - n >= 0; n++) {

-                       sprintf(st, "%d", n);
-                       strcat(temp, st);
-                       new = score(f, t, temp, rakeme);
+                       snprintf(st, sizeof(st), "%d", n);
+                       strlcat(temp, st, tempmax);
+                       new = score(f, t, temp, tempmax, rakeme);

                        if (new > *high && (!rakeme || rakeyou)) {
                                *high = new;
                        if (new > *high && (!rakeme || rakeyou)) {
                                *high = new;

-                               strcpy(command, temp);
+                               strlcpy(command, temp, commandmax);

                        }
                        }

-                       try(f, t, command, temp, ma-n, ta, af, vma-n,
-                               dir, high, rakeme);
+                       try(f, t, command, commandmax, temp, tempmax,
+                           ma-n, ta, af, vma-n,
+                           dir, high, rakeme);

                        rmend(temp);
                }
                        rmend(temp);
                }

-       if ((ma > 0 && ta > 0 && (n = str_end(temp)) != 'l' && n != 'r') || !strlen(temp)) {
-               strcat(temp, "r");
-               new = score(f, t, temp, rakeme);
-               if (new > *high && (!rakeme || (gunsbear(f, t) && !gunsbear(t, f)))) {
+       if ((ma > 0 && ta > 0 && (n = str_end(temp)) != 'l' && n != 'r') ||
+           !strlen(temp)) {
+               strlcat(temp, "r", tempmax);
+               new = score(f, t, temp, tempmax, rakeme);
+               if (new > *high && (!rakeme ||
+                                   (gunsbear(f, t) && !gunsbear(t, f)))) {

                        *high = new;
                        *high = new;

-                       strcpy(command, temp);
+                       strlcpy(command, temp, commandmax);

                }
                }

-               try(f, t, command, temp, ma-1, ta-1, af, min(ma-1, maxmove(f, (dir == 8 ? 1 : dir+1), 0)), (dir == 8 ? 1 : dir+1), high, rakeme);
+               try(f, t, command, commandmax, temp, tempmax,
+                   ma-1, ta-1, af,
+                   min(ma-1, maxmove(f, (dir == 8 ? 1 : dir+1), 0)),
+                   (dir == 8 ? 1 : dir+1), high, rakeme);

                rmend(temp);
        }
                rmend(temp);
        }

-       if ((ma > 0 && ta > 0 && (n = str_end(temp)) != 'l' && n != 'r') || !strlen(temp)){
-               strcat(temp, "l");
-               new = score(f, t, temp, rakeme);
-               if (new > *high && (!rakeme || (gunsbear(f, t) && !gunsbear(t, f)))){
+       if ((ma > 0 && ta > 0 && (n = str_end(temp)) != 'l' && n != 'r') ||
+           !strlen(temp)) {
+               strlcat(temp, "l", tempmax);
+               new = score(f, t, temp, tempmax, rakeme);
+               if (new > *high && (!rakeme ||
+                                   (gunsbear(f, t) && !gunsbear(t, f)))) {

                        *high = new;
                        *high = new;

-                       strcpy(command, temp);
+                       strlcpy(command, temp, commandmax);

                }
                }

-               try(f, t, command, temp, ma-1, ta-1, af, (min(ma-1,maxmove(f, (dir-1 ? dir-1 : 8), 0))), (dir-1 ? dir -1 : 8), high, rakeme);
+               try(f, t, command, commandmax, temp, tempmax,
+                   ma-1, ta-1, af,
+                   (min(ma-1,maxmove(f, (dir-1 ? dir-1 : 8), 0))),
+                   (dir-1 ? dir -1 : 8), high, rakeme);

                rmend(temp);
        }
 }
                rmend(temp);
        }
 }