Skip to content

Y
ygopro
Commit f16a5a68 authored by nanahira's avatar nanahira
Browse files
Options

Merge branch 'patch-ccg' into server_mc

parents 42bf5ee6 a94f9b84
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
gframe/deck_manager.cpp
View file @ f16a5a68
...@@ -72,7 +72,7 @@ const std::unordered_map<int, int>* DeckManager::GetLFListContent(int lfhash) { ...@@ -72,7 +72,7 @@ const std::unordered_map<int, int>* DeckManager::GetLFListContent(int lfhash) {
return nullptr; return nullptr;
} }
int DeckManager::IsGameRuleDisallowed(unsigned char hostInfoRule, unsigned int cardOt) { int DeckManager::IsGameRuleDisallowed(unsigned char hostInfoRule, unsigned int cardOt) {
bool allow_ocg = hostInfoRule == 0 || hostInfoRule == 2; // OCG can be used in OCG and OT duels bool allow_ocg = hostInfoRule == 0 || hostInfoRule == 4 || 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_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 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))
......
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