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
cb045907
Commit
cb045907
authored
Apr 16, 2010
by
Max-Wilhelm Bruker
Browse files
minor fixes; ROE set added
parent
57aa30ff
Changes
4
Hide whitespace changes
Inline
Side-by-side
cockatrice/src/carditem.cpp
View file @
cb045907
...
...
@@ -127,12 +127,15 @@ void CardItem::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
}
else
{
if
((
event
->
screenPos
()
-
event
->
buttonDownScreenPos
(
Qt
::
LeftButton
)).
manhattanLength
()
<
2
*
QApplication
::
startDragDistance
())
return
;
if
(
!
owner
->
getLocal
())
return
;
bool
faceDown
=
event
->
modifiers
().
testFlag
(
Qt
::
ShiftModifier
)
||
facedown
;
createDragItem
(
id
,
event
->
pos
(),
event
->
scenePos
(),
faceDown
);
dragItem
->
grabMouse
();
CardZone
*
zone
=
(
CardZone
*
)
parentItem
();
CardZone
*
zone
=
static_cast
<
CardZone
*
>
(
parentItem
()
)
;
QList
<
QGraphicsItem
*>
sel
=
scene
()
->
selectedItems
();
int
j
=
0
;
...
...
cockatrice/src/playerlistwidget.cpp
View file @
cb045907
...
...
@@ -47,11 +47,12 @@ void PlayerListWidget::updatePlayerProperties(ServerInfo_PlayerProperties *prop)
player
->
setText
(
3
,
prop
->
getName
());
QString
deckText
;
switch
(
prop
->
getDeckId
())
{
case
-
2
:
deckText
=
tr
(
"no deck"
);
break
;
case
-
1
:
deckText
=
tr
(
"local deck"
);
break
;
default:
deckText
=
tr
(
"ID #%1"
).
arg
(
prop
->
getDeckId
());
}
if
(
!
prop
->
getSpectator
())
switch
(
prop
->
getDeckId
())
{
case
-
2
:
deckText
=
tr
(
"no deck"
);
break
;
case
-
1
:
deckText
=
tr
(
"local deck"
);
break
;
default:
deckText
=
tr
(
"ID #%1"
).
arg
(
prop
->
getDeckId
());
}
player
->
setText
(
4
,
deckText
);
}
...
...
common/serializable_item.h
View file @
cb045907
#ifndef SERIALIZABLE_ITEM_H
#define SERIALIZABLE_ITEM_H
#include
<QtCore/QXmlStreamWriter>
#include
<QObject>
#include
<QMap>
#include
<QList>
...
...
oracle/sets.xml
View file @
cb045907
<?xml version="1.0" encoding="UTF-8"?>
<cockatrice_setdatabase
version=
"20
091017
"
>
<cockatrice_setdatabase
version=
"20
100416
"
>
<picture_url>
http://www.wizards.com/global/images/magic/general/%1.jpg
</picture_url>
<set_url>
http://gatherer.wizards.com/Pages/Search/Default.aspx?output=spoiler
&
method=text
&
set=[
"
!longname!
"
]
</set_url>
<set
import=
"1"
>
...
...
@@ -294,4 +294,8 @@
<name>
ZEN
</name>
<longname>
Zendikar
</longname>
</set>
<set
import=
"1"
>
<name>
ROE
</name>
<longname>
Rise of the Eldrazi
</longname>
</set>
</cockatrice_setdatabase>
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