aly/servatrice
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'master' of ssh://cockatrice.git.sourceforge.net/gitroot/cockatrice/cockatrice

Browse source
This commit is contained in:
Max-Wilhelm Bruker 2010-11-09 16:19:41 +01:00
commit 2cf57ad95d
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cockatrice/src/tablezone.h
View file

@ -11,7 +11,7 @@ private:
static const int boxLineWidth = 10; static const int boxLineWidth = 10;
static const int paddingY = 20; static const int paddingY = 20;
static const int marginX = 20; static const int marginX = 20;
static const int minWidth = 20 * CARD_WIDTH / 2; static const int minWidth = 15 * CARD_WIDTH / 2;
QMap<int, int> gridPointWidth; QMap<int, int> gridPointWidth;
int width, height; int width, height;

4
oracle/src/oracleimporter.cpp
View file

@ -116,9 +116,9 @@ CardInfo *OracleImporter::addCard(QString cardName, const QString &cardCost, con
if ((mainCardType == "Land") || mArtifact) if ((mainCardType == "Land") || mArtifact)
tableRow = 0; tableRow = 0;
else if ((mainCardType == "Sorcery") || (mainCardType == "Instant")) else if ((mainCardType == "Sorcery") || (mainCardType == "Instant"))
tableRow = 2;
else if (mainCardType == "Creature")
tableRow = 3; tableRow = 3;
else if (mainCardType == "Creature")
tableRow = 2;
card->setTableRow(tableRow); card->setTableRow(tableRow);
cardHash.insert(cardName, card); cardHash.insert(cardName, card);