Right scientist bodies on the needle draw and holster (#13)

This commit is contained in:
Roman Chistokhodov 2017-11-29 04:07:08 +03:00 committed by Andrey Akhmichin
parent da8fc767fd
commit 1168d10392
2 changed files with 7 additions and 4 deletions

View File

@ -535,13 +535,13 @@ void CScientist::HandleAnimEvent( MonsterEvent_t *pEvent )
case SCIENTIST_AE_NEEDLEON: case SCIENTIST_AE_NEEDLEON:
{ {
int oldBody = pev->body; int oldBody = pev->body;
pev->body = ( oldBody % NUM_SCIENTIST_HEADS ) + NUM_SCIENTIST_HEADS * 1; pev->body = ( oldBody % NUM_SCIENTIST_HEADS_OPFOR ) + NUM_SCIENTIST_HEADS_OPFOR * 1;
} }
break; break;
case SCIENTIST_AE_NEEDLEOFF: case SCIENTIST_AE_NEEDLEOFF:
{ {
int oldBody = pev->body; int oldBody = pev->body;
pev->body = ( oldBody % NUM_SCIENTIST_HEADS ) + NUM_SCIENTIST_HEADS * 0; pev->body = ( oldBody % NUM_SCIENTIST_HEADS_OPFOR ) + NUM_SCIENTIST_HEADS_OPFOR * 0;
} }
break; break;
default: default:
@ -650,12 +650,14 @@ void CScientist::TalkInit()
m_voicePitch = 105; m_voicePitch = 105;
break; //glasses break; //glasses
case HEAD_EINSTEIN: case HEAD_EINSTEIN:
case HEAD_EINSTEIN_WITH_BOOK:
m_voicePitch = 100; m_voicePitch = 100;
break; //einstein break; //einstein
case HEAD_LUTHER: case HEAD_LUTHER:
m_voicePitch = 95; m_voicePitch = 95;
break; //luther break; //luther
case HEAD_SLICK: case HEAD_SLICK:
case HEAD_SLICK_WITH_STICK:
m_voicePitch = 100; m_voicePitch = 100;
break; //slick break; //slick
} }

View File

@ -16,9 +16,10 @@
#ifndef SCIENTIST_H #ifndef SCIENTIST_H
#define SCIENTIST_H #define SCIENTIST_H
#define NUM_SCIENTIST_HEADS 4 // four heads available for scientist model #define NUM_SCIENTIST_HEADS 4 // four heads available for scientist model, used when randoming a scientist head
#define NUM_SCIENTIST_HEADS_OPFOR 6 // used for body change when scientist uses the needle
enum { HEAD_GLASSES = 0, HEAD_EINSTEIN = 1, HEAD_LUTHER = 2, HEAD_SLICK = 3 }; enum { HEAD_GLASSES = 0, HEAD_EINSTEIN = 1, HEAD_LUTHER = 2, HEAD_SLICK = 3, HEAD_EINSTEIN_WITH_BOOK = 4, HEAD_SLICK_WITH_STICK = 5 };
enum enum
{ {