Merge branch 'master' into full-view

gframe/deck_manager.cpp

@@ -76,9 +76,9 @@ int DeckManager::IsGameRuleDisallowed(unsigned char hostInfoRule, unsigned int c
 	bool allow_ocg = hostInfoRule == 0 || hostInfoRule == 2; // OCG can be used in OCG and OT duels
 	bool allow_tcg = hostInfoRule == 1 || hostInfoRule == 2; // TCG can be used in TCG and OT duels
 	bool allow_ccg = hostInfoRule == 0 || hostInfoRule == 4 || hostInfoRule == 2; // CCG can be used in OCG, CCG and OT duels
-	if(!allow_ocg && (cardOt & 0x3 == 0x1))
+	if(!allow_ocg && ((cardOt & 0x3) == 0x1))
 		return DECKERROR_OCGONLY;
-	if(!allow_tcg && (cardOt & 0x3 == 0x2))
+	if(!allow_tcg && ((cardOt & 0x3) == 0x2))
 		return DECKERROR_TCGONLY;
 	if(hostInfoRule == 4 && !(cardOt & 0x8) && (cardOt & 0x3)) { // in CCG duels, cards labeled with ither OCG or TCG, but not CCG, would not be allowed.
 		if(cardOt & 0x3 == 0x2) {

ocgcore @ 417edca6

-Subproject commit ac59c3d9c89d019adca39059948ceec8d3dd64f7
+Subproject commit 417edca61cfadad2d6d03a002dcc93012b35579a

script @ 8b82a865

-Subproject commit 2f46131b596d654c8620f9733eec0b671dee1c2f
+Subproject commit 8b82a865db02c71e7910555cfd06eb388a6fc387