Merge pull request #193 from bibendovsky/develop

v1.1.16
bibendovsky · Feb 2, 2020 · c7d8adf · c7d8adf
2 parents 76c4d12 + 103001d
commit c7d8adf
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 28 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,11 @@
 # BStone changelog
 
 
+## [1.1.16] - 2020-02-01
+### Fixed
+- Removed some checks on barriers (by bibendovsky).
+
+
 ## [1.1.15] - 2020-01-25
 ### Changed
 - Number secret floor (by bibendovsky).

diff --git a/src/3d_act2.cpp b/src/3d_act2.cpp
@@ -2821,32 +2821,6 @@ void ConnectBarriers()
 				{
 					::Quit("A barrier switch was not connect to any barriers.");
 				}
-
-				auto actor =
-					::actorat[barrier->coord.tilex][barrier->coord.tiley];
-
-				if (actor != nullptr)
-				{
-					switch (actor->obclass)
-					{
-					case arc_barrierobj:
-					case post_barrierobj:
-						break;
-					default:
-						::Quit("A barrier switch was not connect to any barriers.");
-						break;
-					}
-
-					static_cast<void>(::CheckActor(actor, num));
-				}
-				else
-				{
-// BBi Custom maps may have switches connected to non-activable objects.
-#if 0
-					::Quit("A barrier switch was not connect to any barriers.");
-#endif // 0
-				}
-
 			}
 		}
 	}

diff --git a/src/3d_main.cpp b/src/3d_main.cpp
@@ -10516,7 +10516,7 @@ const std::string& get_version_string()
 #ifdef __vita__
 	static const std::string version = "0.3";
 #else
-	static const std::string version = "1.1.15";
+	static const std::string version = "1.1.16";
 #endif
 	return version;
 }

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.1.3 FATAL_ERROR)
-project(bstone VERSION 1.1.15 LANGUAGES CXX)
+project(bstone VERSION 1.1.16 LANGUAGES CXX)
 
 
 option(BSTONE_USE_STATIC_LINKING "Link build statically." OFF)