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
9ba5d796
Commit
9ba5d796
authored
Jul 29, 2014
by
Waleed Khan
Browse files
Stop clobbering tokens.xml tokens; don't let Oracle read tokens into cards.xml.
parent
8df7e9f1
Changes
3
Hide whitespace changes
Inline
Side-by-side
cockatrice/src/carddatabase.cpp
View file @
9ba5d796
...
@@ -620,7 +620,7 @@ void CardDatabase::loadSetsFromXml(QXmlStreamReader &xml)
...
@@ -620,7 +620,7 @@ void CardDatabase::loadSetsFromXml(QXmlStreamReader &xml)
}
}
}
}
void
CardDatabase
::
loadCardsFromXml
(
QXmlStreamReader
&
xml
)
void
CardDatabase
::
loadCardsFromXml
(
QXmlStreamReader
&
xml
,
bool
tokens
)
{
{
while
(
!
xml
.
atEnd
())
{
while
(
!
xml
.
atEnd
())
{
if
(
xml
.
readNext
()
==
QXmlStreamReader
::
EndElement
)
if
(
xml
.
readNext
()
==
QXmlStreamReader
::
EndElement
)
...
@@ -665,7 +665,10 @@ void CardDatabase::loadCardsFromXml(QXmlStreamReader &xml)
...
@@ -665,7 +665,10 @@ void CardDatabase::loadCardsFromXml(QXmlStreamReader &xml)
else
if
(
xml
.
name
()
==
"token"
)
else
if
(
xml
.
name
()
==
"token"
)
isToken
=
xml
.
readElementText
().
toInt
();
isToken
=
xml
.
readElementText
().
toInt
();
}
}
addCard
(
new
CardInfo
(
this
,
name
,
isToken
,
manacost
,
type
,
pt
,
text
,
colors
,
loyalty
,
cipt
,
tableRow
,
sets
,
muids
));
if
(
isToken
==
tokens
)
{
addCard
(
new
CardInfo
(
this
,
name
,
isToken
,
manacost
,
type
,
pt
,
text
,
colors
,
loyalty
,
cipt
,
tableRow
,
sets
,
muids
));
}
}
}
}
}
}
}
...
@@ -684,7 +687,7 @@ CardInfo *CardDatabase::getCardFromMap(CardNameMap &cardMap, const QString &card
...
@@ -684,7 +687,7 @@ CardInfo *CardDatabase::getCardFromMap(CardNameMap &cardMap, const QString &card
return
0
;
return
0
;
}
}
LoadStatus
CardDatabase
::
loadFromFile
(
const
QString
&
fileName
)
LoadStatus
CardDatabase
::
loadFromFile
(
const
QString
&
fileName
,
bool
tokens
)
{
{
QFile
file
(
fileName
);
QFile
file
(
fileName
);
file
.
open
(
QIODevice
::
ReadOnly
);
file
.
open
(
QIODevice
::
ReadOnly
);
...
@@ -707,7 +710,7 @@ LoadStatus CardDatabase::loadFromFile(const QString &fileName)
...
@@ -707,7 +710,7 @@ LoadStatus CardDatabase::loadFromFile(const QString &fileName)
if
(
xml
.
name
()
==
"sets"
)
if
(
xml
.
name
()
==
"sets"
)
loadSetsFromXml
(
xml
);
loadSetsFromXml
(
xml
);
else
if
(
xml
.
name
()
==
"cards"
)
else
if
(
xml
.
name
()
==
"cards"
)
loadCardsFromXml
(
xml
);
loadCardsFromXml
(
xml
,
tokens
);
}
}
}
}
}
}
...
@@ -778,7 +781,7 @@ LoadStatus CardDatabase::loadCardDatabase(const QString &path, bool tokens)
...
@@ -778,7 +781,7 @@ LoadStatus CardDatabase::loadCardDatabase(const QString &path, bool tokens)
{
{
LoadStatus
tempLoadStatus
=
NotLoaded
;
LoadStatus
tempLoadStatus
=
NotLoaded
;
if
(
!
path
.
isEmpty
())
if
(
!
path
.
isEmpty
())
tempLoadStatus
=
loadFromFile
(
path
);
tempLoadStatus
=
loadFromFile
(
path
,
tokens
);
if
(
tempLoadStatus
==
Ok
)
{
if
(
tempLoadStatus
==
Ok
)
{
SetList
allSets
;
SetList
allSets
;
...
...
cockatrice/src/carddatabase.h
View file @
9ba5d796
...
@@ -203,7 +203,7 @@ protected:
...
@@ -203,7 +203,7 @@ protected:
LoadStatus
loadStatus
;
LoadStatus
loadStatus
;
private:
private:
static
const
int
versionNeeded
;
static
const
int
versionNeeded
;
void
loadCardsFromXml
(
QXmlStreamReader
&
xml
);
void
loadCardsFromXml
(
QXmlStreamReader
&
xml
,
bool
tokens
);
void
loadSetsFromXml
(
QXmlStreamReader
&
xml
);
void
loadSetsFromXml
(
QXmlStreamReader
&
xml
);
CardInfo
*
getCardFromMap
(
CardNameMap
&
cardMap
,
const
QString
&
cardName
,
bool
createIfNotFound
);
CardInfo
*
getCardFromMap
(
CardNameMap
&
cardMap
,
const
QString
&
cardName
,
bool
createIfNotFound
);
...
@@ -224,7 +224,7 @@ public:
...
@@ -224,7 +224,7 @@ public:
CardSet
*
getSet
(
const
QString
&
setName
);
CardSet
*
getSet
(
const
QString
&
setName
);
QList
<
CardInfo
*>
getCardList
()
const
{
return
cards
.
values
();
}
QList
<
CardInfo
*>
getCardList
()
const
{
return
cards
.
values
();
}
SetList
getSetList
()
const
;
SetList
getSetList
()
const
;
LoadStatus
loadFromFile
(
const
QString
&
fileName
);
LoadStatus
loadFromFile
(
const
QString
&
fileName
,
bool
tokens
=
false
);
bool
saveToFile
(
const
QString
&
fileName
,
bool
tokens
=
false
);
bool
saveToFile
(
const
QString
&
fileName
,
bool
tokens
=
false
);
QStringList
getAllColors
()
const
;
QStringList
getAllColors
()
const
;
QStringList
getAllMainCardTypes
()
const
;
QStringList
getAllMainCardTypes
()
const
;
...
...
oracle/src/oracleimporter.cpp
View file @
9ba5d796
...
@@ -210,11 +210,13 @@ int OracleImporter::importTextSpoiler(CardSet *set, const QVariant &data)
...
@@ -210,11 +210,13 @@ int OracleImporter::importTextSpoiler(CardSet *set, const QVariant &data)
}
}
}
}
CardInfo
*
card
=
addCard
(
set
->
getShortName
(),
cardName
,
cardIsToken
,
cardId
,
cardCost
,
cardType
,
cardPT
,
cardLoyalty
,
cardText
.
split
(
"
\n
"
));
if
(
!
cardIsToken
)
{
CardInfo
*
card
=
addCard
(
set
->
getShortName
(),
cardName
,
cardIsToken
,
cardId
,
cardCost
,
cardType
,
cardPT
,
cardLoyalty
,
cardText
.
split
(
"
\n
"
));
if
(
!
set
->
contains
(
card
))
{
if
(
!
set
->
contains
(
card
))
{
card
->
addToSet
(
set
);
card
->
addToSet
(
set
);
cards
++
;
cards
++
;
}
}
}
}
}
...
...
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