Skip to content

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

Merge branch 'master' into server

parents 0c1d0a62 d21e3fd1
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
.ci/pack-linux-dlc.sh
View file @ 8618fc1a
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
set -x set -x
set -o errexit set -o errexit
ARCHIVE_FILES=(ygopro lib cards.cdb locales fonts strings.conf system.conf) ARCHIVE_FILES=(ygopro lib cards.cdb locales fonts sound textures strings.conf system.conf)
TARGET_PLATFORM=linux TARGET_PLATFORM=linux
......
.ci/pack-macos-dlc.sh
View file @ 8618fc1a
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
set -x set -x
set -o errexit set -o errexit
ARCHIVE_FILES=(ygopro.app cards.cdb locales fonts strings.conf system.conf) ARCHIVE_FILES=(ygopro.app cards.cdb locales fonts sound textures strings.conf system.conf)
TARGET_PLATFORM=darwin TARGET_PLATFORM=darwin
......
.ci/pack-windows-dlc.sh
View file @ 8618fc1a
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
set -x set -x
set -o errexit set -o errexit
ARCHIVE_FILES=(ygopro.exe cards.cdb locales fonts strings.conf system.conf) ARCHIVE_FILES=(ygopro.exe cards.cdb locales fonts sound textures strings.conf system.conf)
TARGET_PLATFORM=win32 TARGET_PLATFORM=win32
......
gframe/deck_manager.cpp
View file @ 8618fc1a
...@@ -73,7 +73,7 @@ const std::unordered_map<int, int>* DeckManager::GetLFListContent(int lfhash) { ...@@ -73,7 +73,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