Missing changes

gframe/bufferio.h

@@ -7,6 +7,11 @@
 
 class BufferIO {
 public:
+	inline static unsigned long long ReadInt64(char*& p) {
+		unsigned long long ret = *(unsigned long long*)p;
+		p += 8;
+		return ret;
+	}
 	inline static int ReadInt32(char*& p) {
 		int ret = *(int*)p;
 		p += 4;

gframe/client_field.h

@@ -13,7 +13,7 @@ struct ChainInfo {
 	irr::core::vector3df chain_pos;
 	ClientCard* chain_card;
 	int code;
-	int desc;
+	u64 desc;
 	int controler;
 	int location;
 	int sequence;
@@ -40,8 +40,8 @@ public:
 	std::vector<ClientCard*> activatable_cards;
 	std::vector<ClientCard*> attackable_cards;
 	std::vector<ClientCard*> conti_cards;
-	std::vector<std::pair<int,int>> activatable_descs;
-	std::vector<int> select_options;
+	std::vector<std::pair<u64,int>> activatable_descs;
+	std::vector<u64> select_options;
 	std::vector<ChainInfo> chains;
 	int extra_p_count[2];
 

gframe/deck_manager.h

@@ -37,9 +37,9 @@ public:
 
 	void LoadLFList();
 	wchar_t* GetLFListName(int lfhash);
-	int CheckLFList(Deck& deck, int lfhash, bool allow_ocg, bool allow_tcg,bool doubled);
+	int CheckLFList(Deck& deck, int lfhash, bool allow_ocg, bool allow_tcg, bool doubled, int forbiddentypes = 0);
 	int TypeCount(std::vector<code_pointer> cards, int type);
-	void LoadDeck(Deck& deck, int* dbuf, int mainc, int sidec, int mainc2=0, int sidec2=0, bool doubled = false);
+	void LoadDeck(Deck& deck, int* dbuf, int mainc, int sidec, int mainc2 = 0, int sidec2 = 0, bool doubled = false);
 	bool LoadSide(Deck& deck, int* dbuf, int mainc, int sidec);
 	FILE* OpenDeckFile(const wchar_t * file, const char * mode);
 	bool LoadDeck(const wchar_t* file);

gframe/duelclient.h

@@ -29,7 +29,7 @@ private:
 	static char duel_client_read[0x2000];
 	static char duel_client_write[0x2000];
 	static bool is_closing;
-	static int select_hint;
+	static u64 select_hint;
 	static wchar_t event_string[256];
 	static mtrandom rnd;
 public:

gframe/network.h

@@ -24,6 +24,7 @@ struct HostInfo {
 	unsigned short time_limit;
 	unsigned char check;
 	unsigned int duel_flag;
+	int forbiddentypes;
 	bool destiny_draw;
 	bool sealed;
 	bool booster;