From 9c558a8f5c050f8a2db85585c49a5e768bab673f Mon Sep 17 00:00:00 2001
From: Marco Cawthorne <marco@vera-visions.com>
Date: Wed, 1 Jun 2022 17:41:25 -0700
Subject: [PATCH] Fix against upstream Nuclide.

---
 src/client/ui_eventgrabber.qc       | 6 +++---
 src/server/gamerules_multiplayer.qc | 1 +
 src/server/progs.src                | 1 +
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/client/ui_eventgrabber.qc b/src/client/ui_eventgrabber.qc
index 5c45aae..d98764d 100644
--- a/src/client/ui_eventgrabber.qc
+++ b/src/client/ui_eventgrabber.qc
@@ -18,7 +18,7 @@ class CUIEventGrabber:CUIWidget
 {
 	//void(void) CUIEventGrabber;
 	virtual void(void) Draw;
-	virtual void(float, float, float, float) Input;
+	virtual bool(float, float, float, float) Input;
 };
 
 
@@ -36,7 +36,7 @@ CUIEventGrabber::Draw(void)
 }
 
 
-void
+bool
 CUIEventGrabber::Input(float flEVType, float flKey, float flChar, float flDevID)
 {
 	// no need to do this.
@@ -68,7 +68,7 @@ CUIEventGrabber::Input(float flEVType, float flKey, float flChar, float flDevID)
 		break;
 	}
 	
-	
+	return false;
 }
 
 
diff --git a/src/server/gamerules_multiplayer.qc b/src/server/gamerules_multiplayer.qc
index 2c229ba..2c21058 100644
--- a/src/server/gamerules_multiplayer.qc
+++ b/src/server/gamerules_multiplayer.qc
@@ -1106,6 +1106,7 @@ TSMultiplayerRules::PlayerSpawn(NSClientPlayer pp)
 	
 	// ALSO - start the minimum spawn delay.
 	pl.minimumRespawnTime = autocvar_respawntime;
+	pl.health = 100;
 	
 }
 
diff --git a/src/server/progs.src b/src/server/progs.src
index 8592a8e..7f21f05 100644
--- a/src/server/progs.src
+++ b/src/server/progs.src
@@ -27,6 +27,7 @@
 #define QWSSQC
 #define SERVER
 #define TS
+#define NO_LEGACY
 
 // TS definitely has penetration, and so should this then.
 #define BULLETPENETRATION