Skip to content

Add persistent block color feature #1105

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
ashy1227 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add persistent block color feature #1105

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,9 @@ UserInterfaceState.xcuserstate
*.sublime-workspace
*.sublime-project

# Vscode
.vscode/

# Windows related
Thumbs.db

Expand Down
10 changes: 8 additions & 2 deletions Sources/Client/NetClient.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
#include <Core/TMPUtils.h>

DEFINE_SPADES_SETTING(cg_unicode, "1");
DEFINE_SPADES_SETTING(cg_persistentBlockColor, "1");

namespace spades {
namespace client {
Expand Down Expand Up @@ -1017,10 +1018,15 @@ namespace spades {
default: SPRaise("Received invalid weapon: %d", weapon);
}

auto p =
stmp::make_unique<Player>(*GetWorld(), pId, wType, team, savedPlayerPos[pId],
auto p = stmp::make_unique<Player>(*GetWorld(), pId, wType, team, savedPlayerPos[pId],
GetWorld()->GetTeam(team).color);
p->SetPosition(pos);
// Don't reset my block color when I respawn
if(cg_persistentBlockColor && GetLocalPlayerOrNull() && pId == GetWorld()->GetLocalPlayerIndex()) {
p->SetHeldBlockColor(GetWorld()->GetLocalPlayer()->GetBlockColor());
SendHeldBlockColor();
}

GetWorld()->SetPlayer(pId, std::move(p));

Player &pRef = GetWorld()->GetPlayer(pId).value();
Expand Down