From c813f6e76ae909e07515375d7d138c94213be9d2 Mon Sep 17 00:00:00 2001
From: Giegue <jumarti_5@yahoo.com.ar>
Date: Sat, 25 Mar 2023 21:46:22 -0300
Subject: [PATCH] Fix entvars keyvalues not working. Fix monstermaker
 classname.

---
 src/dlls/cmbase.cpp       | 6 +-----
 src/dlls/monstermaker.cpp | 3 ++-
 src/dlls/monsters.cpp     | 5 -----
 3 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/src/dlls/cmbase.cpp b/src/dlls/cmbase.cpp
index e97cc96..5d01f46 100644
--- a/src/dlls/cmbase.cpp
+++ b/src/dlls/cmbase.cpp
@@ -111,11 +111,7 @@ void CMBaseEntity :: KeyValue( KeyValueData* pkvd )
 	if ( !pev || !pkvd )
 		return;
 
-	if ( pkvd->fHandled )
-	{
-		// only handled data contain readable strings
-		EntvarsKeyvalue( pev, pkvd );
-	}
+	EntvarsKeyvalue( pev, pkvd );
 }
 
 // give health
diff --git a/src/dlls/monstermaker.cpp b/src/dlls/monstermaker.cpp
index 256dffb..0768114 100644
--- a/src/dlls/monstermaker.cpp
+++ b/src/dlls/monstermaker.cpp
@@ -109,6 +109,7 @@ void CMMonsterMaker :: Spawn( )
 	m_fFadeChildren = TRUE;
 	
 	m_flGround = 0;
+	pev->classname = MAKE_STRING("monstermaker");
 }
 
 void CMMonsterMaker :: Precache( void )
@@ -169,7 +170,7 @@ void CMMonsterMaker::MakeMonster( void )
 	pent = spawn_monster(m_iMonsterIndex, pev->origin, pev->angles, createSF, keyvalue);
 	if ( pent == NULL )
 	{
-		ALERT ( at_console, "NULL Ent in MonsterMaker!\n" );
+		ALERT ( at_console, "[MONSTER] NULL Ent in MonsterMaker!\n" );
 		return;
 	}
 	
diff --git a/src/dlls/monsters.cpp b/src/dlls/monsters.cpp
index 19d8284..e10ad0e 100644
--- a/src/dlls/monsters.cpp
+++ b/src/dlls/monsters.cpp
@@ -2626,11 +2626,6 @@ void CMBaseMonster :: KeyValue( KeyValueData *pkvd )
 		m_iClassifyOverride = atoi( pkvd->szValue );
 		pkvd->fHandled = TRUE;
 	}
-	else if (FStrEq(pkvd->szKeyName, "model"))
-	{
-		pev->model = ALLOC_STRING( pkvd->szValue );
-		pkvd->fHandled = TRUE;
-	}
 	else
 	{
 		CMBaseToggle::KeyValue( pkvd );