From 0d93a22b58da7a1742d7bb0b3f212450ba45525d Mon Sep 17 00:00:00 2001
From: Marco Hladik <marco@icculus.org>
Date: Mon, 4 Apr 2022 09:40:35 -0700
Subject: [PATCH] Clean up misc warnings.

---
 src/client/entry.qc                         | 12 ++++++++----
 src/gs-entbase/server/func_button.qc        | 10 ----------
 src/gs-entbase/server/func_door.qc          |  7 -------
 src/gs-entbase/server/func_door_rotating.qc |  8 --------
 4 files changed, 8 insertions(+), 29 deletions(-)

diff --git a/src/client/entry.qc b/src/client/entry.qc
index b398fae9..cac8221c 100644
--- a/src/client/entry.qc
+++ b/src/client/entry.qc
@@ -146,6 +146,7 @@ CSQC_UpdateView(float w, float h, float focus)
 	base_client cl = __NULL__;
 	spectator spec;
 	int s;
+	entity c;
 
 	if (w == 0 || h == 0) {
 		return;
@@ -257,7 +258,7 @@ CSQC_UpdateView(float w, float h, float focus)
 			spec = (spectator)self;
 
 			if (spec.spec_mode == SPECMODE_FIRSTPERSON || spec.spec_mode == SPECMODE_THIRDPERSON) {
-				entity c = findfloat(world, ::entnum, spec.spec_ent);
+				c = findfloat(world, ::entnum, spec.spec_ent);
 				pSeat->m_vecPredictedOrigin = c.origin;
 				pSeat->m_vecPredictedVelocity = c.velocity;
 				pSeat->m_flPredictedFlags = c.flags;
@@ -318,7 +319,7 @@ CSQC_UpdateView(float w, float h, float focus)
 					setproperty(VF_ORIGIN, trace_endpos + (v_forward * 5));
 					break;
 				case SPECMODE_FIRSTPERSON:
-					entity c = findfloat(world, ::entnum, spec.spec_ent);
+					c = findfloat(world, ::entnum, spec.spec_ent);
 					
 					if (c.classname == "player") {
 						player bp = (player)c;
@@ -358,10 +359,11 @@ CSQC_UpdateView(float w, float h, float focus)
 			View_DrawViewModel();
 		} else {
 			if (Client_IsSpectator(pl)) {
+				spec = (spectator)self;
+
 				/* 0 means world */
 				if (spec.spec_ent) {
-					spec = (spectator)self;
-					entity c = findfloat(world, ::entnum, spec.spec_ent);
+					c = findfloat(world, ::entnum, spec.spec_ent);
 
 					/* we found them */
 					if (c && c != spec) {
@@ -726,6 +728,8 @@ CSQC_Ent_Remove(void)
 		NSEntity me = (NSEntity)self;
 		me.ClientRemove();
 		remove(self);
+	} else {
+		remove(self);
 	}
 }
 
diff --git a/src/gs-entbase/server/func_button.qc b/src/gs-entbase/server/func_button.qc
index 1cd225d7..5c8cf2f1 100644
--- a/src/gs-entbase/server/func_button.qc
+++ b/src/gs-entbase/server/func_button.qc
@@ -209,12 +209,6 @@ func_button::Arrived(void)
 
 	UseOutput(this, m_strOnIn);
 	m_iState = STATE_RAISED;
-	
-	if (HasSpawnFlags(SF_BTT_TOUCH_ONLY)) {
-		touch = Touch;
-	} else {
-		touch = __NULL__;
-	}
 
 	if (HasSpawnFlags(SF_BTT_TOGGLE)) {
 		return;
@@ -234,10 +228,6 @@ func_button::Returned(void)
 	velocity = [0,0,0];
 	nextthink = 0;
 
-	if (HasSpawnFlags(SF_BTT_TOUCH_ONLY)) {
-		touch = Touch;
-	}
-    
 	m_iState = STATE_LOWERED;
 	SetFrame(FRAME_OFF);
 }
diff --git a/src/gs-entbase/server/func_door.qc b/src/gs-entbase/server/func_door.qc
index cc59b094..84353a2d 100644
--- a/src/gs-entbase/server/func_door.qc
+++ b/src/gs-entbase/server/func_door.qc
@@ -164,9 +164,6 @@ func_door::Arrived(void)
 	if (m_strSndMove)
 		sound(this, CHAN_WEAPON, "common/null.wav", 1.0f, ATTN_NORM);
 
-	if (!HasSpawnFlags(SF_MOV_USE)) {
-		touch = Touch;
-	}
 	if (m_flWait < 0) {
 		return;
 	}
@@ -201,10 +198,6 @@ func_door::Returned(void)
 	if (m_strSndMove)
 		sound(this, CHAN_WEAPON, "common/null.wav", 1.0f, ATTN_NORM);
 
-	if (!HasSpawnFlags(SF_MOV_USE)) {
-		touch = Touch;
-	}
-
 	m_iState = DOORSTATE_LOWERED;
 	PortalClose();
 }
diff --git a/src/gs-entbase/server/func_door_rotating.qc b/src/gs-entbase/server/func_door_rotating.qc
index 61bb6f2d..0fb77975 100644
--- a/src/gs-entbase/server/func_door_rotating.qc
+++ b/src/gs-entbase/server/func_door_rotating.qc
@@ -159,10 +159,6 @@ func_door_rotating::Arrived(void)
 		sound(this, CHAN_VOICE, "common/null.wav", 1.0f, ATTN_NORM);
 	}
 
-	if (!HasSpawnFlags(SF_ROT_USE)) {
-		touch = Touch;
-	}
-
 	if (HasSpawnFlags(SF_ROT_TOGGLE) || m_flWait < 0)
 		return;
 
@@ -177,10 +173,6 @@ func_door_rotating::Returned(void)
 	avelocity = [0,0,0];
 	nextthink = 0.0f;
 
-	if (!HasSpawnFlags(SF_ROT_USE)) {
-		touch = Touch;
-	}
-
 	if (m_strSndStop) {
 		Sound_Play(this, CHAN_VOICE, m_strSndStop);
 	} else {