Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Donald Haase
Cockatrice
Commits
c4cb0f63
Commit
c4cb0f63
authored
Nov 10, 2010
by
Max-Wilhelm Bruker
Browse files
minor bug fix
parent
27d95426
Changes
3
Hide whitespace changes
Inline
Side-by-side
cockatrice/src/abstractcarditem.cpp
View file @
c4cb0f63
...
@@ -164,6 +164,12 @@ void AbstractCardItem::setName(const QString &_name)
...
@@ -164,6 +164,12 @@ void AbstractCardItem::setName(const QString &_name)
update
();
update
();
}
}
void
AbstractCardItem
::
setHovered
(
bool
_hovered
)
{
isHovered
=
_hovered
;
update
();
}
void
AbstractCardItem
::
setColor
(
const
QString
&
_color
)
void
AbstractCardItem
::
setColor
(
const
QString
&
_color
)
{
{
color
=
_color
;
color
=
_color
;
...
...
cockatrice/src/abstractcarditem.h
View file @
c4cb0f63
...
@@ -41,6 +41,7 @@ public:
...
@@ -41,6 +41,7 @@ public:
CardInfo
*
getInfo
()
const
{
return
info
;
}
CardInfo
*
getInfo
()
const
{
return
info
;
}
QString
getName
()
const
{
return
name
;
}
QString
getName
()
const
{
return
name
;
}
void
setName
(
const
QString
&
_name
=
QString
());
void
setName
(
const
QString
&
_name
=
QString
());
void
setHovered
(
bool
_hovered
);
QString
getColor
()
const
{
return
color
;
}
QString
getColor
()
const
{
return
color
;
}
void
setColor
(
const
QString
&
_color
);
void
setColor
(
const
QString
&
_color
);
bool
getTapped
()
const
{
return
tapped
;
}
bool
getTapped
()
const
{
return
tapped
;
}
...
...
cockatrice/src/player.cpp
View file @
c4cb0f63
...
@@ -794,8 +794,10 @@ void Player::eventMoveCard(Event_MoveCard *event)
...
@@ -794,8 +794,10 @@ void Player::eventMoveCard(Event_MoveCard *event)
card
->
setId
(
event
->
getNewCardId
());
card
->
setId
(
event
->
getNewCardId
());
card
->
setFaceDown
(
event
->
getFaceDown
());
card
->
setFaceDown
(
event
->
getFaceDown
());
if
(
startZone
!=
targetZone
)
if
(
startZone
!=
targetZone
)
{
card
->
setBeingPointedAt
(
false
);
card
->
setBeingPointedAt
(
false
);
card
->
setHovered
(
false
);
}
// The log event has to be sent before the card is added to the target zone
// The log event has to be sent before the card is added to the target zone
// because the addCard function can modify the card object.
// because the addCard function can modify the card object.
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment