Skip to content

Y
ygopro-core
Commit ed67d74c authored by wind2009's avatar wind2009
Browse files
Options

Merge remote-tracking branch 'upstream/master' into develop

parents 97254828 a898e08e
Show whitespace changes
Inline Side-by-side
Showing with 1 addition and 2 deletions
card.cpp
View file @ ed67d74c
...@@ -1557,7 +1557,6 @@ uint32 card::get_select_info_location(uint8 *deck_seq_pointer) { ...@@ -1557,7 +1557,6 @@ uint32 card::get_select_info_location(uint8 *deck_seq_pointer) {
int32 card::is_treated_as_not_on_field() { int32 card::is_treated_as_not_on_field() {
return get_status(STATUS_SUMMONING | STATUS_SUMMON_DISABLED | STATUS_ACTIVATE_DISABLED | STATUS_SPSUMMON_STEP); return get_status(STATUS_SUMMONING | STATUS_SUMMON_DISABLED | STATUS_ACTIVATE_DISABLED | STATUS_SPSUMMON_STEP);
} }
void card::equip(card* target, uint32 send_msg) { void card::equip(card* target, uint32 send_msg) {
if (equiping_target) if (equiping_target)
return; return;
......
card.h
View file @ ed67d74c
...@@ -269,9 +269,9 @@ public: ...@@ -269,9 +269,9 @@ public:
uint32 get_column_zone(int32 location); uint32 get_column_zone(int32 location);
void get_column_cards(card_set* cset); void get_column_cards(card_set* cset);
int32 is_all_column(); int32 is_all_column();
int32 is_treated_as_not_on_field();
uint8 get_select_sequence(uint8 *deck_seq_pointer); uint8 get_select_sequence(uint8 *deck_seq_pointer);
uint32 get_select_info_location(uint8 *deck_seq_pointer); uint32 get_select_info_location(uint8 *deck_seq_pointer);
int32 is_treated_as_not_on_field();
void equip(card* target, uint32 send_msg = TRUE); void equip(card* target, uint32 send_msg = TRUE);
void unequip(); void unequip();
......
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