From a286cb45f11887d5749714a76a20cb31fcd16b18 Mon Sep 17 00:00:00 2001
From: Enno Rehling <enno.rehling@gmail.com>
Date: Sun, 25 Feb 2018 14:54:45 +0100
Subject: [PATCH] compilation fix, disable catapult damage code.

---
 src/gmtool.h         | 2 --
 src/gmtool_structs.h | 2 ++
 src/items/weapons.c  | 4 +++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/gmtool.h b/src/gmtool.h
index 6d299fe74..5a2449c9a 100644
--- a/src/gmtool.h
+++ b/src/gmtool.h
@@ -41,8 +41,6 @@ extern "C" {
   void make_block(int x, int y, int radius, const struct terrain_type *terrain);
   void seed_players(struct newfaction **players, bool new_island);
 
-  int wxborder(WINDOW *win);
-
 #ifdef __cplusplus
 }
 #endif
diff --git a/src/gmtool_structs.h b/src/gmtool_structs.h
index 9779ffaf0..aedee2aa9 100644
--- a/src/gmtool_structs.h
+++ b/src/gmtool_structs.h
@@ -90,6 +90,8 @@ extern "C" {
 #define TWIDTH  2               /* width of tile */
 #define THEIGHT 1               /* height of tile */
 
+int wxborder(WINDOW *win);
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/src/items/weapons.c b/src/items/weapons.c
index fd2e7cf19..6c764b123 100644
--- a/src/items/weapons.c
+++ b/src/items/weapons.c
@@ -138,14 +138,16 @@ int *casualties)
         /* If battle succeeds */
         if (hits(*at, dt, wp)) {
             d += terminate(dt, *at, AT_STANDARD, wp->type->damage[0], true);
+/* CATAPULT_STRUCTURAL_DAMAGE
             if (dt.fighter->unit->building && rng_int() % 100 < 5) {
                 double dmg = config_get_flt("rules.building.damage.catapult", 1);
                 damage_building(b, dt.fighter->unit->building, dmg);
             }
             else if (dt.fighter->unit->ship && rng_int() % 100 < 5) {
                 double dmg = config_get_flt("rules.ship.damage.catapult", 0.01);
-                damage_ship(dt.fighter->unit->ship, dmg)
+                damage_ship(dt.fighter->unit->ship, dmg);
             }
+*/
         }
     }