fix merge conflict

gframe/data_manager.cpp

@@ -39,7 +39,8 @@ bool DataManager::LoadDB(const char* file) {
 			cd.attribute = sqlite3_column_int(pStmt, 9);
 			cd.category = sqlite3_column_int(pStmt, 10);
 			_datas.insert(std::make_pair(cd.code, cd));
-			len = BufferIO::DecodeUTF8((const char*)sqlite3_column_text(pStmt, 12), strBuffer);
+			/*
+            len = BufferIO::DecodeUTF8((const char*)sqlite3_column_text(pStmt, 12), strBuffer);
 			if(len) {
 				cs.name = new wchar_t[len + 1];
 				memcpy(cs.name, strBuffer, (len + 1)*sizeof(wchar_t));

gframe/game.h

@@ -105,17 +105,15 @@ public:
 	void AddChatMsg(wchar_t* msg, int player);
 	void ClearTextures();
 	void CloseDuelWindow();
-    */
     */
 	int LocalPlayer(int player);
 	const wchar_t* LocalName(int local_player);
 
 	/*
     bool HasFocus(EGUI_ELEMENT_TYPE type) const {
-		irr::gui::IGUIElement* focus = env->getFocus();
+		//irr::gui::IGUIElement* focus = env->getFocus();
 		return focus && focus->hasType(type);
 	}
-    */
     */
     
 	Mutex gMutex;
@@ -129,8 +127,7 @@ public:
 	Config gameConf;
 	DuelInfo dInfo;
 
-	/*
-    std::list<FadingUnit> fadingList;
+	/*std::list<FadingUnit> fadingList;
 	std::vector<int> logParam;
 	std::wstring chatMsg[8];
 
@@ -162,7 +159,6 @@ public:
 
 	bool is_building;
 	bool is_siding;
-    */
     */
 	/*
     ClientField dField;

gframe/gframe.cpp

@@ -41,7 +41,7 @@ int main(int argc, char* argv[]) {
 			ygo::start_lp=atoi(argv[8]);
 			ygo::start_hand=atoi(argv[9]);
 			ygo::draw_count=atoi(argv[10]);
-            ygo::time_limit=atoi(argv[11]);
+			ygo::time_limit=atoi(argv[11]);
 		}
 		ygo::mainGame = &_game;
 		ygo::mainGame->MainServerLoop(ygo::mode, ygo::lflist);
@@ -90,5 +90,6 @@ int main(int argc, char* argv[]) {
 #else
     
 #endif //_WIN32
+    */
 	return EXIT_SUCCESS;
 }

gframe/netserver.cpp

@@ -48,8 +48,8 @@ void NetServer::Initduel(int bDuel_mode, int lflist)
 		if(!hash)
 			pkt->info.lflist = deckManager._lfList[0].hash;
 		
-        if(lflist == -1)
- 			pkt->info.lflist = 0;
+		if(lflist == -1)
+			pkt->info.lflist = 0;
 		duel_mode->host_info = pkt->info;
 		BufferIO::CopyWStr(pkt->name, duel_mode->name, 20);
 		BufferIO::CopyWStr(pkt->pass, duel_mode->pass, 20);

gframe/single_duel.cpp

@@ -368,7 +368,7 @@ void SingleDuel::StartDuel(DuelPlayer* dp) {
 		(*oit)->state = CTOS_LEAVE_GAME;
 		NetServer::ReSendToPlayer(*oit);
 	}
-	started_hand = true;
+    started_hand = true;
 	NetServer::SendPacketToPlayer(players[0], STOC_SELECT_HAND);
 	NetServer::ReSendToPlayer(players[1]);
 	hand_result[0] = 0;

gframe/single_mode.cpp

@@ -790,7 +790,7 @@ int SingleMode::MessageHandler(long fduel, int type) {
 	if(enable_log == 1) {
 		wchar_t wbuf[1024];
 		BufferIO::DecodeUTF8(msgbuf, wbuf);
-		//mainGame->AddChatMsg(wbuf, 9);
+		mainGame->AddChatMsg(wbuf, 9);
 	} else if(enable_log == 2) {
 		FILE* fp = fopen("error.log", "at");
 		if(!fp)

gframe/tag_duel.cpp

@@ -326,7 +326,7 @@ void TagDuel::StartDuel(DuelPlayer* dp) {
 		(*oit)->state = CTOS_LEAVE_GAME;
 		NetServer::ReSendToPlayer(*oit);
 	}
-	started_hand_tag = true;
+    started_hand_tag = true;
 	NetServer::SendPacketToPlayer(players[0], STOC_SELECT_HAND);
 	NetServer::ReSendToPlayer(players[2]);
 	hand_result[0] = 0;