Merge branch 'master' of https://github.com/Fluorohydride/ygopro

gframe/duelclient.cpp

@@ -641,15 +641,7 @@ void DuelClient::HandleSTOCPacketLan(char* data, unsigned int len) {
 		mainGame->gMutex.Lock();
 		mainGame->stHostPrepDuelist[pkt->pos]->setText(name);
 		mainGame->gMutex.Unlock();
-#ifdef _WIN32
-		FLASHWINFO fi;
-		fi.cbSize = sizeof(FLASHWINFO);
-		fi.hwnd = mainGame->hWnd;
-		fi.dwFlags = FLASHW_TRAY | FLASHW_TIMERNOFG;
-		fi.uCount = 0;
-		fi.dwTimeout = 0;
-		FlashWindowEx(&fi);
-#endif
+		mainGame->FlashWindow();
 		break;
 	}
 	case STOC_HS_PLAYER_CHANGE: {

gframe/game.cpp

@@ -71,17 +71,13 @@ bool Game::Initialize() {
 	device->setWindowCaption(L"YGOPro");
 	device->setResizable(false);
 #ifdef _WIN32
-	HINSTANCE hInstance = (HINSTANCE)GetModuleHandle(NULL);
-	HICON hSmallIcon = (HICON)LoadImage(hInstance, MAKEINTRESOURCE(1), IMAGE_ICON, 16, 16, LR_DEFAULTCOLOR);
-	HICON hBigIcon = (HICON)LoadImage(hInstance, MAKEINTRESOURCE(1), IMAGE_ICON, 32, 32, LR_DEFAULTCOLOR);
 	irr::video::SExposedVideoData exposedData = driver->getExposedVideoData();
 	if(gameConf.use_d3d)
 		hWnd = reinterpret_cast<HWND>(exposedData.D3D9.HWnd);
 	else
 		hWnd = reinterpret_cast<HWND>(exposedData.OpenGLWin32.HWnd);
-	SendMessage(hWnd, WM_SETICON, ICON_SMALL, (long)hSmallIcon);
-	SendMessage(hWnd, WM_SETICON, ICON_BIG, (long)hBigIcon);
 #endif
+	SetWindowsIcon();
 	//main menu
 	wchar_t strbuf[256];
 	myswprintf(strbuf, L"YGOPro Version:%X.0%X.%X", PRO_VERSION >> 12, (PRO_VERSION >> 4) & 0xff, PRO_VERSION & 0xf);
@@ -1155,5 +1151,25 @@ int Game::LocalPlayer(int player) {
 const wchar_t* Game::LocalName(int local_player) {
 	return local_player == 0 ? dInfo.hostname : dInfo.clientname;
 }
+void Game::SetWindowsIcon() {
+#ifdef _WIN32
+	HINSTANCE hInstance = (HINSTANCE)GetModuleHandleW(NULL);
+	HICON hSmallIcon = (HICON)LoadImageW(hInstance, MAKEINTRESOURCEW(1), IMAGE_ICON, 16, 16, LR_DEFAULTCOLOR);
+	HICON hBigIcon = (HICON)LoadImageW(hInstance, MAKEINTRESOURCEW(1), IMAGE_ICON, 32, 32, LR_DEFAULTCOLOR);
+	SendMessageW(hWnd, WM_SETICON, ICON_SMALL, (long)hSmallIcon);
+	SendMessageW(hWnd, WM_SETICON, ICON_BIG, (long)hBigIcon);
+#endif
+}
+void Game::FlashWindow() {
+#ifdef _WIN32
+	FLASHWINFO fi;
+	fi.cbSize = sizeof(FLASHWINFO);
+	fi.hwnd = hWnd;
+	fi.dwFlags = FLASHW_TRAY | FLASHW_TIMERNOFG;
+	fi.uCount = 0;
+	fi.dwTimeout = 0;
+	FlashWindowEx(&fi);
+#endif
+}
 
 }

gframe/game.h

@@ -114,6 +114,9 @@ public:
 		return focus && focus->hasType(type);
 	}
 
+	void SetWindowsIcon();
+	void FlashWindow();
+
 	Mutex gMutex;
 	Mutex gBuffer;
 	Signal frameSignal;

strings.conf

@@ -451,7 +451,7 @@
 !counter 0x1021 守卫指示物
 !counter 0x22 龙神指示物
 !counter 0x23 海洋指示物
-!counter 0x1024 弦指示物
+!counter 0x1024 线指示物
 !counter 0x25 年代记指示物
 !counter 0x26 指示物（金属射手）
 !counter 0x27 指示物（死亡蚊）