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
6b370ce1
Commit
6b370ce1
authored
Jan 21, 2011
by
Max-Wilhelm Bruker
Browse files
allow controller change even from a different zone
parent
2013ba34
Changes
2
Hide whitespace changes
Inline
Side-by-side
cockatrice/src/messagelogwidget.cpp
View file @
6b370ce1
...
...
@@ -198,7 +198,7 @@ void MessageLogWidget::logMoveCard(Player *player, QString cardName, CardZone *s
else
cardStr
=
QString
(
"<font color=
\"
blue
\"
>%1</font>"
).
arg
(
sanitizeHtml
(
cardName
));
if
(
(
start
Name
==
"table"
)
&&
(
targetName
==
"table"
))
{
if
(
start
Zone
->
getPlayer
()
!=
targetZone
->
getPlayer
(
))
{
append
(
tr
(
"%1 gives %2 control over %3."
).
arg
(
sanitizeHtml
(
player
->
getName
())).
arg
(
sanitizeHtml
(
targetZone
->
getPlayer
()
->
getName
())).
arg
(
cardStr
));
return
;
}
...
...
common/server_player.cpp
View file @
6b370ce1
...
...
@@ -235,8 +235,8 @@ public:
ResponseCode
Server_Player
::
moveCard
(
CommandContainer
*
cont
,
Server_CardZone
*
startzone
,
const
QList
<
int
>
&
_cardIds
,
Server_CardZone
*
targetzone
,
int
x
,
int
y
,
bool
faceDown
,
bool
tapped
)
{
// Disallow controller change
between different zones
.
if
((
s
tartzone
->
get
Nam
e
()
!=
targetzone
->
getName
())
&&
(
startzone
->
getPlayer
()
!=
targetzone
->
getPlayer
()))
// Disallow controller change
to other zones than the table
.
if
((
(
tar
ge
tzone
->
get
Typ
e
()
!=
PublicZone
)
||
!
targetzone
->
hasCoords
())
&&
(
startzone
->
getPlayer
()
!=
targetzone
->
getPlayer
()))
return
RespContextError
;
if
(
!
targetzone
->
hasCoords
()
&&
(
x
==
-
1
))
...
...
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