From 7d69ab96fcf1a7d2cfea4b81e7364c96bf69aafe Mon Sep 17 00:00:00 2001
From: Marco Cawthorne <marco@vera-visions.com>
Date: Tue, 3 Oct 2023 10:56:05 -0700
Subject: [PATCH] func_door: Save m_waterType

---
 src/gs-entbase/server/func_door.qc | 7 +++++++
 src/shared/util.qc                 | 4 ++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/gs-entbase/server/func_door.qc b/src/gs-entbase/server/func_door.qc
index 8052d7f9..38df4304 100644
--- a/src/gs-entbase/server/func_door.qc
+++ b/src/gs-entbase/server/func_door.qc
@@ -131,6 +131,8 @@ func_door::func_door(void)
 	m_strSndClose =
 	m_strSndMove =
 	m_strSndStop = __NULL__;
+
+	m_waterType = 0i;
 }
 
 void
@@ -155,6 +157,7 @@ func_door::Save(float handle)
 	SaveString(handle, "m_strSndStop", m_strSndStop);
 	SaveString(handle, "m_strSndMove", m_strSndMove);
 	SaveString(handle, "targetClose", targetClose);
+	SaveInt(handle, "m_waterType", m_waterType);
 }
 
 void
@@ -208,6 +211,10 @@ func_door::Restore(string strKey, string strValue)
 	case "targetClose":
 		targetClose = ReadString(strValue);
 		break;
+
+	case "m_waterType":
+		m_waterType = ReadInt(strValue);
+		break;
 	default:
 		super::Restore(strKey, strValue);
 	}
diff --git a/src/shared/util.qc b/src/shared/util.qc
index d7a6d0b8..7be75957 100644
--- a/src/shared/util.qc
+++ b/src/shared/util.qc
@@ -52,12 +52,12 @@ Util_TimeToString(float fTime)
 }
 
 /* returns whether or not the mode we're playing is a team game */
-int
+bool
 Util_IsTeamplay(void)
 {
 #ifdef SERVER
 	return g_grMode.IsTeamplay();
 #else
-	return (serverkeyfloat("teams") > 0) ? TRUE : FALSE;
+	return (serverkeyfloat("teams") > 0) ? (true) : (false);
 #endif
 }
\ No newline at end of file