jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-07-03 20:13:56 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

[Player] Rename player to player logic (#6913)

Browse source 
Took 13 minutes

Took 6 seconds

Took 2 minutes

Co-authored-by: Lukas Brübach <Bruebach.Lukas@bdosecurity.de>
This commit is contained in:
BruebachL 2026-05-19 12:36:31 +02:00 • committed by GitHub
parent 71790d8e10
commit 5219cffa6b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
79 changed files with 397 additions and 386 deletions
Download patch file Download diff file Expand all files Collapse all files

4
cockatrice/src/game/zones/card_zone_logic.cpp
View file

@ -2,8 +2,8 @@
#include "../../game_graphics/zones/view_zone.h"
#include "../board/card_item.h"
#include "../player/player.h"
#include "../player/player_actions.h"
#include "../player/player_logic.h"
#include "view_zone_logic.h"
#include <QAction>
@ -20,7 +20,7 @@
* @param _contentsKnown whether the cards in the zone are known to the client
* @param parent the parent QObject.
*/
CardZoneLogic::CardZoneLogic(Player *_player,
CardZoneLogic::CardZoneLogic(PlayerLogic *_player,
const QString &_name,
bool _hasCardAttr,
bool _isShufflable,

8
cockatrice/src/game/zones/card_zone_logic.h
View file

@ -15,7 +15,7 @@
inline Q_LOGGING_CATEGORY(CardZoneLogicLog, "card_zone_logic");
class Player;
class PlayerLogic;
class ZoneViewZone;
class QMenu;
class QAction;
@ -35,7 +35,7 @@ signals:
void retranslateUi();
public:
explicit CardZoneLogic(Player *_player,
explicit CardZoneLogic(PlayerLogic *_player,
const QString &_name,
bool _hasCardAttr,
bool _isShufflable,
@ -68,7 +68,7 @@ public:
return name;
}
[[nodiscard]] QString getTranslatedName(bool theirOwn, GrammaticalCase gc) const;
[[nodiscard]] Player *getPlayer() const
[[nodiscard]] PlayerLogic *getPlayer() const
{
return player;
}
@ -105,7 +105,7 @@ private slots:
void refreshCardInfos();
protected:
Player *player;
PlayerLogic *player;
QString name;
CardList cards;
QList<ZoneViewZone *> views;

2
cockatrice/src/game/zones/hand_zone_logic.cpp
View file

@ -3,7 +3,7 @@
#include "../board/card_item.h"
#include "card_zone_algorithms.h"
HandZoneLogic::HandZoneLogic(Player *_player,
HandZoneLogic::HandZoneLogic(PlayerLogic *_player,
const QString &_name,
bool _hasCardAttr,
bool _isShufflable,

2
cockatrice/src/game/zones/hand_zone_logic.h
View file

@ -12,7 +12,7 @@ class HandZoneLogic : public CardZoneLogic
{
Q_OBJECT
public:
HandZoneLogic(Player *_player,
HandZoneLogic(PlayerLogic *_player,
const QString &_name,
bool _hasCardAttr,
bool _isShufflable,

2
cockatrice/src/game/zones/pile_zone_logic.cpp
View file

@ -2,7 +2,7 @@
#include "../board/card_item.h"
PileZoneLogic::PileZoneLogic(Player *_player,
PileZoneLogic::PileZoneLogic(PlayerLogic *_player,
const QString &_name,
bool _hasCardAttr,
bool _isShufflable,

2
cockatrice/src/game/zones/pile_zone_logic.h
View file

@ -17,7 +17,7 @@ signals:
void callUpdate();
public:
PileZoneLogic(Player *_player,
PileZoneLogic(PlayerLogic *_player,
const QString &_name,
bool _hasCardAttr,
bool _isShufflable,

2
cockatrice/src/game/zones/stack_zone_logic.cpp
View file

@ -3,7 +3,7 @@
#include "../board/card_item.h"
#include "card_zone_algorithms.h"
StackZoneLogic::StackZoneLogic(Player *_player,
StackZoneLogic::StackZoneLogic(PlayerLogic *_player,
const QString &_name,
bool _hasCardAttr,
bool _isShufflable,

2
cockatrice/src/game/zones/stack_zone_logic.h
View file

@ -12,7 +12,7 @@ class StackZoneLogic : public CardZoneLogic
{
Q_OBJECT
public:
StackZoneLogic(Player *_player,
StackZoneLogic(PlayerLogic *_player,
const QString &_name,
bool _hasCardAttr,
bool _isShufflable,

2
cockatrice/src/game/zones/table_zone_logic.cpp
View file

@ -2,7 +2,7 @@
#include "../board/card_item.h"
TableZoneLogic::TableZoneLogic(Player *_player,
TableZoneLogic::TableZoneLogic(PlayerLogic *_player,
const QString &_name,
bool _hasCardAttr,
bool _isShufflable,

2
cockatrice/src/game/zones/table_zone_logic.h
View file

@ -16,7 +16,7 @@ signals:
void toggleTapped();
public:
TableZoneLogic(Player *_player,
TableZoneLogic(PlayerLogic *_player,
const QString &_name,
bool _hasCardAttr,
bool _isShufflable,

2
cockatrice/src/game/zones/view_zone_logic.cpp
View file

@ -9,7 +9,7 @@
* @param _revealZone if false, the cards will be face down.
* @param _writeableRevealZone whether the player can interact with the revealed cards.
*/
ZoneViewZoneLogic::ZoneViewZoneLogic(Player *_player,
ZoneViewZoneLogic::ZoneViewZoneLogic(PlayerLogic *_player,
CardZoneLogic *_origZone,
int _numberCards,
bool _revealZone,

2
cockatrice/src/game/zones/view_zone_logic.h
View file

@ -30,7 +30,7 @@ public:
REMOVE_CARD
};
ZoneViewZoneLogic(Player *_player,
ZoneViewZoneLogic(PlayerLogic *_player,
CardZoneLogic *_origZone,
int _numberCards,
bool _revealZone,