Browse Source

Fix scientist's voice pitch selection (#292)

fix-cwd-path
Roman Chistokhodov 2 years ago committed by GitHub
parent
commit
b69d37e30e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 15
      dlls/scientist.cpp

15
dlls/scientist.cpp

@ -639,6 +639,13 @@ void CScientist::HandleAnimEvent( MonsterEvent_t *pEvent )
//========================================================= //=========================================================
void CScientist::Spawn( void ) void CScientist::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 head
}
Precache(); Precache();
SET_MODEL( ENT( pev ), "models/scientist.mdl" ); SET_MODEL( ENT( pev ), "models/scientist.mdl" );
@ -659,12 +666,6 @@ void CScientist::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;
@ -722,7 +723,7 @@ void CScientist::TalkInit()
m_szGrp[TLK_MORTAL] = "SC_MORTAL"; m_szGrp[TLK_MORTAL] = "SC_MORTAL";
// get voice for head // get voice for head
switch( pev->body % 3 ) switch( pev->body % NUM_SCIENTIST_HEADS )
{ {
default: default:
case HEAD_GLASSES: case HEAD_GLASSES:

Loading…
Cancel
Save