Merge branch 'master' into server

gframe/deck_con.cpp

@@ -944,7 +944,7 @@ void DeckBuilder::FilterCards() {
 				int trycode = BufferIO::GetVal(elements_iterator->c_str());
 				bool tryresult = dataManager.GetData(trycode, 0);
 				if(!tryresult && !CardNameContains(text.name.c_str(), elements_iterator->c_str()) && text.text.find(elements_iterator->c_str()) == std::wstring::npos
-					&& !mainGame->CheckRegEx(text.text, elements_iterator->c_str())
+					&& !mainGame->CheckRegEx(text.text, *elements_iterator)
 					&& (!set_code_map[*elements_iterator] || !check_set_code(data, set_code_map[*elements_iterator]))) {
 					is_target = false;
 					break;

gframe/game.cpp

@@ -2175,21 +2175,7 @@ void Game::takeScreenshot() {
 	} else
 		device->getLogger()->log(L"Failed to take screenshot.", irr::ELL_WARNING);
 }
-bool Game::CheckRegEx(const wchar_t* text, const wchar_t* exp, bool exact) {
-	if(!gameConf.search_regex)
-		return false;
-	bool result;
-	try {
-		if(exact)
-			result = std::regex_match(text, std::wregex(exp));
-		else
-			result = std::regex_search(text, std::wregex(exp));
-	} catch(...) {
-		result = false;
-	}
-	return result;
-}
-bool Game::CheckRegEx(std::wstring text, const wchar_t* exp, bool exact) {
+bool Game::CheckRegEx(const std::wstring& text, const std::wstring& exp, bool exact) {
 	if(!gameConf.search_regex)
 		return false;
 	bool result;

gframe/game.h

@@ -185,8 +185,7 @@ public:
 	int LocalPlayer(int player);
 	const wchar_t* LocalName(int local_player);
 	const char* GetLocaleDir(const char* dir);
-	bool CheckRegEx(const wchar_t* text, const wchar_t* exp, bool exact = false);
-	bool CheckRegEx(std::wstring text, const wchar_t* exp, bool exact = false);
+	bool CheckRegEx(const std::wstring& text, const std::wstring& exp, bool exact = false);
 
 	bool HasFocus(EGUI_ELEMENT_TYPE type) const {
 		irr::gui::IGUIElement* focus = env->getFocus();

script @ 87b2a039

-Subproject commit 9df625b2ab530f9f183cfc1b2971da802625ea6a
+Subproject commit 87b2a039e3b02c8fad75aa53719095e60c866466

strings.conf

@@ -766,7 +766,7 @@
 #setname 0x8c 德鲁伊	ドルイド
 !setname 0x8d 鬼计	ゴーストリック
 !setname 0x8e 吸血鬼	ヴァンパイア
-!setname 0x8f 刷啦啦	ズババ
+!setname 0x8f 刷拉拉	ズババ
 !setname 0x90 森罗	森羅
 !setname 0x91 王家长眠之谷	ネクロバレー
 !setname 0x92 纹章	メダリオン