diff --git a/dlls/monster/CScientist.cpp b/dlls/monster/CScientist.cpp index 44203323..77ead3f3 100644 --- a/dlls/monster/CScientist.cpp +++ b/dlls/monster/CScientist.cpp @@ -111,9 +111,12 @@ class CScientist : public CTalkSquadMonster float m_painTime; float m_healTime; float m_fearTime; + + const char* defaultModel; }; LINK_ENTITY_TO_CLASS( monster_scientist, CScientist ); +LINK_ENTITY_TO_CLASS( monster_cleansuit_scientist, CScientist ); TYPEDESCRIPTION CScientist::m_SaveData[] = { @@ -641,7 +644,7 @@ void CScientist :: Spawn( void ) { Precache( ); - SET_MODEL(ENT(pev), "models/scientist.mdl"); + SET_MODEL(ENT(pev), defaultModel); UTIL_SetSize(pev, VEC_HUMAN_HULL_MIN, VEC_HUMAN_HULL_MAX); pev->solid = SOLID_SLIDEBOX; @@ -677,7 +680,9 @@ void CScientist :: Spawn( void ) //========================================================= void CScientist :: Precache( void ) { - PRECACHE_MODEL("models/scientist.mdl"); + defaultModel = FClassnameIs(pev, "monster_scientist") ? "models/scientist.mdl" : "models/cleansuit_scientist.mdl"; + + PRECACHE_MODEL(defaultModel); PRECACHE_SOUND("scientist/sci_pain1.wav"); PRECACHE_SOUND("scientist/sci_pain2.wav"); PRECACHE_SOUND("scientist/sci_pain3.wav"); diff --git a/sevenkewp b/sevenkewp index 815e1344..bb431c53 160000 --- a/sevenkewp +++ b/sevenkewp @@ -1 +1 @@ -Subproject commit 815e1344313da971f1664ca3080a6db8975473e2 +Subproject commit bb431c5373a4f46ee5f3abdc8a77dac069fd09ff