fix wrong merged code

Classes/gframe/deck_con.h

@@ -26,7 +26,7 @@ public:
 	void ClearSearch();
 	void SortList();
 
-	void RefreshDeckList(bool showPack);\\
+	void RefreshDeckList(bool showPack);//
 	void RefreshReadonly(int catesel);
 	void RefreshPackListScroll();
 	void ChangeCategory(int catesel);

Classes/gframe/deck_manager.h

@@ -45,7 +45,7 @@ public:
 	int CheckDeck(Deck& deck, int lfhash, int rule);
 	int LoadDeck(Deck& deck, int* dbuf, int mainc, int sidec, bool is_packlist = false);
 	bool LoadSide(Deck& deck, int* dbuf, int mainc, int sidec);
-	void GetCategoryPath(wchar_t* ret, int index, const wchar_t* text, bool showPack);\\
+	void GetCategoryPath(wchar_t* ret, int index, const wchar_t* text, bool showPack);//
 	void GetDeckFile(wchar_t* ret, irr::gui::IGUIComboBox* cbCategory, irr::gui::IGUIComboBox* cbDeck);
 	bool LoadDeck(irr::gui::IGUIComboBox* cbCategory, irr::gui::IGUIComboBox* cbDeck);
 	FILE* OpenDeckFile(const wchar_t* file, const char* mode);

Classes/gframe/duelclient.cpp

@@ -1863,7 +1863,7 @@ int DuelClient::ClientAnalyze(unsigned char* msg, unsigned int len) {
 			SetResponseI(positions);
 			return true;
 		}
-		int count = 0, filter = 0x1, startpos;
+		int count = 0, filter = 0x1, startpos = 30;
 		while(filter != 0x10) {
 			if(positions & filter) count++;
 			filter <<= 1;

Classes/gframe/game.cpp

@@ -2122,8 +2122,9 @@ void Game::CloseDuelWindow() {
 	ClearTextures();
 	closeDoneSignal.Set();
 }
-int Game::LocalPlayer(int player) {
-	return dInfo.isFirst ? player : 1 - player;
+int Game::LocalPlayer(int player) const {
+	int pid = player ? 1 : 0;
+	return dInfo.isFirst ? pid : 1 - pid;
 }
 const wchar_t* Game::LocalName(int local_player) {
 	return local_player == 0 ? dInfo.hostname : dInfo.clientname;