Skip to content

Commit

Permalink
Merge pull request ddnet#9043 from furo321/dont-reset-zoom
Browse files Browse the repository at this point in the history
Don't reset zoom on team switch
  • Loading branch information
def- authored Sep 26, 2024
2 parents f614277 + 2dcbd5e commit 525803a
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 5 deletions.
5 changes: 1 addition & 4 deletions src/game/client/gameclient.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2513,14 +2513,11 @@ void CGameClient::CClientData::CSixup::Reset()
}
}

void CGameClient::SendSwitchTeam(int Team)
void CGameClient::SendSwitchTeam(int Team) const
{
CNetMsg_Cl_SetTeam Msg;
Msg.m_Team = Team;
Client()->SendPackMsgActive(&Msg, MSGFLAG_VITAL);

if(Team != TEAM_SPECTATORS)
m_Camera.OnReset();
}

void CGameClient::SendStartInfo7(bool Dummy) const
Expand Down
2 changes: 1 addition & 1 deletion src/game/client/gameclient.h
Original file line number Diff line number Diff line change
Expand Up @@ -554,7 +554,7 @@ class CGameClient : public IGameClient

// actions
// TODO: move these
void SendSwitchTeam(int Team);
void SendSwitchTeam(int Team) const;
void SendStartInfo7(bool Dummy) const;
void SendSkinChange7(bool Dummy);
// Returns true if the requested skin change got applied by the server
Expand Down

0 comments on commit 525803a

Please sign in to comment.