Commit 75ed11cf authored by nanahira's avatar nanahira

Merge branch 'patch-ccg' into server_mc

parents 79fe7854 55e81d41
...@@ -79,7 +79,7 @@ int DeckManager::IsGameRuleDisallowed(unsigned char hostInfoRule, unsigned int c ...@@ -79,7 +79,7 @@ int DeckManager::IsGameRuleDisallowed(unsigned char hostInfoRule, unsigned int c
return DECKERROR_OCGONLY; return DECKERROR_OCGONLY;
if(!allow_tcg && ((cardOt & 0x3) == 0x2)) if(!allow_tcg && ((cardOt & 0x3) == 0x2))
return DECKERROR_TCGONLY; return DECKERROR_TCGONLY;
} else if((cardOt & 0x8) && (cardOt & 0x3)) { // in CCG duels, cards labeled with ither OCG or TCG, but not CCG, would not be allowed. } else if(!(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) { if((cardOt & 0x3) == 0x2) {
return DECKERROR_TCGONLY; return DECKERROR_TCGONLY;
} else { } else {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment