Commit 4c33fa91 authored by Chen Bill's avatar Chen Bill Committed by GitHub

change cardid to uint64_t (#719)

* change cardid to uint64_t

* workaround: alignas(8) group
parent dc19f5ff
...@@ -54,10 +54,10 @@ struct card_state { ...@@ -54,10 +54,10 @@ struct card_state {
uint8_t sequence{ 0 }; uint8_t sequence{ 0 };
uint8_t position{ 0 }; uint8_t position{ 0 };
uint32_t reason{ 0 }; uint32_t reason{ 0 };
bool pzone{ false };
card* reason_card{ nullptr }; card* reason_card{ nullptr };
uint8_t reason_player{ PLAYER_NONE };
effect* reason_effect{ nullptr }; effect* reason_effect{ nullptr };
uint8_t reason_player{ PLAYER_NONE };
bool pzone{ false };
bool is_location(uint32_t loc) const; bool is_location(uint32_t loc) const;
bool is_main_mzone() const { bool is_main_mzone() const {
...@@ -168,7 +168,7 @@ public: ...@@ -168,7 +168,7 @@ public:
uint8_t attacked_count{}; uint8_t attacked_count{};
uint8_t attack_all_target{}; uint8_t attack_all_target{};
uint8_t attack_controler{}; uint8_t attack_controler{};
uint16_t cardid{}; uint64_t cardid{};
uint32_t fieldid{}; uint32_t fieldid{};
uint32_t fieldid_r{}; uint32_t fieldid_r{};
uint16_t turnid{}; uint16_t turnid{};
......
...@@ -123,11 +123,11 @@ struct field_effect { ...@@ -123,11 +123,11 @@ struct field_effect {
grant_effect_container grant_effect; grant_effect_container grant_effect;
}; };
struct field_info { struct field_info {
uint64_t card_id{ 1 };
int32_t field_id{ 1 }; int32_t field_id{ 1 };
uint16_t copy_id{ 1 }; uint16_t copy_id{ 1 };
uint16_t turn_id{}; uint16_t turn_id{};
uint16_t turn_id_by_player[2]{}; uint16_t turn_id_by_player[2]{};
uint16_t card_id{ 1 };
uint16_t phase{}; uint16_t phase{};
uint8_t turn_player{}; uint8_t turn_player{};
uint8_t priorities[2]{}; uint8_t priorities[2]{};
......
...@@ -18,17 +18,17 @@ class duel; ...@@ -18,17 +18,17 @@ class duel;
using card_set = std::set<card*, card_sort>; using card_set = std::set<card*, card_sort>;
constexpr int GTYPE_DEFAULT = 0; constexpr uint32_t GTYPE_DEFAULT = 0;
constexpr int GTYPE_READ_ONLY = 1; constexpr uint32_t GTYPE_READ_ONLY = 1;
constexpr int GTYPE_KEEP_ALIVE = 2; constexpr uint32_t GTYPE_KEEP_ALIVE = 2;
class group { class alignas(8) group {
public: public:
int32_t ref_handle{ 0 };
uint32_t is_readonly{ GTYPE_DEFAULT };
duel* pduel; duel* pduel;
card_set container; card_set container;
card_set::iterator it; card_set::iterator it;
int32_t ref_handle{ 0 };
uint32_t is_readonly{ GTYPE_DEFAULT };
bool is_iterator_dirty{ true }; bool is_iterator_dirty{ true };
bool has_card(card* c) { bool has_card(card* c) {
......
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