use unsigned in bitwise operator (#608)

card.cpp

@@ -350,7 +350,7 @@ int32 card::get_infos(byte* buf, uint32 query_flag, int32 use_cache) {
 	if(query_flag & QUERY_COUNTERS) {
 		buffer_write<int32_t>(p, (int32_t)counters.size());
 		for (const auto& cmit : counters) {
-			uint32 tdata = cmit.first + ((uint32)cmit.second << 16);
+			uint32 tdata = cmit.first | ((uint32)cmit.second << 16);
 			buffer_write<uint32_t>(p, tdata);
 		}
 	}
@@ -2156,7 +2156,7 @@ void card::reset(uint32 id, uint32 reset_type) {
 		}
 		if(id & RESET_DISABLE) {
 			for(auto cmit = counters.begin(); cmit != counters.end();) {
-				if ((uint32)cmit->first & COUNTER_WITHOUT_PERMIT) {
+				if (cmit->first & COUNTER_WITHOUT_PERMIT) {
 					++cmit;
 					continue;
 				}
@@ -2410,7 +2410,7 @@ int32 card::is_can_add_counter(uint8 playerid, uint16 countertype, uint16 count,
 		return FALSE;
 	if (!loc && (!(current.location & LOCATION_ONFIELD) || !is_position(POS_FACEUP)))
 		return FALSE;
-	uint32 check = (uint32)countertype & COUNTER_WITHOUT_PERMIT;
+	uint32 check = countertype & COUNTER_WITHOUT_PERMIT;
 	if(!check) {
 		filter_effect(EFFECT_COUNTER_PERMIT + countertype, &eset);
 		for(int32 i = 0; i < eset.size(); ++i) {
@@ -2561,7 +2561,7 @@ void card::set_special_summon_status(effect* peffect) {
 		effect_set eset;
 		pcard->filter_effect(EFFECT_ADD_SETCODE, &eset);
 		for(int32 i = 0; i < eset.size(); ++i) {
-			spsummon.setcode.push_back((uint32)eset[i]->get_value(pcard) & 0xffff);
+			spsummon.setcode.push_back(eset[i]->get_value(pcard) & 0xffffU);
 		}
 		spsummon.reason_effect = peffect;
 		spsummon.reason_player = peffect->get_handler_player();
@@ -2580,7 +2580,7 @@ void card::set_special_summon_status(effect* peffect) {
 		effect_set eset;
 		pcard->filter_effect(EFFECT_ADD_SETCODE, &eset);
 		for(int32 i = 0; i < eset.size(); ++i) {
-			spsummon.setcode.push_back((uint32)eset[i]->get_value(pcard) & 0xffff);
+			spsummon.setcode.push_back(eset[i]->get_value(pcard) & 0xffffU);
 		}
 		spsummon.reason_effect = cait->triggering_effect;
 		spsummon.reason_player = cait->triggering_player;

card.h

@@ -393,31 +393,31 @@ public:
 };
 
 //Summon Type in summon_info
-#define SUMMON_TYPE_NORMAL		0x10000000
-#define SUMMON_TYPE_ADVANCE		0x11000000
-#define SUMMON_TYPE_FLIP		0x20000000
-#define SUMMON_TYPE_SPECIAL		0x40000000
-#define SUMMON_TYPE_FUSION		0x43000000
-#define SUMMON_TYPE_RITUAL		0x45000000
-#define SUMMON_TYPE_SYNCHRO		0x46000000
-#define SUMMON_TYPE_XYZ			0x49000000
-#define SUMMON_TYPE_PENDULUM	0x4a000000
-#define SUMMON_TYPE_LINK		0x4c000000
+#define SUMMON_TYPE_NORMAL		0x10000000U
+#define SUMMON_TYPE_ADVANCE		0x11000000U
+#define SUMMON_TYPE_FLIP		0x20000000U
+#define SUMMON_TYPE_SPECIAL		0x40000000U
+#define SUMMON_TYPE_FUSION		0x43000000U
+#define SUMMON_TYPE_RITUAL		0x45000000U
+#define SUMMON_TYPE_SYNCHRO		0x46000000U
+#define SUMMON_TYPE_XYZ			0x49000000U
+#define SUMMON_TYPE_PENDULUM	0x4a000000U
+#define SUMMON_TYPE_LINK		0x4c000000U
 
 //Gemini Summon
-#define SUMMON_TYPE_DUAL		0x12000000
+#define SUMMON_TYPE_DUAL		0x12000000U
 
 //bitfield blocks
-#define SUMMON_VALUE_MAIN_TYPE		0xf0000000
-#define SUMMON_VALUE_SUB_TYPE		0x0f000000
-#define SUMMON_VALUE_LOCATION		0x00ff0000
-#define SUMMON_VALUE_CUSTOM_TYPE	0x0000ffff
+#define SUMMON_VALUE_MAIN_TYPE		0xf0000000U
+#define SUMMON_VALUE_SUB_TYPE		0x0f000000U
+#define SUMMON_VALUE_LOCATION		0x00ff0000U
+#define SUMMON_VALUE_CUSTOM_TYPE	0x0000ffffU
 constexpr uint32 DEFAULT_SUMMON_TYPE = SUMMON_VALUE_MAIN_TYPE | SUMMON_VALUE_SUB_TYPE | SUMMON_VALUE_CUSTOM_TYPE;
 
 #define SUMMON_VALUE_FUTURE_FUSION	0x18
 
 //Counter
-#define COUNTER_WITHOUT_PERMIT	0x1000
+#define COUNTER_WITHOUT_PERMIT	0x1000U
 //#define COUNTER_NEED_ENABLE		0x2000
 
 //Assume

field.cpp

@@ -1978,12 +1978,12 @@ void field::get_overlay_group(uint8 self, uint8 s, uint8 o, card_set* pset) {
 }
 int32 field::get_overlay_count(uint8 self, uint8 s, uint8 o) {
 	uint8 c = s;
-	uint32 count = 0;
+	int32 count = 0;
 	for(int32 p = 0; p < 2; ++p) {
 		if(c) {
 			for(auto& pcard : player[self].list_mzone) {
 				if(pcard && !pcard->get_status(STATUS_SUMMONING | STATUS_SPSUMMON_STEP))
-					count += (uint32)pcard->xyz_materials.size();
+					count += (int32)pcard->xyz_materials.size();
 			}
 		}
 		self = 1 - self;
@@ -3034,12 +3034,12 @@ int32 field::is_player_can_draw(uint8 playerid) {
 	return !is_player_affected_by_effect(playerid, EFFECT_CANNOT_DRAW);
 }
 int32 field::is_player_can_discard_deck(uint8 playerid, int32 count) {
-	if(player[playerid].list_main.size() < (uint32)count)
+	if(count < 0 || (int32)player[playerid].list_main.size() < count)
 		return FALSE;
 	return !is_player_affected_by_effect(playerid, EFFECT_CANNOT_DISCARD_DECK);
 }
 int32 field::is_player_can_discard_deck_as_cost(uint8 playerid, int32 count) {
-	if(player[playerid].list_main.size() < (uint32)count)
+	if(count < 0 || (int32)player[playerid].list_main.size() < count)
 		return FALSE;
 	if(is_player_affected_by_effect(playerid, EFFECT_CANNOT_DISCARD_DECK))
 		return FALSE;