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

cockatrice/src/tablezone.h

@@ -11,7 +11,7 @@ private:
 	static const int boxLineWidth = 10;
 	static const int paddingY = 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;
 	int width, height;

oracle/src/oracleimporter.cpp

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