Merge remote-tracking branch 'upstream/master' into server-develop

gframe/client_field.cpp

@@ -196,9 +196,12 @@ void ClientField::AddCard(ClientCard* pcard, int controler, int location, int se
 			deck[controler].push_back(pcard);
 			pcard->sequence = (unsigned char)(deck[controler].size() - 1);
 		} else {
-			for (auto& pcard : deck[controler])
-				pcard->sequence++;
-			deck[controler].insert(deck[controler].begin(), pcard);
+			deck[controler].push_back(0);
+			for(int i = deck[controler].size() - 1; i > 0; --i) {
+				deck[controler][i] = deck[controler][i - 1];
+				deck[controler][i]->sequence++;
+			}
+			deck[controler][0] = pcard;
 			pcard->sequence = 0;
 		}
 		pcard->is_reversed = false;
@@ -235,13 +238,15 @@ void ClientField::AddCard(ClientCard* pcard, int controler, int location, int se
 			extra[controler].push_back(pcard);
 			pcard->sequence = (unsigned char)(extra[controler].size() - 1);
 		} else {
+			extra[controler].push_back(0);
 			int p = extra[controler].size() - extra_p_count[controler] - 1;
 			for(int i = extra[controler].size() - 1; i > p; --i) {
+				extra[controler][i] = extra[controler][i - 1];
 				extra[controler][i]->sequence++;
 				extra[controler][i]->curPos += irr::core::vector3df(0, 0, 0.01f);
 				extra[controler][i]->mTransform.setTranslation(extra[controler][i]->curPos);
 			}
-			extra[controler].insert(extra[controler].begin() + p, pcard);
+			extra[controler][p] = pcard;
 			pcard->sequence = p;
 		}
 		if (pcard->position & POS_FACEUP)
@@ -251,54 +256,69 @@ void ClientField::AddCard(ClientCard* pcard, int controler, int location, int se
 	}
 }
 ClientCard* ClientField::RemoveCard(int controler, int location, int sequence) {
-	ClientCard* pcard = nullptr;
-	auto erase_card = [](std::vector<ClientCard*>& lst, int seq) {
-		for (int i = seq; i < (int)lst.size() - 1; ++i) {
-			lst[i] = lst[i + 1];
-			lst[i]->sequence--;
-			lst[i]->curPos -= irr::core::vector3df(0, 0, 0.01f);
-			lst[i]->mTransform.setTranslation(lst[i]->curPos);
-		}
-		lst.pop_back();
-	};
+	ClientCard* pcard = 0;
 	switch (location) {
 	case LOCATION_DECK: {
 		pcard = deck[controler][sequence];
-		erase_card(deck[controler], sequence);
+		for (size_t i = sequence; i < deck[controler].size() - 1; ++i) {
+			deck[controler][i] = deck[controler][i + 1];
+			deck[controler][i]->sequence--;
+			deck[controler][i]->curPos -= irr::core::vector3df(0, 0, 0.01f);
+			deck[controler][i]->mTransform.setTranslation(deck[controler][i]->curPos);
+		}
+		deck[controler].erase(deck[controler].end() - 1);
 		break;
 	}
 	case LOCATION_HAND: {
 		pcard = hand[controler][sequence];
-		for (int i = sequence; i < (int)hand[controler].size() - 1; ++i) {
+		for (size_t i = sequence; i < hand[controler].size() - 1; ++i) {
 			hand[controler][i] = hand[controler][i + 1];
 			hand[controler][i]->sequence--;
 		}
-		hand[controler].pop_back();
+		hand[controler].erase(hand[controler].end() - 1);
 		break;
 	}
 	case LOCATION_MZONE: {
 		pcard = mzone[controler][sequence];
-		mzone[controler][sequence] = nullptr;
+		mzone[controler][sequence] = 0;
 		break;
 	}
 	case LOCATION_SZONE: {
 		pcard = szone[controler][sequence];
-		szone[controler][sequence] = nullptr;
+		szone[controler][sequence] = 0;
 		break;
 	}
 	case LOCATION_GRAVE: {
 		pcard = grave[controler][sequence];
-		erase_card(grave[controler], sequence);
+		for (size_t i = sequence; i < grave[controler].size() - 1; ++i) {
+			grave[controler][i] = grave[controler][i + 1];
+			grave[controler][i]->sequence--;
+			grave[controler][i]->curPos -= irr::core::vector3df(0, 0, 0.01f);
+			grave[controler][i]->mTransform.setTranslation(grave[controler][i]->curPos);
+		}
+		grave[controler].erase(grave[controler].end() - 1);
 		break;
 	}
 	case LOCATION_REMOVED: {
 		pcard = remove[controler][sequence];
-		erase_card(remove[controler], sequence);
+		for (size_t i = sequence; i < remove[controler].size() - 1; ++i) {
+			remove[controler][i] = remove[controler][i + 1];
+			remove[controler][i]->sequence--;
+			remove[controler][i]->curPos -= irr::core::vector3df(0, 0, 0.01f);
+			remove[controler][i]->mTransform.setTranslation(remove[controler][i]->curPos);
+		}
+		remove[controler].erase(remove[controler].end() - 1);
 		break;
 	}
 	case LOCATION_EXTRA: {
 		pcard = extra[controler][sequence];
-		erase_card(extra[controler], sequence);
+		for (size_t i = sequence; i < extra[controler].size() - 1; ++i) {
+			extra[controler][i] = extra[controler][i + 1];
+			extra[controler][i]->sequence--;
+			extra[controler][i]->curPos -= irr::core::vector3df(0, 0, 0.01f);
+			extra[controler][i]->mTransform.setTranslation(extra[controler][i]->curPos);
+		}
+		extra[controler].erase(extra[controler].end() - 1);
 		if (pcard->position & POS_FACEUP)
 			extra_p_count[controler]--;
 		break;

gframe/client_field.h

@@ -144,8 +144,8 @@ public:
 	ClientCard* menu_card{ nullptr };
 	int list_command{ 0 };
 
-	virtual bool OnEvent(const irr::SEvent& event);
-	virtual bool OnCommonEvent(const irr::SEvent& event);
+	bool OnEvent(const irr::SEvent& event) override;
+	bool OnCommonEvent(const irr::SEvent& event);
 	void GetHoverField(int x, int y);
 	void ShowMenu(int flag, int x, int y);
 	void HideMenu();

gframe/config.h

@@ -50,7 +50,6 @@
 #include <string>
 #include "bufferio.h"
 #include "../ocgcore/ocgapi.h"
-#include "../ocgcore/common.h"
 
 template<size_t N, typename... TR>
 inline int myswprintf(wchar_t(&buf)[N], const wchar_t* fmt, TR... args) {

gframe/data_manager.h

@@ -24,7 +24,7 @@ struct CardDataC : card_data {
 	uint32_t ot{};
 	uint32_t category{};
 
-	bool is_setcodes(std::vector <uint32_t> values) const {
+	bool is_setcodes(const std::vector<unsigned int>& values) const {
 		for (auto& value : values) {
 			if (is_setcode(value))
 				return true;

gframe/deck_con.cpp

@@ -63,7 +63,7 @@ void DeckBuilder::Initialize() {
 	mainGame->btnSideReload->setVisible(false);
 	filterList = &deckManager._lfList[mainGame->gameConf.use_lflist ? mainGame->gameConf.default_lflist : deckManager._lfList.size() - 1].content;
 	ClearSearch();
-	rnd.reset((uint_fast32_t)time(nullptr));
+	rnd.reset((uint_fast32_t)std::time(nullptr));
 	mouse_pos.set(0, 0);
 	hovered_code = 0;
 	hovered_pos = 0;
@@ -1343,13 +1343,12 @@ void DeckBuilder::FilterCards() {
 			all,
 			name,
 			setcode
-		} type;
-		bool exclude;
-		element_t(): type(type_t::all), exclude(false) {}
+		} type{ type_t::all };
+		bool exclude{ false };
 	};
 	const wchar_t* pstr = mainGame->ebCardName->getText();
 	int trycode = BufferIO::GetVal(pstr);
-	std::wstring str = std::wstring(pstr);
+	std::wstring str{ pstr };
 	std::vector<element_t> query_elements;
 	if(mainGame->gameConf.search_multiple_keywords) {
 		const wchar_t separator = mainGame->gameConf.search_multiple_keywords == 1 ? L' ' : L'+';

gframe/deck_con.h

@@ -11,7 +11,7 @@ namespace ygo {
 
 class DeckBuilder: public irr::IEventReceiver {
 public:
-	virtual bool OnEvent(const irr::SEvent& event);
+	bool OnEvent(const irr::SEvent& event) override;
 	void Initialize();
 	void Terminate();
 	void GetHoveredCard();

gframe/duelclient.cpp

@@ -730,9 +730,8 @@ void DuelClient::HandleSTOCPacketLan(unsigned char* data, int len) {
 		else
 			starttime = new_replay.pheader.seed;
 		
-		tm* localedtime = localtime(&starttime);
 		wchar_t timetext[40];
-		std::wcsftime(timetext, 40, L"%Y-%m-%d %H-%M-%S", localedtime);
+		std::wcsftime(timetext, sizeof timetext / sizeof timetext[0], L"%Y-%m-%d %H-%M-%S", std::localtime(&starttime));
 		mainGame->ebRSName->setText(timetext);
 		if(!mainGame->chkAutoSaveReplay->isChecked()) {
 			mainGame->wReplaySave->setText(dataManager.GetSysString(1340));

gframe/game.cpp

@@ -1817,10 +1817,9 @@ void Game::ErrorLog(const char* msg) {
 	FILE* fp = fopen("error.log", "at");
 	if(!fp)
 		return;
-	time_t nowtime = time(nullptr);
-	tm* localedtime = localtime(&nowtime);
+	time_t nowtime = std::time(nullptr);
 	char timebuf[40];
-	strftime(timebuf, 40, "%Y-%m-%d %H:%M:%S", localedtime);
+	std::strftime(timebuf, sizeof timebuf, "%Y-%m-%d %H:%M:%S", std::localtime(&nowtime));
 	fprintf(fp, "[%s]%s\n", timebuf, msg);
 	fclose(fp);
 }
@@ -2224,8 +2223,8 @@ void Game::SetWindowsIcon() {
 	HINSTANCE hInstance = (HINSTANCE)GetModuleHandleW(nullptr);
 	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);
+	SendMessageW(hWnd, WM_SETICON, ICON_SMALL, (LPARAM)hSmallIcon);
+	SendMessageW(hWnd, WM_SETICON, ICON_BIG, (LPARAM)hBigIcon);
 #endif
 }
 void Game::SetWindowsScale(float scale) {

gframe/game.h

@@ -16,10 +16,7 @@
 #include "client_field.h"
 #include "deck_con.h"
 #include "menu_handler.h"
-#include <time.h>
-#else
-#include "netserver.h"
-#endif //YGOPRO_SERVER_MODE
+#include <ctime>
 #include <unordered_map>
 #include <vector>
 #include <list>

gframe/menu_handler.cpp

@@ -556,8 +556,7 @@ bool MenuHandler::OnEvent(const irr::SEvent& event) {
 					curtime = ReplayMode::cur_replay.pheader.start_time;
 				else
 					curtime = ReplayMode::cur_replay.pheader.seed;
-				tm* st = localtime(&curtime);
-				std::wcsftime(infobuf, 256, L"%Y/%m/%d %H:%M:%S\n", st);
+				std::wcsftime(infobuf, sizeof infobuf / sizeof infobuf[0], L"%Y/%m/%d %H:%M:%S\n", std::localtime(&curtime));
 				repinfo.append(infobuf);
 				wchar_t namebuf[4][20]{};
 				ReplayMode::cur_replay.ReadName(namebuf[0]);

gframe/menu_handler.h

@@ -7,7 +7,7 @@ namespace ygo {
 
 class MenuHandler: public irr::IEventReceiver {
 public:
-	virtual bool OnEvent(const irr::SEvent& event);
+	bool OnEvent(const irr::SEvent& event) override;
 	s32 prev_operation;
 	int prev_sel;
 

gframe/myfilesystem.h

@@ -88,7 +88,7 @@ public:
 
 	static void TraversalDir(const wchar_t* wpath, const std::function<void(const wchar_t*, bool)>& cb) {
 		wchar_t findstr[1024];
-		std::swprintf(findstr, sizeof findstr / sizeof findstr[0], L"%s/*", wpath);
+		std::swprintf(findstr, sizeof findstr / sizeof findstr[0], L"%ls/*", wpath);
 		WIN32_FIND_DATAW fdataw;
 		HANDLE fh = FindFirstFileW(findstr, &fdataw);
 		if(fh == INVALID_HANDLE_VALUE)
@@ -119,7 +119,7 @@ public:
 		while((wfile = std::wcspbrk(wfile, L"/")) != nullptr)
 			*wfile++ = '_';
 	}
-	
+
 	static bool IsFileExists(const char* file) {
 		struct stat fileStat;
 		return (stat(file, &fileStat) == 0) && !S_ISDIR(fileStat.st_mode);

gframe/single_duel.cpp

@@ -554,7 +554,7 @@ void SingleDuel::TPResult(DuelPlayer* dp, unsigned char tp) {
 	rh.version = PRO_VERSION;
 	rh.flag = REPLAY_UNIFORM;
 	rh.seed = seed;
-	rh.start_time = (unsigned int)time(nullptr);
+	rh.start_time = (unsigned int)std::time(nullptr);
 	last_replay.BeginRecord();
 	last_replay.WriteHeader(rh);
 	last_replay.WriteData(players[0]->name, 40, false);

gframe/single_mode.cpp

@@ -84,7 +84,7 @@ int SingleMode::SinglePlayThread() {
 	rh.version = PRO_VERSION;
 	rh.flag = REPLAY_UNIFORM | REPLAY_SINGLE_MODE;
 	rh.seed = seed;
-	rh.start_time = (unsigned int)time(nullptr);
+	rh.start_time = (unsigned int)std::time(nullptr);
 	mainGame->gMutex.lock();
 	mainGame->HideElement(mainGame->wSinglePlay);
 	mainGame->ClearCardInfo();
@@ -135,10 +135,9 @@ int SingleMode::SinglePlayThread() {
 	}
 	last_replay.EndRecord();
 	mainGame->gMutex.lock();
-	time_t nowtime = time(nullptr);
-	tm* localedtime = localtime(&nowtime);
+	time_t nowtime = std::time(nullptr);
 	wchar_t timetext[40];
-	std::wcsftime(timetext, 40, L"%Y-%m-%d %H-%M-%S", localedtime);
+	std::wcsftime(timetext, sizeof timetext / sizeof timetext[0], L"%Y-%m-%d %H-%M-%S", std::localtime(&nowtime));
 	mainGame->ebRSName->setText(timetext);
 	if(!mainGame->chkAutoSaveReplay->isChecked()) {
 		mainGame->wReplaySave->setText(dataManager.GetSysString(1340));

gframe/sound_manager.cpp

@@ -12,7 +12,7 @@ bool SoundManager::Init() {
 #ifdef YGOPRO_USE_IRRKLANG
 	bgm_scene = -1;
 	RefreshBGMList();
-	rnd.reset((unsigned int)time(nullptr));
+	rnd.reset((unsigned int)std::time(nullptr));
 	engineSound = irrklang::createIrrKlangDevice();
 	engineMusic = irrklang::createIrrKlangDevice();
 	if(!engineSound || !engineMusic) {

gframe/tag_duel.cpp

@@ -530,7 +530,7 @@ void TagDuel::TPResult(DuelPlayer* dp, unsigned char tp) {
 	rh.version = PRO_VERSION;
 	rh.flag = REPLAY_UNIFORM | REPLAY_TAG;
 	rh.seed = seed;
-	rh.start_time = (unsigned int)time(nullptr);
+	rh.start_time = (unsigned int)std::time(nullptr);
 	last_replay.BeginRecord();
 	last_replay.WriteHeader(rh);
 	last_replay.WriteData(players[0]->name, 40, false);

ocgcore @ f1d405d3

-Subproject commit 488371e3164ba985c62255033968e60cb23c22eb
+Subproject commit f1d405d36c4a431cf74ede61f3518ba3e3b8d664

script @ 576122ac

-Subproject commit 5a640df5b0d406573ebdb5a743bef38fd38e5ed3
+Subproject commit 576122ac1b39e684cea9a0e8dd29ca363230f58a

strings.conf

@@ -1245,3 +1245,7 @@
 !setname 0x1c0 龙华	竜華
 !setname 0x1c1 阿尔戈☆群星	ARG☆S
 !setname 0x1c2 喷水引擎	アクア・ジェット
+!setname 0x1c3 御剑	Mitsurugi
+!setname 0x1c4 征龙	征竜
+!setname 0x1c5 再世	再世
+!setname 0x1c6 统王	ドミナス