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

Use valptridx<wall>::magic_constant for wall_none

Browse source
This commit is contained in:
Kp 2017-03-04 22:25:54 +00:00
parent a8c3a7f10b
commit fe7bb8d36b
2 changed files with 1 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
common/main/fwd-segment.h
View file

@ -82,9 +82,6 @@ struct uvl;
enum side_type : uint8_t;
using wallnum_t = uint16_t;
template <wallnum_t I>
struct wall_magic_constant_t;
struct side;
}

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

@ -159,14 +159,6 @@ constexpr auto WID_CLOAKED_WALL = WALL_IS_DOORWAY_sresult(WID_RENDER_FLAG
namespace dcx {
template <wallnum_t I>
struct wall_magic_constant_t
{
constexpr operator wallnum_t() const { return I; }
};
constexpr wall_magic_constant_t<0xffff> wall_none{};
struct stuckobj;
struct v16_wall;
struct v19_wall;
@ -201,6 +193,7 @@ 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;
constexpr valptridx<wall>::magic_constant<0xffff> wall_none{};
}
namespace dcx {