fix

gframe/client_card.cpp

@@ -17,6 +17,7 @@ ClientCard::ClientCard() {
 	is_showtarget = false;
 	is_highlighting = false;
 	is_disabled = false;
+	is_reversed = false;
 	cmdFlag = 0;
 	code = 0;
 	type = 0;

gframe/client_card.h

@@ -58,6 +58,7 @@ public:
 	bool is_showequip;
 	bool is_showtarget;
 	bool is_highlighting;
+	bool is_reversed;
 	u32 code;
 	u32 alias;
 	u32 type;

gframe/client_field.cpp

@@ -148,6 +148,7 @@ void ClientField::AddCard(ClientCard* pcard, int controler, int location, int se
 			deck[controler][0] = pcard;
 			pcard->sequence = 0;
 		}
+		pcard->is_reversed = false;
 		break;
 	}
 	case LOCATION_HAND: {
@@ -636,7 +637,7 @@ void ClientField::GetCardLocation(ClientCard* pcard, irr::core::vector3df* t, ir
 			t->X = 7.3f;
 			t->Y = 3.0f;
 			t->Z = 0.01f + 0.01f * sequence;
-			if(!deck_reversed) {
+			if(deck_reversed == pcard->is_reversed) {
 				r->X = 0.0f;
 				r->Y = 3.1415926f;
 				r->Z = 0.0f;
@@ -649,7 +650,7 @@ void ClientField::GetCardLocation(ClientCard* pcard, irr::core::vector3df* t, ir
 			t->X = 0.6f;
 			t->Y = -3.0f;
 			t->Z = 0.01f + 0.01f * sequence;
-			if(!deck_reversed) {
+			if(deck_reversed == pcard->is_reversed) {
 				r->X = 0.0f;
 				r->Y = 3.1415926f;
 				r->Z = 3.1415926f;

gframe/duelclient.cpp

@@ -1562,8 +1562,10 @@ int DuelClient::ClientAnalyze(char * msg, unsigned int len) {
 				mainGame->WaitFrameSignal(10);
 			}
 		}
-		for (int i = 0; i < mainGame->dField.deck[player].size(); ++i)
+		for (int i = 0; i < mainGame->dField.deck[player].size(); ++i) {
 			mainGame->dField.deck[player][i]->code = 0;
+			mainGame->dField.deck[player][i]->is_reversed = false;
+		}
 		if(!mainGame->dInfo.isReplay || !mainGame->dInfo.isReplaySkiping) {
 			for (int i = 0; i < 5; ++i) {
 				for (auto cit = mainGame->dField.deck[player].begin(); cit != mainGame->dField.deck[player].end(); ++cit) {
@@ -1666,7 +1668,10 @@ int DuelClient::ClientAnalyze(char * msg, unsigned int len) {
 		int player = mainGame->LocalPlayer(BufferIO::ReadInt8(pbuf));
 		int seq = BufferIO::ReadInt8(pbuf);
 		int code = BufferIO::ReadInt32(pbuf);
-		mainGame->dField.GetCard(player, LOCATION_DECK, mainGame->dField.deck[player].size() - 1 - seq)->SetCode(code);
+		ClientCard* pcard = mainGame->dField.GetCard(player, LOCATION_DECK, mainGame->dField.deck[player].size() - 1 - seq);
+		pcard->is_reversed = (code & 0x80000000) != 0;
+		pcard->SetCode(code & 0x7fffff);
+		mainGame->dField.GetCardLocation(pcard, &pcard->curPos, &pcard->curRot, true);
 		return true;
 	}
 	case MSG_SHUFFLE_SET_CARD: {

ocgcore/field.cpp

@@ -139,16 +139,18 @@ void field::add_card(uint8 playerid, card* pcard, uint8 location, uint8 sequence
 		if (sequence == 0) {		//deck top
 			player[playerid].list_main.push_back(pcard);
 			pcard->current.sequence = player[playerid].list_main.size() - 1;
+			pcard->current.position = POS_FACEUP_ATTACK;
 		} else if (sequence == 1) {		//deck button
 			player[playerid].list_main.insert(player[playerid].list_main.begin(), pcard);
 			reset_sequence(playerid, LOCATION_DECK);
+			pcard->current.position = POS_FACEDOWN;
 		} else {		//deck top & shuffle
 			player[playerid].list_main.push_back(pcard);
 			pcard->current.sequence = player[playerid].list_main.size() - 1;
 			if(!core.shuffle_check_disabled)
 				core.shuffle_deck_check[playerid] = TRUE;
+			pcard->current.position = POS_FACEDOWN;
 		}
-		pcard->current.position = POS_FACEDOWN;
 		break;
 	case LOCATION_HAND:
 		player[playerid].list_hand.push_back(pcard);
@@ -455,7 +457,7 @@ int32 field::get_useable_count(uint8 playerid, uint8 location, uint8 uplayer, ui
 	}
 }
 void field::shuffle(uint8 playerid, uint8 location) {
-	if(!(location & (LOCATION_HAND + LOCATION_DECK)))
+	if(!(location & (LOCATION_HAND | LOCATION_DECK)))
 		return;
 	card_vector& svector = (location == LOCATION_HAND) ? player[playerid].list_hand : player[playerid].list_main;
 	if(svector.size() == 0)
@@ -469,6 +471,9 @@ void field::shuffle(uint8 playerid, uint8 location) {
 			core.shuffle_hand_check[playerid] = FALSE;
 			return;
 		}
+	} else {
+		for(auto cit = svector.begin(); cit != svector.end(); ++cit)
+			(*cit)->current.position = POS_FACEDOWN;
 	}
 	if(location == LOCATION_HAND || !(core.duel_options & DUEL_PSEUDO_SHUFFLE)) {
 		if(svector.size() > 1) {

ocgcore/operations.cpp

@@ -2518,29 +2518,39 @@ int32 field::send_to(uint16 step, group * targets, effect * reason_effect, uint3
 			cv.push_back(*cit);
 		if(cv.size() > 1)
 			std::sort(cv.begin(), cv.end(), card::card_operation_sort);
-		if(core.deck_reversed) {
-			int32 d0 = player[0].list_main.size() - 1, s0 = d0;
-			int32 d1 = player[1].list_main.size() - 1, s1 = d1;
-			for(uint32 i = 0; i < cv.size(); ++i) {
-				card* pcard = cv[i];
-				if(pcard->current.location != LOCATION_DECK)
-					continue;
-				if((pcard->current.controler == 0) && (pcard->current.sequence == s0))
-					s0--;
-				if((pcard->current.controler == 1) && (pcard->current.sequence == s1))
-					s1--;
-			}
-			if((s0 != d0) && (s0 > 0)) {
+		int32 d0 = player[0].list_main.size() - 1, s0 = d0;
+		int32 d1 = player[1].list_main.size() - 1, s1 = d1;
+		for(uint32 i = 0; i < cv.size(); ++i) {
+			card* pcard = cv[i];
+			if(pcard->current.location != LOCATION_DECK)
+				continue;
+			if((pcard->current.controler == 0) && (pcard->current.sequence == s0))
+				s0--;
+			if((pcard->current.controler == 1) && (pcard->current.sequence == s1))
+				s1--;
+		}
+		if((s0 != d0) && (s0 > 0)) {
+			card* ptop = player[0].list_main[s0];
+			if(core.deck_reversed || (ptop->current.position == POS_FACEUP_DEFENCE)) {
 				pduel->write_buffer8(MSG_DECK_TOP);
 				pduel->write_buffer8(0);
 				pduel->write_buffer8(d0 - s0);
-				pduel->write_buffer32(player[0].list_main[s0]->data.code);
+				if(ptop->current.position != POS_FACEUP_DEFENCE)
+					pduel->write_buffer32(ptop->data.code);
+				else
+					pduel->write_buffer32(ptop->data.code | 0x80000000);
 			}
-			if((s1 != d1) && (s1 > 0)) {
+		}
+		if((s1 != d1) && (s1 > 0)) {
+			card* ptop = player[0].list_main[s0];
+			if(core.deck_reversed || (ptop->current.position == POS_FACEUP_DEFENCE)) {
 				pduel->write_buffer8(MSG_DECK_TOP);
 				pduel->write_buffer8(1);
 				pduel->write_buffer8(d1 - s1);
-				pduel->write_buffer32(player[1].list_main[s1]->data.code);
+				if(ptop->current.position != POS_FACEUP_DEFENCE)
+					pduel->write_buffer32(ptop->data.code);
+				else
+					pduel->write_buffer32(ptop->data.code | 0x80000000);
 			}
 		}
 		for (auto cvit = cv.begin(); cvit != cv.end(); ++cvit) {
@@ -2933,14 +2943,20 @@ int32 field::move_to_field(uint16 step, card * target, uint32 enable, uint32 ret
 		return FALSE;
 	}
 	case 2: {
-		if(core.deck_reversed && (target->current.location == LOCATION_DECK)) {
+		if(target->current.location == LOCATION_DECK) {
 			uint32 curp = target->current.controler;
 			uint32 curs = target->current.sequence;
 			if(curs > 0 && (curs == player[curp].list_main.size() - 1)) {
-				pduel->write_buffer8(MSG_DECK_TOP);
-				pduel->write_buffer8(curp);
-				pduel->write_buffer8(1);
-				pduel->write_buffer32(player[curp].list_main[curs - 1]->data.code);
+				card* ptop = player[curp].list_main[curs - 1];
+				if(core.deck_reversed || (ptop->current.position == POS_FACEUP_DEFENCE)) {
+					pduel->write_buffer8(MSG_DECK_TOP);
+					pduel->write_buffer8(curp);
+					pduel->write_buffer8(1);
+					if(ptop->current.position != POS_FACEUP_DEFENCE)
+						pduel->write_buffer32(ptop->data.code);
+					else
+						pduel->write_buffer32(ptop->data.code | 0x80000000);
+				}
 			}
 		}
 		pduel->write_buffer8(MSG_MOVE);