From beabae200d25fd7589b9ee7d70881c2fd85c2971 Mon Sep 17 00:00:00 2001
From: Marco Hladik <marco@icculus.org>
Date: Thu, 20 Jan 2022 16:24:36 -0800
Subject: [PATCH] Remove inclusion of gs-entbase/server/defs.h

---
 src/server/monster_headcrab.qc  |  8 ++++----
 src/server/monster_scientist.qc | 22 +---------------------
 src/server/progs.src            |  1 -
 3 files changed, 5 insertions(+), 26 deletions(-)

diff --git a/src/server/monster_headcrab.qc b/src/server/monster_headcrab.qc
index 7a8f27b..5c6c835 100644
--- a/src/server/monster_headcrab.qc
+++ b/src/server/monster_headcrab.qc
@@ -47,7 +47,7 @@ enum
 	HC_STRUGGLE
 };
 
-class monster_headcrab:CBaseMonster
+class monster_headcrab:NSMonster
 {
 	float m_flIdleTime;
 
@@ -110,7 +110,7 @@ monster_headcrab::touch(void)
 void
 monster_headcrab::Pain(void)
 {
-	CBaseMonster::Pain();
+	NSMonster::Pain();
 
 	if (m_flAnimTime > time) {
 		return;
@@ -135,7 +135,7 @@ monster_headcrab::Death(void)
 	}
 
 	/* set the functional differences */
-	CBaseMonster::Death();
+	NSMonster::Death();
 }
 
 void
@@ -177,5 +177,5 @@ monster_headcrab::monster_headcrab(void)
 	base_mins = [-16,-16,0];
 	base_maxs = [16,16,36];
 	m_iAlliance = MAL_ALIEN;
-	CBaseMonster::CBaseMonster();
+	NSMonster::NSMonster();
 }
diff --git a/src/server/monster_scientist.qc b/src/server/monster_scientist.qc
index 40faac6..b6859c9 100644
--- a/src/server/monster_scientist.qc
+++ b/src/server/monster_scientist.qc
@@ -77,30 +77,10 @@ class monster_scientist:CBaseNPC
 	virtual void(void) OnPlayerUse;
 	virtual void(void) Pain;
 	virtual void(void) Death;
-	virtual int(void) AnimIdle;
-	virtual int(void) AnimWalk;
-	virtual int(void) AnimRun;
+
 	virtual void(string, string) SpawnKey;
 };
 
-int
-monster_scientist::AnimIdle(void)
-{
-	return SCIA_IDLE1;
-}
-
-int
-monster_scientist::AnimWalk(void)
-{
-	return SCIA_WALK;
-}
-
-int
-monster_scientist::AnimRun(void)
-{
-	return SCIA_RUN;
-}
-
 void
 monster_scientist::OnPlayerUse(void)
 {
diff --git a/src/server/progs.src b/src/server/progs.src
index 1090432..ba86b58 100755
--- a/src/server/progs.src
+++ b/src/server/progs.src
@@ -8,7 +8,6 @@
 
 #includelist
 ../../../src/shared/fteextensions.qc
-../../../src/gs-entbase/server/defs.h
 ../../../src/shared/defs.h
 ../../../src/server/defs.h