merge test

gframe/game.cpp

@@ -2088,21 +2088,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

@@ -171,8 +171,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();

system.conf

@@ -27,8 +27,12 @@ control_mode = 0
 draw_field_spell = 1
 separate_clear_button = 1
 #auto_search_limit >= 0: Start search automatically when the user enters N chars
+<<<<<<< HEAD
 auto_search_limit = 2
 #search_multiple_keywords = 0: Disable. 1: Search mutiple keywords with separator " ". 2: with separator "+"
+=======
+auto_search_limit = -1
+>>>>>>> cd7129ef3c8a23551b15e710c306d73eb7e8a8fd
 search_multiple_keywords = 1
 search_regex = 0
 ignore_deck_changes = 0