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
1f2641d5
Commit
1f2641d5
authored
Apr 26, 2015
by
Zach
Browse files
Merge pull request #1023 from poixen/server_p_t_fix
Fixed issue with non creature perms set to 0/0
parents
ecaaa9ee
9c1e509a
Changes
1
Hide whitespace changes
Inline
Side-by-side
common/server_card.cpp
View file @
1f2641d5
...
@@ -23,7 +23,7 @@
...
@@ -23,7 +23,7 @@
#include
"pb/serverinfo_card.pb.h"
#include
"pb/serverinfo_card.pb.h"
Server_Card
::
Server_Card
(
QString
_name
,
int
_id
,
int
_coord_x
,
int
_coord_y
,
Server_CardZone
*
_zone
)
Server_Card
::
Server_Card
(
QString
_name
,
int
_id
,
int
_coord_x
,
int
_coord_y
,
Server_CardZone
*
_zone
)
:
zone
(
_zone
),
id
(
_id
),
coord_x
(
_coord_x
),
coord_y
(
_coord_y
),
name
(
_name
),
tapped
(
false
),
attacking
(
false
),
facedown
(
false
),
color
(
QString
()),
power
(
0
),
toughness
(
0
),
annotation
(
QString
()),
destroyOnZoneChange
(
false
),
doesntUntap
(
false
),
parentCard
(
0
)
:
zone
(
_zone
),
id
(
_id
),
coord_x
(
_coord_x
),
coord_y
(
_coord_y
),
name
(
_name
),
tapped
(
false
),
attacking
(
false
),
facedown
(
false
),
color
(
QString
()),
power
(
-
1
),
toughness
(
-
1
),
annotation
(
QString
()),
destroyOnZoneChange
(
false
),
doesntUntap
(
false
),
parentCard
(
0
)
{
{
}
}
...
@@ -42,8 +42,8 @@ void Server_Card::resetState()
...
@@ -42,8 +42,8 @@ void Server_Card::resetState()
counters
.
clear
();
counters
.
clear
();
setTapped
(
false
);
setTapped
(
false
);
setAttacking
(
false
);
setAttacking
(
false
);
power
=
0
;
power
=
-
1
;
toughness
=
0
;
toughness
=
-
1
;
setAnnotation
(
QString
());
setAnnotation
(
QString
());
setDoesntUntap
(
false
);
setDoesntUntap
(
false
);
}
}
...
@@ -90,7 +90,6 @@ void Server_Card::setPT(const QString &_pt)
...
@@ -90,7 +90,6 @@ void Server_Card::setPT(const QString &_pt)
if
((
p1
[
0
]
==
'+'
)
||
(
p2
[
0
]
==
'+'
))
if
((
p1
[
0
]
==
'+'
)
||
(
p2
[
0
]
==
'+'
))
if
(
toughness
<
0
)
if
(
toughness
<
0
)
toughness
=
0
;
toughness
=
0
;
if
(
p1
[
0
]
==
'+'
)
if
(
p1
[
0
]
==
'+'
)
power
+=
p1
.
mid
(
1
).
toInt
();
power
+=
p1
.
mid
(
1
).
toInt
();
else
else
...
...
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