From 329ff677188e6b8dc252289ef2035ab7c04ff976 Mon Sep 17 00:00:00 2001
From: Kp <kp@valhallalegends.com>
Date: Sat, 26 Nov 2016 22:51:49 +0000
Subject: [PATCH] Raise D1 MAX_DOORS to match D2

---
 common/main/fwd-wall.h | 5 ++---
 similar/main/wall.cpp  | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/common/main/fwd-wall.h b/common/main/fwd-wall.h
index 1b7cf203a..4103f0ddf 100644
--- a/common/main/fwd-wall.h
+++ b/common/main/fwd-wall.h
@@ -19,12 +19,11 @@ namespace dsx {
 #if defined(DXX_BUILD_DESCENT_I)
 constexpr unsigned MAX_WALLS = 175;	// Maximum number of walls
 constexpr std::size_t MAX_WALL_ANIMS = 30;		// Maximum different types of doors
-constexpr std::size_t MAX_DOORS = 50;		// Maximum number of open doors
 #elif defined(DXX_BUILD_DESCENT_II)
 constexpr unsigned MAX_WALLS = 254; // Maximum number of walls
 constexpr std::size_t MAX_WALL_ANIMS = 60;  // Maximum different types of doors
-constexpr std::size_t MAX_DOORS = 90;  // Maximum number of open doors
 #endif
+constexpr std::size_t MAX_DOORS = 90;  // Maximum number of open doors
 
 enum wall_type_t : uint8_t
 {
@@ -186,11 +185,11 @@ DXX_VALPTRIDX_DECLARE_GLOBAL_SUBTYPE(cloaking_wall, clwall, CloakingWalls, MAX_C
 #endif
 
 DXX_VALPTRIDX_DECLARE_GLOBAL_SUBTYPE(wall, wall, Walls, MAX_WALLS);
-extern array<active_door, MAX_DOORS> ActiveDoors;  //  Master doors array
 extern array<wclip, MAX_WALL_ANIMS> WallAnims;
 }
 
 namespace dcx {
+extern array<active_door, MAX_DOORS> ActiveDoors;  //  Master doors array
 #define Num_walls Walls.get_count()
 extern unsigned Num_open_doors;              // Number of open doors
 extern unsigned Num_wall_anims;
diff --git a/similar/main/wall.cpp b/similar/main/wall.cpp
index 42af07c47..4fc86c91c 100644
--- a/similar/main/wall.cpp
+++ b/similar/main/wall.cpp
@@ -43,11 +43,11 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 namespace dcx {
 unsigned Num_wall_anims;
 unsigned Num_open_doors;						// Number of open doors
+array<active_door, MAX_DOORS> ActiveDoors;
 }
 
 namespace dsx {
 array<wclip, MAX_WALL_ANIMS> WallAnims;		// Wall animations
-array<active_door, MAX_DOORS> ActiveDoors;
 
 namespace {