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
662df6d9
Commit
662df6d9
authored
Mar 24, 2012
by
Max-Wilhelm Bruker
Browse files
Merge branch 'devel' of
git://github.com/mbruker/Cockatrice
into devel
parents
adbb6077
10d958c4
Changes
4
Hide whitespace changes
Inline
Side-by-side
cockatrice/src/carddatabase.cpp
View file @
662df6d9
...
...
@@ -14,6 +14,8 @@
#include
<QNetworkRequest>
#include
<QDebug>
const
int
CardDatabase
::
versionNeeded
=
2
;
CardSet
::
CardSet
(
const
QString
&
_shortName
,
const
QString
&
_longName
)
:
shortName
(
_shortName
),
longName
(
_longName
)
{
...
...
@@ -604,6 +606,8 @@ bool CardDatabase::loadFromFile(const QString &fileName)
if
(
xml
.
readNext
()
==
QXmlStreamReader
::
StartElement
)
{
if
(
xml
.
name
()
!=
"cockatrice_carddatabase"
)
return
false
;
if
(
xml
.
attributes
().
value
(
"version"
).
toString
().
toInt
()
<
versionNeeded
)
return
false
;
while
(
!
xml
.
atEnd
())
{
if
(
xml
.
readNext
()
==
QXmlStreamReader
::
EndElement
)
break
;
...
...
@@ -628,7 +632,7 @@ bool CardDatabase::saveToFile(const QString &fileName)
xml
.
setAutoFormatting
(
true
);
xml
.
writeStartDocument
();
xml
.
writeStartElement
(
"cockatrice_carddatabase"
);
xml
.
writeAttribute
(
"version"
,
"1"
);
xml
.
writeAttribute
(
"version"
,
QString
::
number
(
versionNeeded
)
);
xml
.
writeStartElement
(
"sets"
);
QHashIterator
<
QString
,
CardSet
*>
setIterator
(
setHash
);
...
...
cockatrice/src/carddatabase.h
View file @
662df6d9
...
...
@@ -165,6 +165,7 @@ protected:
QThread
*
pictureLoaderThread
;
PictureLoader
*
pictureLoader
;
private:
static
const
int
versionNeeded
;
void
loadCardsFromXml
(
QXmlStreamReader
&
xml
);
void
loadSetsFromXml
(
QXmlStreamReader
&
xml
);
public:
...
...
cockatrice/src/carditem.cpp
View file @
662df6d9
...
...
@@ -34,6 +34,9 @@ CardItem::~CardItem()
{
prepareDelete
();
if
(
scene
())
static_cast
<
GameScene
*>
(
scene
())
->
unregisterAnimationItem
(
this
);
delete
cardMenu
;
delete
ptMenu
;
delete
moveMenu
;
...
...
oracle/src/oracleimporter.cpp
View file @
662df6d9
...
...
@@ -92,7 +92,8 @@ CardInfo *OracleImporter::addCard(const QString &setName,
if
(
cardName
.
contains
(
"XX"
))
cardName
.
remove
(
"XX"
);
cardName
=
cardName
.
replace
(
"Æ"
,
"AE"
);
cardName
=
cardName
.
replace
(
"’"
,
"'"
);
CardInfo
*
card
;
if
(
cardHash
.
contains
(
cardName
))
{
card
=
cardHash
.
value
(
cardName
);
...
...
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