jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-07-14 14:32:15 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Skip cards with empty names when loading xml

Browse source
This commit is contained in:
RickyRister 2025-06-24 21:22:13 -07:00
parent 66e44f3448
commit 95a771a249
2 changed files with 10 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

5
cockatrice/src/game/cards/card_database_parser/cockatrice_xml_3.cpp
View file

@ -268,6 +268,11 @@ void CockatriceXml3Parser::loadCardsFromXml(QXmlStreamReader &xml)
} }
} }
if (name.isEmpty()) {
qCWarning(CockatriceXml3Log) << "Encountered card with empty name; skipping";
continue;
}
properties.insert("colors", colors); properties.insert("colors", colors);
CardInfoPtr newCard = CardInfoPtr newCard =
CardInfo::newInstance(name, text, isToken, properties, relatedCards, reverseRelatedCards, _sets, cipt, CardInfo::newInstance(name, text, isToken, properties, relatedCards, reverseRelatedCards, _sets, cipt,

5
cockatrice/src/game/cards/card_database_parser/cockatrice_xml_4.cpp
View file

@ -247,6 +247,11 @@ void CockatriceXml4Parser::loadCardsFromXml(QXmlStreamReader &xml)
} }
} }
if (name.isEmpty()) {
qCWarning(CockatriceXml4Log) << "Encountered card with empty name; skipping";
continue;
}
CardInfoPtr newCard = CardInfoPtr newCard =
CardInfo::newInstance(name, text, isToken, properties, relatedCards, reverseRelatedCards, _sets, cipt, CardInfo::newInstance(name, text, isToken, properties, relatedCards, reverseRelatedCards, _sets, cipt,
landscapeOrientation, tableRow, upsideDown); landscapeOrientation, tableRow, upsideDown);