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

Raise MAX_WALLS to 255

Browse source 
Raise D2 MAX_WALLS to 255, since Walls[254] is not special.  Synchronize
D1 MAX_WALLS to D2 MAX_WALLS to fix D1 Level of the World BRDECON.

Requested-by: Ryusei117 <http://www.dxx-rebirth.com/frm/index.php/topic,1760.msg22509.html#msg22509>
This commit is contained in:
Kp 2017-01-18 03:06:02 +00:00
parent 0ac4eb52b2
commit fd2c8df74e
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -17,6 +17,7 @@
namespace dcx {
using actdoornum_t = uint8_t;
constexpr unsigned MAX_WALLS = 255; // Maximum number of walls
constexpr std::integral_constant<std::size_t, 90> MAX_DOORS{}; // Maximum number of open doors
struct active_door;
}
@ -27,10 +28,8 @@ DXX_VALPTRIDX_DECLARE_SUBTYPE(active_door, actdoornum_t, MAX_DOORS);
#ifdef dsx
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
#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
#endif
@ -198,7 +197,7 @@ DXX_VALPTRIDX_DECLARE_GLOBAL_SUBTYPE(cloaking_wall, clwall, CloakingWalls);
}
#endif
DXX_VALPTRIDX_DECLARE_SUBTYPE(dsx::wall, wallnum_t, dsx::MAX_WALLS);
DXX_VALPTRIDX_DECLARE_SUBTYPE(dsx::wall, wallnum_t, dcx::MAX_WALLS);
namespace dsx {
DXX_VALPTRIDX_DECLARE_GLOBAL_SUBTYPE(wall, wall, Walls);
extern array<wclip, MAX_WALL_ANIMS> WallAnims;