Fix merge conflicts

[bsdgames-darwin.git] / trek / abandon.c

diff --git a/trek/abandon.c b/trek/abandon.c
index db79d0aadaa9f7030b0c02c652190d430661de1b..5209d371c26fe031faefe5ba279ee589b712a570 100644 (file)
--- a/trek/abandon.c
+++ b/trek/abandon.c
@@ -1,4 +1,4 @@
-/*     $NetBSD: abandon.c,v 1.6 2003/08/07 09:37:49 agc Exp $  */
+/*     $NetBSD: abandon.c,v 1.9 2009/05/24 21:44:56 dholland Exp $     */

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


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

-__RCSID("$NetBSD: abandon.c,v 1.6 2003/08/07 09:37:49 agc Exp $");
+__RCSID("$NetBSD: abandon.c,v 1.9 2009/05/24 21:44:56 dholland Exp $");

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


@@ -68,8 +68,7 @@ __RCSID("$NetBSD: abandon.c,v 1.6 2003/08/07 09:37:49 agc Exp $");
 
 /*ARGSUSED*/
 void
 
 /*ARGSUSED*/
 void

-abandon(v)
-       int v __attribute__((__unused__));
+abandon(int v __unused)

 {
        struct quad     *q;
        int             i;
 {
        struct quad     *q;
        int             i;


@@ -80,8 +79,7 @@ abandon(v)
                printf("You may not abandon ye Faire Queene\n");
                return;
        }
                printf("You may not abandon ye Faire Queene\n");
                return;
        }

-       if (Ship.cond != DOCKED)
-       {
+       if (Ship.cond != DOCKED) {

                if (damaged(SHUTTLE)) {
                        out(SHUTTLE);
                        return;
                if (damaged(SHUTTLE)) {
                        out(SHUTTLE);
                        return;


@@ -89,14 +87,11 @@ abandon(v)
                printf("Officers escape in shuttlecraft\n");
                /* decide on fate of crew */
                q = &Quad[Ship.quadx][Ship.quady];
                printf("Officers escape in shuttlecraft\n");
                /* decide on fate of crew */
                q = &Quad[Ship.quadx][Ship.quady];

-               if (q->qsystemname == 0 || damaged(XPORTER))
-               {
+               if (q->qsystemname == 0 || damaged(XPORTER)) {

                        printf("Entire crew of %d left to die in outer space\n",
                                Ship.crew);
                        Game.deaths += Ship.crew;
                        printf("Entire crew of %d left to die in outer space\n",
                                Ship.crew);
                        Game.deaths += Ship.crew;

-               }
-               else
-               {
+               } else {

                        printf("Crew beams down to planet %s\n", systemname(q));
                }
        }
                        printf("Crew beams down to planet %s\n", systemname(q));
                }
        }


@@ -118,8 +113,7 @@ abandon(v)
        Ship.warp3 = 125.0;
        Ship.cond = GREEN;
        /* clear out damages on old ship */
        Ship.warp3 = 125.0;
        Ship.cond = GREEN;
        /* clear out damages on old ship */

-       for (i = 0; i < MAXEVENTS; i++)
-       {
+       for (i = 0; i < MAXEVENTS; i++) {

                e = &Event[i];
                if (e->evcode != E_FIXDV)
                        continue;
                e = &Event[i];
                if (e->evcode != E_FIXDV)
                        continue;


@@ -129,10 +123,8 @@ abandon(v)
        i = Param.damprob[SHUTTLE] + Param.damprob[CLOAK];
        Param.damprob[SHUTTLE] = Param.damprob[CLOAK] = 0;
        while (i > 0)
        i = Param.damprob[SHUTTLE] + Param.damprob[CLOAK];
        Param.damprob[SHUTTLE] = Param.damprob[CLOAK] = 0;
        while (i > 0)

-               for (j = 0; j < NDEV; j++)
-               {
-                       if (Param.damprob[j] != 0)
-                       {
+               for (j = 0; j < NDEV; j++) {
+                       if (Param.damprob[j] != 0) {

                                Param.damprob[j] += 1;
                                i--;
                                if (i <= 0)
                                Param.damprob[j] += 1;
                                i--;
                                if (i <= 0)


@@ -144,20 +136,17 @@ abandon(v)
        Ship.quadx = Now.base[i].x;
        Ship.quady = Now.base[i].y;
        /* setup that quadrant */
        Ship.quadx = Now.base[i].x;
        Ship.quady = Now.base[i].y;
        /* setup that quadrant */

-       while (1)
-       {
+       while (1) {

                initquad(1);
                Sect[Ship.sectx][Ship.secty] = EMPTY;
                initquad(1);
                Sect[Ship.sectx][Ship.secty] = EMPTY;

-               for (i = 0; i < 5; i++)
-               {
+               for (i = 0; i < 5; i++) {

                        Ship.sectx = Etc.starbase.x + ranf(3) - 1;
                        if (Ship.sectx < 0 || Ship.sectx >= NSECTS)
                                continue;
                        Ship.secty = Etc.starbase.y + ranf(3) - 1;
                        if (Ship.secty < 0 || Ship.secty >= NSECTS)
                                continue;
                        Ship.sectx = Etc.starbase.x + ranf(3) - 1;
                        if (Ship.sectx < 0 || Ship.sectx >= NSECTS)
                                continue;
                        Ship.secty = Etc.starbase.y + ranf(3) - 1;
                        if (Ship.secty < 0 || Ship.secty >= NSECTS)
                                continue;

-                       if (Sect[Ship.sectx][Ship.secty] == EMPTY)
-                       {
+                       if (Sect[Ship.sectx][Ship.secty] == EMPTY) {

                                Sect[Ship.sectx][Ship.secty] = QUEENE;
                                dock(0);
                                compkldist(0);
                                Sect[Ship.sectx][Ship.secty] = QUEENE;
                                dock(0);
                                compkldist(0);