Merge branch 'server' into server-develop

gframe/data_manager.h

@@ -54,13 +54,13 @@ public:
 	string_pointer strings_begin;
 	string_pointer strings_end;
 
-	wchar_t numStrings[301][4];
-	wchar_t numBuffer[6];
-	wchar_t attBuffer[128];
-	wchar_t racBuffer[128];
-	wchar_t tpBuffer[128];
-	wchar_t scBuffer[128];
-	wchar_t lmBuffer[32];
+	wchar_t numStrings[301][4]{};
+	wchar_t numBuffer[6]{};
+	wchar_t attBuffer[128]{};
+	wchar_t racBuffer[128]{};
+	wchar_t tpBuffer[128]{};
+	wchar_t scBuffer[128]{};
+	wchar_t lmBuffer[32]{};
 
 	static byte scriptBuffer[0x20000];
 	static const wchar_t* unknown_string;

gframe/duelclient.cpp

@@ -4300,8 +4300,8 @@ void DuelClient::BeginRefreshHost() {
 		SOCKET sSend = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
 		if(sSend == INVALID_SOCKET)
 			break;
-		BOOL opt = TRUE;
-		setsockopt(sSend, SOL_SOCKET, SO_BROADCAST, (const char*)&opt, sizeof(BOOL));
+		int opt = TRUE;
+		setsockopt(sSend, SOL_SOCKET, SO_BROADCAST, (const char*)&opt, sizeof opt);
 		if(bind(sSend, (sockaddr*)&local, sizeof(sockaddr)) == SOCKET_ERROR) {
 			closesocket(sSend);
 			break;

gframe/game.cpp

@@ -274,7 +274,7 @@ bool Game::Initialize() {
 	SetWindowsIcon();
 	//main menu
 	wchar_t strbuf[256];
-	myswprintf(strbuf, L"KoishiPro %X.0%X.%X Selenadia", PRO_VERSION >> 12, (PRO_VERSION >> 4) & 0xff, PRO_VERSION & 0xf);
+	myswprintf(strbuf, L"KoishiPro %X.0%X.%X Snowdream", PRO_VERSION >> 12, (PRO_VERSION >> 4) & 0xff, PRO_VERSION & 0xf);
 	wMainMenu = env->addWindow(rect<s32>(370, 200, 650, 415), false, strbuf);
 	wMainMenu->getCloseButton()->setVisible(false);
 	btnLanMode = env->addButton(rect<s32>(10, 30, 270, 60), wMainMenu, BUTTON_LAN_MODE, dataManager.GetSysString(1200));
@@ -900,7 +900,7 @@ bool Game::Initialize() {
 	btnCategoryOK = env->addButton(rect<s32>(150, 210, 250, 235), wCategories, BUTTON_CATEGORY_OK, dataManager.GetSysString(1211));
 	int catewidth = 0;
 	for(int i = 0; i < 32; ++i) {
-		irr::core::dimension2d<unsigned int> dtxt = mainGame->guiFont->getDimension(dataManager.GetSysString(1100 + i));
+		irr::core::dimension2d<unsigned int> dtxt = guiFont->getDimension(dataManager.GetSysString(1100 + i));
 		if((int)dtxt.Width + 40 > catewidth)
 			catewidth = dtxt.Width + 40;
 	}
@@ -1883,7 +1883,7 @@ void Game::ShowCardInfo(int code, bool resize) {
 		myswprintf(formatBuffer, L"[%ls] %ls/%ls", dataManager.FormatType(cd.type), dataManager.FormatRace(cd.race), dataManager.FormatAttribute(cd.attribute));
 		stInfo->setText(formatBuffer);
 		int offset_info = 0;
-		irr::core::dimension2d<unsigned int> dtxt = mainGame->guiFont->getDimension(formatBuffer);
+		irr::core::dimension2d<unsigned int> dtxt = guiFont->getDimension(formatBuffer);
 		if(dtxt.Width > (300 * xScale - 13) - 15)
 			offset_info = 15;
 		if(!(cd.type & TYPE_LINK)) {
@@ -1917,7 +1917,7 @@ void Game::ShowCardInfo(int code, bool resize) {
 		}
 		stDataInfo->setText(formatBuffer);
 		int offset_arrows = offset_info;
-		dtxt = mainGame->guiFont->getDimension(formatBuffer);
+		dtxt = guiFont->getDimension(formatBuffer);
 		if(dtxt.Width > (300 * xScale - 13) - 15)
 			offset_arrows += 15;
 		stInfo->setRelativePosition(rect<s32>(15, 37, 300 * xScale - 13, (60 + offset_info)));
@@ -2309,8 +2309,8 @@ void Game::OnResize() {
 		scrTabSystem->setVisible(false);
 
 	if(gameConf.resize_popup_menu) {
-		int width = 100 * mainGame->xScale;
-		int height = (mainGame->yScale >= 0.666) ? 21 * mainGame->yScale : 14;
+		int width = 100 * xScale;
+		int height = (yScale >= 0.666) ? 21 * yScale : 14;
 		wCmdMenu->setRelativePosition(recti(1, 1, width + 1, 1));
 		btnActivate->setRelativePosition(recti(1, 1, width, height));
 		btnSummon->setRelativePosition(recti(1, 1, width, height));
@@ -2532,7 +2532,7 @@ const wchar_t* Game::GetLocaleDirWide(const char* dir) {
 	return locale_buf;
 }
 void Game::SetCursor(ECURSOR_ICON icon) {
-	ICursorControl* cursor = mainGame->device->getCursorControl();
+	ICursorControl* cursor = device->getCursorControl();
 	if(cursor->getActiveIcon() != icon) {
 		cursor->setActiveIcon(icon);
 	}

gframe/netserver.cpp

@@ -122,9 +122,9 @@ bool NetServer::StartBroadcast() {
 	if(!net_evbase)
 		return false;
 	SOCKET udp = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
-	BOOL opt = TRUE;
-	setsockopt(udp, SOL_SOCKET, SO_BROADCAST, (const char*)&opt, sizeof(BOOL));
-	setsockopt(udp, SOL_SOCKET, SO_REUSEADDR, (const char*)&opt, sizeof(BOOL));
+	int opt = TRUE;
+	setsockopt(udp, SOL_SOCKET, SO_BROADCAST, (const char*)&opt, sizeof opt);
+	setsockopt(udp, SOL_SOCKET, SO_REUSEADDR, (const char*)&opt, sizeof opt);
 	sockaddr_in addr;
 	memset(&addr, 0, sizeof(addr));
 	addr.sin_family = AF_INET;

ocgcore @ 8a00d7b7

-Subproject commit ee204afa907a931cd190b3214748211072c783c9
+Subproject commit 8a00d7b74a8b6c5cd750a68e5bf4c07a6208b7c5

script @ 80107fa0

-Subproject commit 32d959998415b345938768916c4732320f6fd688
+Subproject commit 80107fa05d223e8f8e4f5f7ec25cddc37906f580

strings.conf

@@ -318,8 +318,8 @@
 !system 1260 大师规则
 !system 1261 大师规则２
 !system 1262 大师规则３
-!system 1263 新大师规则
-!system 1264 大师规则2020
+!system 1263 新大师规则（2017）
+!system 1264 大师规则（2020）
 !system 1267 语言（重启后生效）
 !system 1268 盖放怪兽前询问
 !system 1269 数字灵摆图片