From 54cccdeb1204be3fc3e47e903c8f52fb58414fdf Mon Sep 17 00:00:00 2001
From: Lioncash <mathew1800@gmail.com>
Date: Fri, 22 Jan 2021 21:40:55 -0500
Subject: [PATCH] dBgS: Add release-elided functions to interface

---
 include/d/d_bg/d_bg_s/d_bg_s_poly_pass_chk.h | 11 +++++++++++
 src/d/d_bg/d_bg_s_poly_pass_chk.cpp          | 17 ++++-------------
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/include/d/d_bg/d_bg_s/d_bg_s_poly_pass_chk.h b/include/d/d_bg/d_bg_s/d_bg_s_poly_pass_chk.h
index 75825ee2cc7..c342d5b3f36 100644
--- a/include/d/d_bg/d_bg_s/d_bg_s_poly_pass_chk.h
+++ b/include/d/d_bg/d_bg_s/d_bg_s_poly_pass_chk.h
@@ -13,7 +13,18 @@ public:
     dBgS_PolyPassChk();
     ~dBgS_PolyPassChk();
 
+    bool ChkArrow() { return mArrow; }
+    bool ChkBomb() { return mBomb; }
+    bool ChkBoomerang() { return mBoomerang; }
+    bool ChkCam() { return mCamera; }
+    bool ChkHorse() { return mHorse; }
+    bool ChkIronBall() { return mIronBall; }
+    bool ChkLink() { return mLink; }
     bool ChkNoHorse();
+    bool ChkObj() { return mObject; }
+    bool ChkRope() { return mRope; }
+    bool ChkStatue() { return mStatue; }
+    bool ChkUnderwaterRoof() { return mUnderwaterRoof; }
 
     void ClrBomb();
     void ClrCam();
diff --git a/src/d/d_bg/d_bg_s_poly_pass_chk.cpp b/src/d/d_bg/d_bg_s_poly_pass_chk.cpp
index 14096e407d6..750ce2cb16a 100644
--- a/src/d/d_bg/d_bg_s_poly_pass_chk.cpp
+++ b/src/d/d_bg/d_bg_s_poly_pass_chk.cpp
@@ -10,17 +10,7 @@ dBgS_PolyPassChk::dBgS_PolyPassChk()
 dBgS_PolyPassChk::~dBgS_PolyPassChk() {}
 
 void dBgS_PolyPassChk::SetPassChkInfo(dBgS_PolyPassChk& chk) {
-    mObject = chk.mObject;
-    mCamera = chk.mCamera;
-    mLink = chk.mLink;
-    mArrow = chk.mArrow;
-    mBomb = chk.mBomb;
-    mBoomerang = chk.mBoomerang;
-    mRope = chk.mRope;
-    mUnderwaterRoof = chk.mUnderwaterRoof;
-    mHorse = chk.mHorse;
-    mStatue = chk.mStatue;
-    mIronBall = chk.mIronBall;
+    *this = chk;
 }
 
 void dBgS_PolyPassChk::SetObj() {
@@ -76,10 +66,11 @@ void dBgS_PolyPassChk::SetHorse() {
 }
 
 bool dBgS_PolyPassChk::ChkNoHorse() {
-    if (mObject || mCamera || mLink || mArrow || mBomb || mBoomerang || mRope || mUnderwaterRoof) {
+    if (ChkObj() || ChkCam() || ChkLink() || ChkArrow() || ChkBomb() || ChkBoomerang() ||
+        ChkRope() || ChkUnderwaterRoof()) {
         return true;
     }
-    return !mHorse;
+    return !ChkHorse();
 }
 
 void dBgS_PolyPassChk::SetStatue() {