Adjust to rebase.

Took 28 minutes

Took 7 seconds

Took 2 minutes

Took 8 minutes

Took 13 seconds
This commit is contained in:
Lukas Brübach 2026-06-09 09:26:53 +02:00 committed by DawnFire42
parent 9b030a3d6b
commit 8ca693ef70
No known key found for this signature in database
GPG key ID: 24BB855EE2911B33
16 changed files with 50 additions and 48 deletions

View file

@ -2,11 +2,11 @@
#include "../../../client/settings/cache_settings.h"
#include "../../board/abstract_counter.h"
#include "../../game/player/player_actions.h"
#include "../../game/player/player_logic.h"
#include "../../game_scene.h"
#include "../../zones/command_zone.h"
#include "../player_actions.h"
#include "../player_graphics_item.h"
#include "../player_logic.h"
#include <libcockatrice/utility/counter_ids.h>
#include <libcockatrice/utility/zone_names.h>
@ -21,7 +21,7 @@ CommandZoneMenu::CommandZoneMenu(PlayerLogic *_player, QMenu *playerMenu) : QMen
aViewZone = new QAction(this);
connect(aViewZone, &QAction::triggered, this,
[this]() { player->getGameScene()->toggleZoneView(player, ZoneNames::COMMAND, -1); });
[this]() { emit player->requestZoneViewToggle(player, ZoneNames::COMMAND, -1, false); });
if (player->getPlayerInfo()->getLocalOrJudge()) {
addAction(aViewZone);
@ -106,10 +106,11 @@ void CommandZoneMenu::retranslateUi()
void CommandZoneMenu::actToggleMinimized()
{
CommandZone *zone = player->getGraphicsItem()->getCommandZoneGraphicsItem();
// TODO
/*CommandZone *zone = player->getGraphicsItem()->getCommandZoneGraphicsItem();
if (zone) {
zone->toggleMinimized();
}
}*/
}
void CommandZoneMenu::updateTaxCounterActionStates()