Fix merge conflicts

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

diff --git a/phantasia/fight.c b/phantasia/fight.c
index ee4e15b1ed69b10cd7b463dc177ec76eb4e5d021..5d0508e800131db1c567889b7e702f174cd6059c 100644 (file)
--- a/phantasia/fight.c
+++ b/phantasia/fight.c
@@ -1,10 +1,19 @@
-/*     $NetBSD: fight.c,v 1.12 2009/08/12 08:21:41 dholland Exp $      */
+/*     $NetBSD: fight.c,v 1.15 2021/05/02 12:50:46 rillig Exp $        */
 
 /*
  * 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>
 
@@ -1263,7 +1272,7 @@ awardtreasure(void)
                                                                                 * l
                                                                                 * a
                                                                                 * r
-                                                                                * 
+                                                                                *
                                                                                 * ri
                                                                                 * n
                                                                                 * g
@@ -1281,7 +1290,7 @@ awardtreasure(void)
                                                                                /* b
                                                                                 * a
                                                                                 * d
-                                                                                * 
+                                                                                *
                                                                                 * ri
                                                                                 * n
                                                                                 * g
@@ -1307,6 +1316,7 @@ awardtreasure(void)
                                        /* fall through to treasure type 9 if
                                         * no treasure from above */
 
+                                       /* FALLTHROUGH */
                                case 9: /* treasure type 9 */
                                        switch (whichtreasure) {
                                        case 1:
@@ -1317,8 +1327,8 @@ awardtreasure(void)
                                                        ++Player.p_crowns;
                                                        break;
                                                }
-                                               /* fall through otherwise */
 
+                                               /* FALLTHROUGH */
                                        case 2:
                                                addstr("You've been blessed!\n");
                                                Player.p_blessing = TRUE;