bug fix

8eccc80f · argon.sun · 8c64b588 · 8eccc80f
Commit 8eccc80f authored Dec 07, 2011 by argon.sun
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 0 deletions

gframe/deck_manager.cpp gframe/deck_manager.cpp +4 -0

No files found.
--- a/gframe/deck_manager.cpp
+++ b/gframe/deck_manager.cpp
@@ -102,6 +102,10 @@ void DeckManager::LoadDeck(Deck& deck, int* dbuf, int mainc, int sidec) {
 	}
 	for(int i = 0; i < sidec; ++i) {
 		code = dbuf[mainc + i];
+		if(!mainGame->dataManager.GetData(code, &cd))
+			continue;
+		if(cd.type & TYPE_TOKEN)
+			continue;
 		if(deck.side.size() < 15)
 			deck.side.push_back(mainGame->dataManager.GetCodePointer(code));
 	}