YGGverse/hlsdk-portable
1
0
Fork 0
mirror of https://github.com/YGGverse/hlsdk-portable.git synced 2025-01-25 22:24:16 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into mobile_hacks

Browse Source
This commit is contained in:
Andrey Akhmichin 2021-07-07 01:04:19 +05:00
commit fa04ba3676
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cl_dll/in_camera.cpp
View File

@ -153,6 +153,9 @@ void DLLEXPORT CAM_Think( void )
#endif #endif
vec3_t viewangles; vec3_t viewangles;
if( gEngfuncs.GetMaxClients() > 1 && CL_IsThirdPerson() )
CAM_ToFirstPerson();
switch( (int)cam_command->value ) switch( (int)cam_command->value )
{ {
case CAM_COMMAND_TOTHIRDPERSON: case CAM_COMMAND_TOTHIRDPERSON:

3
dlls/monsters.cpp
View File

@ -571,7 +571,8 @@ void CBaseMonster::MonsterThink( void )
//========================================================= //=========================================================
void CBaseMonster::MonsterUse( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value ) void CBaseMonster::MonsterUse( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value )
{ {
m_IdealMonsterState = MONSTERSTATE_ALERT; if (m_MonsterState == MONSTERSTATE_IDLE)
m_IdealMonsterState = MONSTERSTATE_ALERT;
} }
//========================================================= //=========================================================

2
dlls/scripted.cpp
View File

@ -695,7 +695,7 @@ void ScriptEntityCancel( edict_t *pentCine )
if( pTarget ) if( pTarget )
{ {
// make sure their monster is actually playing a script // make sure their monster is actually playing a script
if( pTarget->m_MonsterState == MONSTERSTATE_SCRIPT ) if( pTarget->m_MonsterState == MONSTERSTATE_SCRIPT || pTarget->m_IdealMonsterState == MONSTERSTATE_SCRIPT )
{ {
// tell them do die // tell them do die
pTarget->m_scriptState = CCineMonster::SCRIPT_CLEANUP; pTarget->m_scriptState = CCineMonster::SCRIPT_CLEANUP;