Minor updates in duel class

edo9300 · Jun 30, 2023 · d5e6766 · d5e6766
1 parent ead20f3
commit d5e6766
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git a/card.cpp b/card.cpp
@@ -3520,7 +3520,7 @@ int32_t card::is_affect_by_effect(effect* peffect) {
 	return TRUE;
 }
 int32_t card::is_can_be_disabled_by_effect(effect* reason_effect, bool is_monster_effect) {
-	if (is_monster_effect && is_status(STATUS_DISABLED))
+	if(is_monster_effect && is_status(STATUS_DISABLED))
 		return FALSE;
 	if(!is_monster_effect && !(get_type() & TYPE_TRAPMONSTER) && is_status(STATUS_DISABLED))
 		return FALSE;

diff --git a/duel.cpp b/duel.cpp
@@ -114,7 +114,7 @@ void duel::restore_assumes() {
 		pcard->assume.clear();
 	assumes.clear();
 }
-void duel::write_buffer(void* data, size_t size) {
+void duel::write_buffer(const void* data, size_t size) {
 	if(size) {
 		const auto vec_size = buff.size();
 		buff.resize(vec_size + size);
@@ -157,7 +157,7 @@ const card_data& duel::read_card(uint32_t code) {
 	}
 	return *ret;
 }
-duel::duel_message::duel_message(uint8_t _message) :message(_message) {
+duel::duel_message::duel_message(uint8_t message) {
 	write<uint8_t>(message);
 }
 void duel::duel_message::write(const void* buff, size_t size) {

diff --git a/duel.h b/duel.h
@@ -51,9 +51,7 @@ class duel {
 		}
 	public:
 		std::vector<uint8_t> data;
-		uint8_t message;
-		duel_message() :message(0) {};
-		duel_message(uint8_t _message);
+		explicit duel_message(uint8_t _message);
 		void write(const void* buff, size_t size);
 		void write(loc_info loc);
 		template<typename T, typename T2>
@@ -105,7 +103,7 @@ class duel {
 	void release_script_group();
 	void restore_assumes();
 	void generate_buffer();
-	void write_buffer(void* data, size_t size);
+	void write_buffer(const void* data, size_t size);
 	void clear_buffer();
 	void set_response(const void* resp, size_t len);
 	int32_t get_next_integer(int32_t l, int32_t h);