sync ocgcore

Classes/ocgcore/common.h

@@ -9,6 +9,7 @@
 #define COMMON_H_
 
 #include <stdint.h>
+#include <assert.h>
 typedef unsigned long long uint64;
 typedef unsigned int uint32;
 typedef unsigned short uint16;

Classes/ocgcore/duel.cpp

@@ -27,6 +27,9 @@ duel::duel() {
 	game_field = new field(this);
 	game_field->temp_card = new_card(0);
 	message_buffer.reserve(SIZE_MESSAGE_BUFFER);
+#ifdef _WIN32
+	_set_error_mode(_OUT_TO_MSGBOX);
+#endif // _WIN32
 }
 duel::~duel() {
 	for(auto& pcard : cards)

Classes/ocgcore/field.cpp

@@ -1091,6 +1091,7 @@ void field::swap_deck_and_grave(uint8 playerid) {
 	}
 	player[playerid].list_extra.insert(player[playerid].list_extra.end() - player[playerid].extra_p_count, ex.begin(), ex.end());
 	reset_sequence(playerid, LOCATION_GRAVE);
+	reset_sequence(playerid, LOCATION_DECK);
 	reset_sequence(playerid, LOCATION_EXTRA);
 	pduel->write_buffer8(MSG_SWAP_GRAVE_DECK);
 	pduel->write_buffer8(playerid);