Skip to content

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

Merge branch 'master' into server

parents 8537eec0 f25417da
Show whitespace changes
Inline Side-by-side
Showing with 5 additions and 3 deletions
gframe/deck_manager.cpp
View file @ f7050ecd
...@@ -73,6 +73,8 @@ const std::unordered_map<int, int>* DeckManager::GetLFListContent(int lfhash) { ...@@ -73,6 +73,8 @@ const std::unordered_map<int, int>* DeckManager::GetLFListContent(int lfhash) {
return nullptr; return nullptr;
} }
static int checkAvail(int ot, int avail) { static int checkAvail(int ot, int avail) {
if(!!(ot && 0x4))
return 0;
if((ot & avail) == avail) if((ot & avail) == avail)
return 0; return 0;
if((ot & AVAIL_OCG) && !(avail == AVAIL_OCG)) if((ot & AVAIL_OCG) && !(avail == AVAIL_OCG))
......
gframe/game.h
View file @ f7050ecd
...@@ -875,10 +875,10 @@ extern unsigned int pre_seed[3]; ...@@ -875,10 +875,10 @@ extern unsigned int pre_seed[3];
#define TEXTURE_ATTACK 5 #define TEXTURE_ATTACK 5
#define TEXTURE_ACTIVATE 6 #define TEXTURE_ACTIVATE 6
#define AVAIL_OCG 0x5 #define AVAIL_OCG 0x1
#define AVAIL_TCG 0x6 #define AVAIL_TCG 0x2
#define AVAIL_CUSTOM 0x4 #define AVAIL_CUSTOM 0x4
#define AVAIL_SC 0xc #define AVAIL_SC 0x8
#define AVAIL_OCGTCG (AVAIL_OCG|AVAIL_TCG) #define AVAIL_OCGTCG (AVAIL_OCG|AVAIL_TCG)
#ifndef DEFAULT_DUEL_RULE #ifndef DEFAULT_DUEL_RULE
......
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