FWGS
/
hlsdk-xash3d
mirror of https://github.com/FWGS/hlsdk-xash3d
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

make trigger_hurt not trigger butthurt in coop

This commit is contained in:
mittorn 2016-10-10 19:02:22 +00:00
parent 73c073b9ea
commit cac8b3c906
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
dlls/triggers.cpp
View File

@ -789,6 +789,16 @@ void CTriggerHurt::Spawn( void )
if( !FStringNull( pev->targetname ) ) if( !FStringNull( pev->targetname ) )
{ {
SetUse( &CBaseTrigger::ToggleUse ); SetUse( &CBaseTrigger::ToggleUse );
if( mp_coop.value )
{
if( pev->size.x > 200 && pev->size.y > 200 && pev->size.z > 200 )
{
//it seems that it covers whole room or map
if( pev->dmg > 10 )
// trying to kill everything? Not in coop!
pev->dmg = 3;
}
}
} }
else else
{ {
@ -1596,7 +1606,7 @@ public:
if( g_iMenu && gpGlobals->time - m_flTime < 30 ) if( g_iMenu && gpGlobals->time - m_flTime < 30 )
return; // wait 30s befor new confirm vote return; // wait 30s befor new confirm vote
CBaseEntity *pTrigger = NULL; CBaseEntity *pTrigger = NULL;
int i; int i = 0;
g_iMenu = 2; g_iMenu = 2;
m_flTime = gpGlobals->time; m_flTime = gpGlobals->time;
while( pTrigger = UTIL_FindEntityByClassname( pTrigger, "trigger_changelevel" ) ) while( pTrigger = UTIL_FindEntityByClassname( pTrigger, "trigger_changelevel" ) )
@ -1661,9 +1671,9 @@ void CoopVoteMenu( CBasePlayer *pPlayer )
count++; count++;
} }
} }
if( count < 5 ) if( count < 4 )
{ {
ClientPrint( pPlayer->pev, HUD_PRINTCENTER, "Need at least 5 players to vote changelevel!\n" ); ClientPrint( pPlayer->pev, HUD_PRINTCENTER, "Need at least 4 players to vote changelevel!\n" );
return; return;
} }
g_GlobalMenu.VoteMenu(pPlayer); g_GlobalMenu.VoteMenu(pPlayer);
@ -2046,8 +2056,12 @@ void CChangeLevel::ChangeLevelNow( CBaseEntity *pActivator )
plr->m_state = STATE_CONNECTED; plr->m_state = STATE_CONNECTED;
plr->RemoveAllItems( TRUE ); plr->RemoveAllItems( TRUE );
BecomeSpectator( plr ); BecomeSpectator( plr );
plr->SetThink( &CBasePlayer::Spawn );
plr->pev->nextthink = gpGlobals->time + 1;
} }
} }
g_iMenu = 0;
g_GlobalMenu.m_iConfirm = 0;
CHANGE_LEVEL( st_szNextMap, st_szNextSpot ); CHANGE_LEVEL( st_szNextMap, st_szNextSpot );
} }