Commit 673d4af0 authored by salix5's avatar salix5

card: use default member initializer

parent c0bc9404
...@@ -40,34 +40,31 @@ struct card_data { ...@@ -40,34 +40,31 @@ struct card_data {
}; };
struct card_state { struct card_state {
card_state() uint32 code{ 0 };
: code(0), code2(0), type(0), level(0), rank(0), link(0), lscale(0), rscale(0), attribute(0), race(0), attack(0), defense(0), base_attack(0), base_defense(0), uint32 code2{ 0 };
controler(PLAYER_NONE), location(0), sequence(0), position(0), reason(0), pzone(false), reason_card(nullptr), reason_player(PLAYER_NONE), reason_effect(nullptr) {}
uint32 code;
uint32 code2;
std::vector<uint32> setcode; std::vector<uint32> setcode;
uint32 type; uint32 type{ 0 };
uint32 level; uint32 level{ 0 };
uint32 rank; uint32 rank{ 0 };
uint32 link; uint32 link{ 0 };
uint32 lscale; uint32 lscale{ 0 };
uint32 rscale; uint32 rscale{ 0 };
uint32 attribute; uint32 attribute{ 0 };
uint32 race; uint32 race{ 0 };
int32 attack; int32 attack{ 0 };
int32 defense; int32 defense{ 0 };
int32 base_attack; int32 base_attack{ 0 };
int32 base_defense; int32 base_defense{ 0 };
uint8 controler; uint8 controler{ PLAYER_NONE };
uint8 location; uint8 location{ 0 };
uint8 sequence; uint8 sequence{ 0 };
uint8 position; uint8 position{ 0 };
uint32 reason; uint32 reason{ 0 };
bool pzone; bool pzone{ false };
card* reason_card; card* reason_card{ nullptr };
uint8 reason_player; uint8 reason_player{ PLAYER_NONE };
effect* reason_effect; effect* reason_effect{ nullptr };
bool is_location(int32 loc) const; bool is_location(int32 loc) const;
inline bool is_main_mzone() const { inline bool is_main_mzone() const {
return location == LOCATION_MZONE && sequence >= 0 && sequence <= 4; return location == LOCATION_MZONE && sequence >= 0 && sequence <= 4;
...@@ -100,23 +97,19 @@ struct query_cache { ...@@ -100,23 +97,19 @@ struct query_cache {
struct material_info { struct material_info {
// Synchron // Synchron
card* limit_tuner; card* limit_tuner{ nullptr };
group* limit_syn; group* limit_syn{ nullptr };
int32 limit_syn_minc; int32 limit_syn_minc{ 0 };
int32 limit_syn_maxc; int32 limit_syn_maxc{ 0 };
// Xyz // Xyz
group* limit_xyz; group* limit_xyz{ nullptr };
int32 limit_xyz_minc; int32 limit_xyz_minc{ 0 };
int32 limit_xyz_maxc; int32 limit_xyz_maxc{ 0 };
// Link // Link
group* limit_link; group* limit_link{ nullptr };
card* limit_link_card; card* limit_link_card{ nullptr };
int32 limit_link_minc; int32 limit_link_minc{ 0 };
int32 limit_link_maxc; int32 limit_link_maxc{ 0 };
material_info()
: limit_tuner(nullptr), limit_syn(nullptr), limit_syn_minc(0), limit_syn_maxc(0), limit_xyz(nullptr), limit_xyz_minc(0), limit_xyz_maxc(0),
limit_link(nullptr), limit_link_card(nullptr), limit_link_minc(0), limit_link_maxc(0) {}
}; };
const material_info null_info; const material_info null_info;
......
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