diff options
author | Kae <80987908+Novaenia@users.noreply.github.com> | 2023-07-22 22:31:04 +1000 |
---|---|---|
committer | Kae <80987908+Novaenia@users.noreply.github.com> | 2023-07-22 22:31:04 +1000 |
commit | cb19eef701b5c9e27d0464795fffcf8a4d795a21 (patch) | |
tree | 5cfbdf49ebd7ac9539891eea850e244887d4c355 /source/frontend/StarTeamBar.cpp | |
parent | 4fbd67daccfa69df6988bdf17c67ee3d5f3049c5 (diff) |
Add character swapping (no GUI yet)
Diffstat (limited to 'source/frontend/StarTeamBar.cpp')
-rw-r--r-- | source/frontend/StarTeamBar.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/frontend/StarTeamBar.cpp b/source/frontend/StarTeamBar.cpp index 192edfa..a378040 100644 --- a/source/frontend/StarTeamBar.cpp +++ b/source/frontend/StarTeamBar.cpp @@ -40,7 +40,7 @@ TeamBar::TeamBar(MainInterface* mainInterface, UniverseClientPtr client) { return; auto position = jsonToVec2I(Root::singleton().assets()->json("/interface/windowconfig/teambar.config:selfMenuOffset")); position[1] += windowHeight() / m_guiContext->interfaceScale(); - showMemberMenu(m_client->mainPlayer()->clientContext()->serverUuid(), position); + showMemberMenu(m_client->mainPlayer()->clientContext()->playerUuid(), position); }); reader.construct(assets->json("/interface/windowconfig/teambar.config:paneLayout"), this); @@ -155,7 +155,7 @@ void TeamBar::buildTeamBar() { int memberSize = assets->json("/interface/windowconfig/teambar.config:memberSize").toInt(); int memberSpacing = assets->json("/interface/windowconfig/teambar.config:memberSpacing").toInt(); - Uuid myUuid = player->clientContext()->serverUuid(); + Uuid myUuid = player->clientContext()->playerUuid(); for (auto member : teamClient->members()) { if (member.uuid == myUuid) { memberIndex++; @@ -360,7 +360,7 @@ void TeamMemberMenu::update(float dt) { void TeamMemberMenu::updateWidgets() { bool isLeader = m_owner->m_client->teamClient()->isTeamLeader(); - bool isSelf = m_owner->m_client->mainPlayer()->clientContext()->serverUuid() == m_memberUuid; + bool isSelf = m_owner->m_client->mainPlayer()->clientContext()->playerUuid() == m_memberUuid; fetchChild<ButtonWidget>("beamToShip")->setEnabled(m_canBeam); fetchChild<ButtonWidget>("makeLeader")->setEnabled(isLeader && !isSelf); |