From fe7bb8d36b2fb5980a21ac396563471932f72d32 Mon Sep 17 00:00:00 2001
From: Kp <kp@valhallalegends.com>
Date: Sat, 4 Mar 2017 22:25:54 +0000
Subject: [PATCH] Use valptridx<wall>::magic_constant for wall_none

---
 common/main/fwd-segment.h | 3 ---
 common/main/fwd-wall.h    | 9 +--------
 2 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/common/main/fwd-segment.h b/common/main/fwd-segment.h
index 79c939040..f8d7a915a 100644
--- a/common/main/fwd-segment.h
+++ b/common/main/fwd-segment.h
@@ -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;
 
 }
diff --git a/common/main/fwd-wall.h b/common/main/fwd-wall.h
index 68c7579db..2297000a1 100644
--- a/common/main/fwd-wall.h
+++ b/common/main/fwd-wall.h
@@ -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 {