Merge branch 'master' of https://github.com/Fluorohydride/ygopro-core

card.cpp

@@ -144,18 +144,6 @@ card::card(duel* pd) {
 	spsummon_code = 0;
 	current.controler = PLAYER_NONE;
 }
-card::~card() {
-	indexer.clear();
-	relations.clear();
-	counters.clear();
-	equiping_cards.clear();
-	material_cards.clear();
-	single_effect.clear();
-	field_effect.clear();
-	equip_effect.clear();
-	xmaterial_effect.clear();
-	relate_effect.clear();
-}
 uint32 card::get_infos(byte* buf, int32 query_flag, int32 use_cache) {
 	int32* p = (int32*)buf;
 	int32 tdata = 0;

card.h

@@ -195,7 +195,7 @@ public:
 	effect_set_v immune_effect;
 
 	explicit card(duel* pd);
-	~card();
+	~card() = default;
 	static bool card_operation_sort(card* c1, card* c2);
 	const bool is_extra_deck_monster() { return !!(data.type & (TYPE_FUSION | TYPE_SYNCHRO | TYPE_XYZ | TYPE_LINK)); }
 

effect.cpp

@@ -51,9 +51,6 @@ effect::effect(duel* pd) {
 	target = 0;
 	value = 0;
 	operation = 0;
-}
-effect::~effect() {
-
 }
 int32 effect::is_disable_related() {
 	if (code == EFFECT_IMMUNE_EFFECT || code == EFFECT_DISABLE || code == EFFECT_CANNOT_DISABLE || code == EFFECT_FORBIDDEN)

effect.h

@@ -63,7 +63,7 @@ public:
 	int32 operation;
 
 	explicit effect(duel* pd);
-	~effect();
+	~effect() = default;
 
 	int32 is_disable_related();
 	int32 is_can_be_forbidden();

effectset.h

@@ -101,6 +101,7 @@ struct effect_set_v {
 	effect*& at(int index) {
 		return container[index];
 	}
+private:
 	std::vector<effect*> container;
 	int count;
 };

field.cpp

@@ -106,9 +106,6 @@ field::field(duel* pduel) {
 	nil_event.reason = 0;
 	nil_event.reason_effect = 0;
 	nil_event.reason_player = PLAYER_NONE;
-}
-field::~field() {
-
 }
 void field::reload_field_info() {
 	pduel->write_buffer8(MSG_RELOAD_FIELD);

field.h

@@ -347,7 +347,7 @@ public:
 
 	static int32 field_used_count[32];
 	explicit field(duel* pduel);
-	~field();
+	~field() = default;
 	void reload_field_info();
 
 	void add_card(uint8 playerid, card* pcard, uint8 location, uint8 sequence, uint8 pzone = FALSE);

group.cpp

@@ -25,6 +25,3 @@ group::group(duel* pd, const card_set& cset): container(cset) {
 	pduel = pd;
 	is_readonly = FALSE;
 }
-group::~group() {
-
-}

group.h

@@ -31,7 +31,7 @@ public:
 	explicit group(duel* pd);
 	group(duel* pd, card* pcard);
 	group(duel* pd, const card_set& cset);
-	~group();
+	~group() = default;
 };
 
 #endif /* GROUP_H_ */

processor.cpp

@@ -4923,7 +4923,7 @@ int32 field::refresh_location_info(uint16 step) {
 		return FALSE;
 	}
 	case 1: {
-		if(core.disfield_effects.count == 0) {
+		if(core.disfield_effects.size() == 0) {
 			core.units.begin()->step = 2;
 			return FALSE;
 		}
@@ -4957,7 +4957,7 @@ int32 field::refresh_location_info(uint16 step) {
 	}
 	case 3: {
 		// If the blocking number is not reached, we should block more slots.
-		if(core.extram_effects.count == 0) {
+		if(core.extram_effects.size() == 0) {
 			core.units.begin()->step = 4;
 			return FALSE;
 		}
@@ -4997,7 +4997,7 @@ int32 field::refresh_location_info(uint16 step) {
 	}
 	case 5: {
 		// EFFECT_USE_EXTRA_SZONE version
-		if(core.extras_effects.count == 0) {
+		if(core.extras_effects.size() == 0) {
 			core.units.begin()->step = 6;
 			return FALSE;
 		}