TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Raise D1 MAX_DOORS to match D2

Browse source
This commit is contained in:
Kp 2016-11-26 22:51:49 +00:00
parent 66d946f5f7
commit 329ff67718
2 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
common/main/fwd-wall.h
View file

@ -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;

2
similar/main/wall.cpp
View file

@ -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 {