Skip to content

Stop camera from falling when initially selecting a team #641

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

Merged
AdamTadeusz merged 2 commits into from
Oct 12, 2024
Merged

Stop camera from falling when initially selecting a team #641

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3523bc9
Set movetype to walk only when spawning as jinrai or nsf
AdamTadeusz Sep 23, 2024
b90fe11
Update neo_player.cpp
AdamTadeusz Oct 12, 2024
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
10 changes: 7 additions & 3 deletions mp/src/game/server/neo/neo_player.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -489,7 +489,13 @@ void CNEO_Player::Precache( void )

void CNEO_Player::Spawn(void)
{
ShowViewPortPanel(PANEL_SPECGUI, (GetTeamNumber() == TEAM_SPECTATOR ? true : false));
int teamNumber = GetTeamNumber();
ShowViewPortPanel(PANEL_SPECGUI, teamNumber == TEAM_SPECTATOR);

if (teamNumber == TEAM_JINRAI || teamNumber == TEAM_NSF)
{
State_Transition(STATE_ACTIVE);
}

// Should do this class update first, because most of the stuff below depends on which player class we are.
if ((m_iNextSpawnClassChoice != -1) && (m_iNeoClass != m_iNextSpawnClassChoice))
Expand Down Expand Up @@ -2403,8 +2409,6 @@ bool CNEO_Player::ProcessTeamSwitchRequest(int iTeam)
}

StopObserverMode();

State_Transition(STATE_ACTIVE);
}
else
{
Expand Down