From 402065fa8072157028336bcdab5b86e840944afe Mon Sep 17 00:00:00 2001
From: Celtic Minstrel <celtic.minstrel.ca@some.place>
Date: Sun, 14 Dec 2014 02:02:09 -0500
Subject: [PATCH] Add a check to prevent entering boats in combat (from Windows
 version)

---
 osx/boe.specials.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/osx/boe.specials.cpp b/osx/boe.specials.cpp
index 2278f56b..924f6733 100644
--- a/osx/boe.specials.cpp
+++ b/osx/boe.specials.cpp
@@ -243,6 +243,12 @@ bool check_special_terrain(location where_check,eSpecCtx mode,short which_pc,sho
 		put_item_screen(stat_window,0);
 	}
 	
+	// TODO: Just verify that yes, it works with this and doesn't work without it.
+	if(mode == eSpecCtx::COMBAT_MOVE && town_boat_there(where_check) < 3) {
+		add_string_to_buf("Blocked: Can't enter boats in combat");
+		can_enter = false;
+	}
+	
 	if (can_enter == false)
 		return false;