Merge branch 'tot' into mobile_hacks

This commit is contained in:
Andrey Akhmichin 2022-11-04 02:36:00 +05:00
commit 08cb9e6b67
No known key found for this signature in database
GPG Key ID: 1F180D249B0643C0

View File

@ -47,6 +47,12 @@ extern "C" EXPORT void monster_civ( entvars_t *pev )
//========================================================= //=========================================================
void CCivScientist::Spawn(void) void CCivScientist::Spawn(void)
{ {
// We need to set it before precache so the right voice will be chosen
if( pev->body == -1 )
{// -1 chooses a random head
pev->body = RANDOM_LONG( 0, NUM_SCIENTIST_HEADS - 1 );// pick a head, any he
}
Precache(); Precache();
SET_MODEL(ENT(pev), "models/civ_sci.mdl"); SET_MODEL(ENT(pev), "models/civ_sci.mdl");
@ -67,11 +73,6 @@ void CCivScientist::Spawn(void)
// White hands // White hands
pev->skin = 0; pev->skin = 0;
if (pev->body == -1)
{// -1 chooses a random head
pev->body = RANDOM_LONG(0, NUM_SCIENTIST_HEADS - 1);// pick a head, any head
}
// Luther is black, make his hands black // Luther is black, make his hands black
if (pev->body == HEAD_LUTHER) if (pev->body == HEAD_LUTHER)
pev->skin = 1; pev->skin = 1;