fix

card.cpp

@@ -105,7 +105,6 @@ uint32 card::get_infos(byte* buf, int32 query_flag, int32 use_cache) {
 		if(query_flag & QUERY_TYPE) q_cache.type = *p++ = get_type();
 		if(query_flag & QUERY_LEVEL) q_cache.level = *p++ = get_level();
 		if(query_flag & QUERY_RANK) q_cache.rank = *p++ = get_rank();
-		if(query_flag & QUERY_LINK) q_cache.link = *p++ = get_link();
 		if(query_flag & QUERY_ATTRIBUTE) q_cache.attribute = *p++ = get_attribute();
 		if(query_flag & QUERY_RACE) q_cache.race = *p++ = get_race();
 		if(query_flag & QUERY_ATTACK) q_cache.attack = *p++ = get_attack();
@@ -130,11 +129,6 @@ uint32 card::get_infos(byte* buf, int32 query_flag, int32 use_cache) {
 			q_cache.rank = tdata;
 			*p++ = tdata;
 		} else query_flag &= ~QUERY_RANK;
-		if((query_flag & QUERY_LINK) && ((uint32)(tdata = get_link()) != q_cache.link)) {
-			q_cache.link = tdata;
-			*p++ = tdata;
-		}
-		else query_flag &= ~QUERY_LINK;
 		if((query_flag & QUERY_ATTRIBUTE) && ((uint32)(tdata = get_attribute()) != q_cache.attribute)) {
 			q_cache.attribute = tdata;
 			*p++ = tdata;
@@ -202,6 +196,10 @@ uint32 card::get_infos(byte* buf, int32 query_flag, int32 use_cache) {
 	if(!use_cache) {
 		if(query_flag & QUERY_LSCALE) q_cache.lscale = *p++ = get_lscale();
 		if(query_flag & QUERY_RSCALE) q_cache.rscale = *p++ = get_rscale();
+		if(query_flag & QUERY_LINK) {
+			q_cache.link = *p++ = get_link();
+			q_cache.link_marker = *p++ = get_link_marker();
+		}
 	} else {
 		if((query_flag & QUERY_LSCALE) && ((uint32)(tdata = get_lscale()) != q_cache.lscale)) {
 			q_cache.lscale = tdata;
@@ -211,6 +209,12 @@ uint32 card::get_infos(byte* buf, int32 query_flag, int32 use_cache) {
 			q_cache.rscale = tdata;
 			*p++ = tdata;
 		} else query_flag &= ~QUERY_RSCALE;
+		if((query_flag & QUERY_LINK) && ((get_link() != q_cache.link) || (get_link_marker() != q_cache.link_marker))) {
+			q_cache.link = get_link();
+			*p++ = tdata;
+			q_cache.link_marker = get_link_marker();
+			*p++ = tdata;
+		} else query_flag &= ~QUERY_LINK;
 	}
 	*(uint32*)buf = (byte*)p - buf;
 	*(uint32*)(buf + 4) = query_flag;
@@ -1074,13 +1078,13 @@ uint32 card::get_rscale() {
 	temp.rscale = 0xffffffff;
 	return rscale;
 }
-int32 card::get_link_marker() {
+uint32 card::get_link_marker() {
 	if(!(data.type & TYPE_LINK))
 		return 0;
 	return data.link_marker;
 }
-int32 card::is_link_marker(int32 dir) {
-	return get_link_marker() & dir;
+int32 card::is_link_marker(uint32 dir) {
+	return (int32)(get_link_marker() & dir);
 }
 uint32 card::get_linked_zone() {
 	if(!(data.type & TYPE_LINK) || current.location != LOCATION_MZONE)

card.h

@@ -33,7 +33,7 @@ struct card_data {
 	int32 defense;
 	uint32 lscale;
 	uint32 rscale;
-	int32 link_marker;
+	uint32 link_marker;
 };
 
 struct card_state {
@@ -80,6 +80,7 @@ struct query_cache {
 	int32 is_disabled;
 	uint32 lscale;
 	uint32 rscale;
+	uint32 link_marker;
 };
 
 class card {
@@ -190,8 +191,8 @@ public:
 	uint32 get_race();
 	uint32 get_lscale();
 	uint32 get_rscale();
-	int32 get_link_marker();
-	int32 is_link_marker(int32 dir);
+	uint32 get_link_marker();
+	int32 is_link_marker(uint32 dir);
 	uint32 get_linked_zone();
 	void get_linked_cards(card_set* cset);
 	int32 is_position(int32 pos);
@@ -494,13 +495,13 @@ public:
 #define ASSUME_ATTACK		7
 #define ASSUME_DEFENSE		8
 
-#define LINK_MARKER_TOP				0x1
-#define LINK_MARKER_TOP_LEFT		0x2
-#define LINK_MARKER_LEFT			0x4
-#define LINK_MARKER_BOTTOM_LEFT		0x8
-#define LINK_MARKER_BOTTOM			0x10
-#define LINK_MARKER_BOTTOM_RIGHT	0x20
-#define LINK_MARKER_RIGHT			0x40
-#define LINK_MARKER_TOP_RIGHT		0x80
+#define LINK_MARKER_BOTTOM_LEFT		0001
+#define LINK_MARKER_BOTTOM			0002
+#define LINK_MARKER_BOTTOM_RIGHT	0004
+#define LINK_MARKER_LEFT			0010
+#define LINK_MARKER_RIGHT			0040
+#define LINK_MARKER_TOP_LEFT		0100
+#define LINK_MARKER_TOP				0200
+#define LINK_MARKER_TOP_RIGHT		0400
 
 #endif /* CARD_H_ */

field.cpp

@@ -533,17 +533,17 @@ int32 field::get_useable_count_fromex(uint8 playerid, uint8 uplayer, uint32* lis
 	uint32 flag = player[playerid].disabled_location | player[playerid].used_location;
 	uint32 used_flag = player[playerid].used_location;
 	uint32 zones = get_linked_zone(playerid);
-	flag = flag & ~zones & 0x1f;
+	flag = (flag | ~zones) & 0x1f;
 	used_flag = used_flag & 0x1f;
 	int32 used_count = field_used_count[flag];
 	int32 maxcount = 6;
 	if(player[playerid].list_mzone[5] || player[playerid].list_mzone[6]) {
-		flag |= (1 << 5) | (1 << 6);
+		flag |= (1u << 5) | (1u << 6);
 		maxcount = 5;
 	} else if(player[1 - playerid].list_mzone[5])
-		flag |= 1 << 6;
+		flag |= 1u << 6;
 	else if(player[1 - playerid].list_mzone[6])
-		flag |= 1 << 5;
+		flag |= 1u << 5;
 	if(list)
 		*list = flag;
 	int32 count = maxcount - used_count;