Skip to content

Server: Send bots to welcome cam and not allow players to leave it too soon #19

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rtxa wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Server: Send bots to welcome cam and not allow players to leave it too soon #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0482930
Delay player spawn on welcome cam
rtxa Mar 17, 2020
0321bb0
Fix bots not being send to welcomecam
rtxa Mar 18, 2020
8814637
Lower delay to spawn in welcome cam
rtxa Mar 18, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion dlls/multiplay_gamerules.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -649,8 +649,12 @@ void CHalfLifeMultiplay :: PlayerSpawn( CBasePlayer *pPlayer )
CBaseEntity *pWeaponEntity = NULL;

// Start welcome cam for new players
if (!pPlayer->m_bPutInServer && !pPlayer->m_bIsBot && mp_welcomecam.value != 0)
if (!pPlayer->m_bPutInServer && mp_welcomecam.value != 0)
{
// don't let him spawn as soon as he enters the server
// give enough time to plugins to send the player to spectator mode
pPlayer->m_flNextAttack = 0.2;

pPlayer->StartWelcomeCam();
return;
}
Expand Down
9 changes: 8 additions & 1 deletion dlls/player.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1942,7 +1942,14 @@ void CBasePlayer::PreThink(void)
// Welcome cam buttons handling
if (m_bInWelcomeCam)
{
if (m_afButtonPressed & IN_ATTACK)
if (m_flNextAttack > 0)
return;

if (m_bIsBot)
{
StopWelcomeCam();
}
else if (m_afButtonPressed & IN_ATTACK )
{
StopWelcomeCam();
}
Expand Down
2 changes: 1 addition & 1 deletion dlls/player.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -332,7 +332,7 @@ class CBasePlayer : public CBaseMonster
BOOL m_bPutInServer; // we set it after PutInServer finished
BOOL m_bIsBot; // we set it at PutInServer start
BOOL IsConnected() { return m_bConnected; }
void Disconnect() { m_bConnected = FALSE; m_bPutInServer = FALSE; m_bIsBot = FALSE; }
void Disconnect() { m_bConnected = FALSE; m_bPutInServer = FALSE; m_bIsBot = FALSE; m_bInWelcomeCam = FALSE; }

Vector m_vecLastViewAngles;

Expand Down