Commit 0dd1db53 authored by nekrozar's avatar nekrozar

update

parent 42418b3e
...@@ -231,7 +231,7 @@ public: ...@@ -231,7 +231,7 @@ public:
void set_material(card_set* materials); void set_material(card_set* materials);
void add_card_target(card* pcard); void add_card_target(card* pcard);
void cancel_card_target(card* pcard); void cancel_card_target(card* pcard);
void filter_effect(int32 code, effect_set* eset, uint8 sort = TRUE); void filter_effect(int32 code, effect_set* eset, uint8 sort = TRUE);
void filter_single_effect(int32 code, effect_set* eset, uint8 sort = TRUE); void filter_single_effect(int32 code, effect_set* eset, uint8 sort = TRUE);
void filter_single_continuous_effect(int32 code, effect_set* eset, uint8 sort = TRUE); void filter_single_continuous_effect(int32 code, effect_set* eset, uint8 sort = TRUE);
...@@ -247,7 +247,7 @@ public: ...@@ -247,7 +247,7 @@ public:
int32 fusion_check(group* fusion_m, card* cg, uint32 chkf); int32 fusion_check(group* fusion_m, card* cg, uint32 chkf);
void fusion_select(uint8 playerid, group* fusion_m, card* cg, uint32 chkf); void fusion_select(uint8 playerid, group* fusion_m, card* cg, uint32 chkf);
int32 check_fusion_substitute(card* fcard); int32 check_fusion_substitute(card* fcard);
int32 check_unique_code(card* pcard); int32 check_unique_code(card* pcard);
void get_unique_target(card_set* cset, int32 controler); void get_unique_target(card_set* cset, int32 controler);
int32 is_summonable_card(); int32 is_summonable_card();
...@@ -375,7 +375,8 @@ public: ...@@ -375,7 +375,8 @@ public:
#define RACE_PSYCHO 0x100000 // #define RACE_PSYCHO 0x100000 //
#define RACE_DEVINE 0x200000 // #define RACE_DEVINE 0x200000 //
#define RACE_CREATORGOD 0x400000 // #define RACE_CREATORGOD 0x400000 //
#define RACE_PHANTOMDRAGON 0x800000 // #define RACE_WYRM 0x800000 //
#define RACE_CYBERS 0x1000000 //
//Reason //Reason
#define REASON_DESTROY 0x1 // #define REASON_DESTROY 0x1 //
#define REASON_RELEASE 0x2 // #define REASON_RELEASE 0x2 //
......
...@@ -390,8 +390,8 @@ int32 field::select_place(uint16 step, uint8 playerid, uint32 flag, uint8 count) ...@@ -390,8 +390,8 @@ int32 field::select_place(uint16 step, uint8 playerid, uint32 flag, uint8 count)
p = returns.bvalue[pt]; p = returns.bvalue[pt];
l = returns.bvalue[pt + 1]; l = returns.bvalue[pt + 1];
s = returns.bvalue[pt + 2]; s = returns.bvalue[pt + 2];
if((p != 0 && p != 1) if((p != 0 && p != 1)
|| ((l != LOCATION_MZONE) && (l != LOCATION_SZONE)) || ((l != LOCATION_MZONE) && (l != LOCATION_SZONE))
|| ((0x1u << s) & (flag >> (((p == playerid) ? 0 : 16) + ((l == LOCATION_MZONE) ? 0 : 8))))) { || ((0x1u << s) & (flag >> (((p == playerid) ? 0 : 16) + ((l == LOCATION_MZONE) ? 0 : 8))))) {
pduel->write_buffer8(MSG_RETRY); pduel->write_buffer8(MSG_RETRY);
return FALSE; return FALSE;
...@@ -715,7 +715,7 @@ int32 field::sort_card(int16 step, uint8 playerid, uint8 is_chain) { ...@@ -715,7 +715,7 @@ int32 field::sort_card(int16 step, uint8 playerid, uint8 is_chain) {
int32 field::announce_race(int16 step, uint8 playerid, int32 count, int32 available) { int32 field::announce_race(int16 step, uint8 playerid, int32 count, int32 available) {
if(step == 0) { if(step == 0) {
int32 scount = 0; int32 scount = 0;
for(int32 ft = 0x1; ft != 0x1000000; ft <<= 1) { for(int32 ft = 0x1; ft != 0x2000000; ft <<= 1) {
if(ft & available) if(ft & available)
scount++; scount++;
} }
...@@ -731,7 +731,7 @@ int32 field::announce_race(int16 step, uint8 playerid, int32 count, int32 availa ...@@ -731,7 +731,7 @@ int32 field::announce_race(int16 step, uint8 playerid, int32 count, int32 availa
} else { } else {
int32 rc = returns.ivalue[0]; int32 rc = returns.ivalue[0];
int32 sel = 0; int32 sel = 0;
for(int32 ft = 0x1; ft != 0x1000000; ft <<= 1) { for(int32 ft = 0x1; ft != 0x2000000; ft <<= 1) {
if(!(ft & rc)) continue; if(!(ft & rc)) continue;
if(!(ft & available)) { if(!(ft & available)) {
pduel->write_buffer8(MSG_RETRY); pduel->write_buffer8(MSG_RETRY);
......
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