Fix merge conflicts

[bsdgames-darwin.git] / phantasia / fight.c

diff --git a/phantasia/fight.c b/phantasia/fight.c
index 0ce0c73942e7cbd6a61969a8cc9700f82f54d26c..5d0508e800131db1c567889b7e702f174cd6059c 100644 (file)
--- a/phantasia/fight.c
+++ b/phantasia/fight.c
@@ -1,27 +1,44 @@
-/*     $NetBSD: fight.c,v 1.7 2000/04/27 00:30:53 jdc Exp $    */
+/*     $NetBSD: fight.c,v 1.15 2021/05/02 12:50:46 rillig Exp $        */

 
 /*
  * fight.c   Phantasia monster fighting routines
  */
 
 
 /*
  * fight.c   Phantasia monster fighting routines
  */
 

-#include "include.h"
+#include <math.h>
+#include <setjmp.h>
+#include <stdio.h>
+#include <string.h>
+
+#include "macros.h"
+#include "phantdefs.h"
+#include "phantstruct.h"
+#include "phantglobs.h"
+
+#undef bool
+#include <curses.h>
+
+static void awardtreasure(void);
+static void callmonster(int);
+static void cancelmonster(void);
+static void cursedtreasure(void);
+static void hitmonster(double);
+static void monsthits(void);
+static int pickmonster(void);
+static void playerhits(void);
+static void scramblestats(void);
+static void throwspell(void);

 
 void
 
 void

-encounter(particular)
-       int     particular;
+encounter(int particular)

 {
 {

-       bool    firsthit = Player.p_blessing;   /* set if player gets the
-                                                * first hit */
-       int     flockcnt = 1;   /* how many time flocked */
+       volatile bool    firsthit = Player.p_blessing;  /* set if player gets
+                                                        * the first hit */
+       volatile int     flockcnt = 1;  /* how many time flocked */

 
        /* let others know what we are doing */
        Player.p_status = S_MONSTER;
        writerecord(&Player, Fileloc);
 
 
        /* let others know what we are doing */
        Player.p_status = S_MONSTER;
        writerecord(&Player, Fileloc);
 

-#if __GNUC__
-       (void)&firsthit;        /* XXX shut up gcc */
-#endif
-

 #ifdef SYS5
        flushinp();
 #endif
 #ifdef SYS5
        flushinp();
 #endif


@@ -155,8 +172,8 @@ encounter(particular)
        clrtobot();
 }
 
        clrtobot();
 }
 

-int
-pickmonster()
+static int
+pickmonster(void)

 {
        if (Player.p_specialtype == SC_VALAR)
                /* even chance of any monster */
 {
        if (Player.p_specialtype == SC_VALAR)
                /* even chance of any monster */


@@ -195,8 +212,8 @@ pickmonster()
                                                return ((int) ROLL(14.0, 25.0));
 }
 
                                                return ((int) ROLL(14.0, 25.0));
 }
 

-void
-playerhits()
+static void
+playerhits(void)

 {
        double  inflict;        /* damage inflicted */
        int     ch;             /* input */
 {
        double  inflict;        /* damage inflicted */
        int     ch;             /* input */


@@ -338,8 +355,8 @@ playerhits()
 
 }
 
 
 }
 

-void
-monsthits()
+static void
+monsthits(void)

 {
        double  inflict;        /* damage inflicted */
        int     ch;             /* input */
 {
        double  inflict;        /* damage inflicted */
        int     ch;             /* input */


@@ -588,8 +605,8 @@ SPECIALHIT:
        }
 }
 
        }
 }
 

-void
-cancelmonster()
+static void
+cancelmonster(void)

 {
        Curmonster.m_energy = 0.0;
        Curmonster.m_experience = 0.0;
 {
        Curmonster.m_energy = 0.0;
        Curmonster.m_experience = 0.0;


@@ -597,9 +614,8 @@ cancelmonster()
        Curmonster.m_flock = 0.0;
 }
 
        Curmonster.m_flock = 0.0;
 }
 

-void
-hitmonster(inflict)
-       double  inflict;
+static void
+hitmonster(double inflict)

 {
        mvprintw(Lines++, 0, "You hit %s %.0f times!", Enemyname, inflict);
        Curmonster.m_energy -= inflict;
 {
        mvprintw(Lines++, 0, "You hit %s %.0f times!", Enemyname, inflict);
        Curmonster.m_energy -= inflict;


@@ -625,8 +641,8 @@ hitmonster(inflict)
        }
 }
 
        }
 }
 

-void
-throwspell()
+static void
+throwspell(void)

 {
        double  inflict;        /* damage inflicted */
        double  dtemp;          /* for dtemporary calculations */
 {
        double  inflict;        /* damage inflicted */
        double  dtemp;          /* for dtemporary calculations */


@@ -835,9 +851,8 @@ throwspell()
                }
 }
 
                }
 }
 

-void
-callmonster(which)
-       int     which;
+static void
+callmonster(int which)

 {
        struct monster Othermonster;    /* to find a name for mimics */
 
 {
        struct monster Othermonster;    /* to find a name for mimics */
 


@@ -913,8 +928,8 @@ callmonster(which)
        Curmonster.m_melee = Curmonster.m_skirmish = 0.0;
 }
 
        Curmonster.m_melee = Curmonster.m_skirmish = 0.0;
 }
 

-void
-awardtreasure()
+static void
+awardtreasure(void)

 {
        int     whichtreasure;  /* calculated treasure to grant */
        int     temp;           /* temporary */
 {
        int     whichtreasure;  /* calculated treasure to grant */
        int     temp;           /* temporary */


@@ -1257,7 +1272,7 @@ awardtreasure()
                                                                                 * l
                                                                                 * a
                                                                                 * r
                                                                                 * l
                                                                                 * a
                                                                                 * r

-                                                                                * 
+                                                                                *

                                                                                 * ri
                                                                                 * n
                                                                                 * g
                                                                                 * ri
                                                                                 * n
                                                                                 * g


@@ -1275,7 +1290,7 @@ awardtreasure()
                                                                                /* b
                                                                                 * a
                                                                                 * d
                                                                                /* b
                                                                                 * a
                                                                                 * d

-                                                                                * 
+                                                                                *

                                                                                 * ri
                                                                                 * n
                                                                                 * g
                                                                                 * ri
                                                                                 * n
                                                                                 * g


@@ -1301,6 +1316,7 @@ awardtreasure()
                                        /* fall through to treasure type 9 if
                                         * no treasure from above */
 
                                        /* fall through to treasure type 9 if
                                         * no treasure from above */
 

+                                       /* FALLTHROUGH */

                                case 9: /* treasure type 9 */
                                        switch (whichtreasure) {
                                        case 1:
                                case 9: /* treasure type 9 */
                                        switch (whichtreasure) {
                                        case 1:


@@ -1311,8 +1327,8 @@ awardtreasure()
                                                        ++Player.p_crowns;
                                                        break;
                                                }
                                                        ++Player.p_crowns;
                                                        break;
                                                }

-                                               /* fall through otherwise */

 
 

+                                               /* FALLTHROUGH */

                                        case 2:
                                                addstr("You've been blessed!\n");
                                                Player.p_blessing = TRUE;
                                        case 2:
                                                addstr("You've been blessed!\n");
                                                Player.p_blessing = TRUE;


@@ -1337,8 +1353,8 @@ awardtreasure()
        }
 }
 
        }
 }
 

-void
-cursedtreasure()
+static void
+cursedtreasure(void)

 {
        if (Player.p_charms > 0) {
                addstr("But your charm saved you!\n");
 {
        if (Player.p_charms > 0) {
                addstr("But your charm saved you!\n");


@@ -1354,8 +1370,8 @@ cursedtreasure()
                }
 }
 
                }
 }
 

-void
-scramblestats()
+static void
+scramblestats(void)

 {
        double  dbuf[6];        /* to put statistic in */
        double  dtemp1, dtemp2; /* for swapping values */
 {
        double  dbuf[6];        /* to put statistic in */
        double  dtemp1, dtemp2; /* for swapping values */