mirror of
https://github.com/Cockatrice/Cockatrice.git
synced 2026-06-29 01:53:54 -07:00
[Player] Rename player to player logic (#6913)
Took 13 minutes Took 6 seconds Took 2 minutes Co-authored-by: Lukas Brübach <Bruebach.Lukas@bdosecurity.de>
This commit is contained in:
parent
71790d8e10
commit
5219cffa6b
79 changed files with 397 additions and 386 deletions
|
|
@ -3,8 +3,8 @@
|
|||
#include "../../client/settings/cache_settings.h"
|
||||
#include "../../game/board/card_drag_item.h"
|
||||
#include "../../game/board/card_item.h"
|
||||
#include "../../game/player/player.h"
|
||||
#include "../../game/player/player_actions.h"
|
||||
#include "../../game/player/player_logic.h"
|
||||
#include "../../interface/theme_manager.h"
|
||||
|
||||
#include <QPainter>
|
||||
|
|
|
|||
|
|
@ -2,8 +2,8 @@
|
|||
|
||||
#include "../../game/board/card_drag_item.h"
|
||||
#include "../../game/board/card_item.h"
|
||||
#include "../../game/player/player.h"
|
||||
#include "../../game/player/player_actions.h"
|
||||
#include "../../game/player/player_logic.h"
|
||||
#include "../../game/zones/pile_zone_logic.h"
|
||||
#include "view_zone.h"
|
||||
|
||||
|
|
|
|||
|
|
@ -3,8 +3,8 @@
|
|||
#include "../../game/board/card_drag_item.h"
|
||||
#include "../../game/board/card_item.h"
|
||||
#include "../../game/card_dimensions.h"
|
||||
#include "../../game/player/player.h"
|
||||
#include "../../game/player/player_actions.h"
|
||||
#include "../../game/player/player_logic.h"
|
||||
#include "../../game/zones/stack_zone_logic.h"
|
||||
#include "../../interface/theme_manager.h"
|
||||
|
||||
|
|
|
|||
|
|
@ -4,8 +4,8 @@
|
|||
#include "../../game/board/arrow_item.h"
|
||||
#include "../../game/board/card_drag_item.h"
|
||||
#include "../../game/board/card_item.h"
|
||||
#include "../../game/player/player.h"
|
||||
#include "../../game/player/player_actions.h"
|
||||
#include "../../game/player/player_logic.h"
|
||||
#include "../../game/z_values.h"
|
||||
#include "../../game/zones/table_zone_logic.h"
|
||||
#include "../../interface/theme_manager.h"
|
||||
|
|
|
|||
|
|
@ -2,8 +2,8 @@
|
|||
|
||||
#include "../../game/board/card_drag_item.h"
|
||||
#include "../../game/board/card_item.h"
|
||||
#include "../../game/player/player.h"
|
||||
#include "../../game/player/player_actions.h"
|
||||
#include "../../game/player/player_logic.h"
|
||||
#include "../../game/zones/view_zone_logic.h"
|
||||
|
||||
#include <QBrush>
|
||||
|
|
|
|||
|
|
@ -4,8 +4,8 @@
|
|||
#include "../../filters/syntax_help.h"
|
||||
#include "../../game/board/card_item.h"
|
||||
#include "../../game/game_scene.h"
|
||||
#include "../../game/player/player.h"
|
||||
#include "../../game/player/player_actions.h"
|
||||
#include "../../game/player/player_logic.h"
|
||||
#include "../../game/z_values.h"
|
||||
#include "../../interface/pixel_map_generator.h"
|
||||
#include "view_zone.h"
|
||||
|
|
@ -37,7 +37,7 @@ constexpr qreal kMinVisibleWidth = 100.0;
|
|||
* @param _revealZone if false, the cards will be face down.
|
||||
* @param _writeableRevealZone whether the player can interact with the revealed cards.
|
||||
*/
|
||||
ZoneViewWidget::ZoneViewWidget(Player *_player,
|
||||
ZoneViewWidget::ZoneViewWidget(PlayerLogic *_player,
|
||||
CardZoneLogic *_origZone,
|
||||
int numberCards,
|
||||
bool _revealZone,
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@ class QLabel;
|
|||
class QPushButton;
|
||||
class CardZone;
|
||||
class ZoneViewZone;
|
||||
class Player;
|
||||
class PlayerLogic;
|
||||
class CardDatabase;
|
||||
class QScrollBar;
|
||||
class GameScene;
|
||||
|
|
@ -65,7 +65,7 @@ private:
|
|||
|
||||
bool canBeShuffled;
|
||||
int extraHeight;
|
||||
Player *player;
|
||||
PlayerLogic *player;
|
||||
|
||||
bool draggingWindow = false;
|
||||
QPoint dragStartScreenPos;
|
||||
|
|
@ -108,7 +108,7 @@ private slots:
|
|||
void expandWindow();
|
||||
|
||||
public:
|
||||
ZoneViewWidget(Player *_player,
|
||||
ZoneViewWidget(PlayerLogic *_player,
|
||||
CardZoneLogic *_origZone,
|
||||
int numberCards = 0,
|
||||
bool _revealZone = false,
|
||||
|
|
@ -119,7 +119,7 @@ public:
|
|||
{
|
||||
return zone;
|
||||
}
|
||||
Player *getPlayer() const
|
||||
PlayerLogic *getPlayer() const
|
||||
{
|
||||
return player;
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue