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

gframe/deck_con.cpp

@@ -1348,6 +1348,7 @@ void DeckBuilder::FilterCards() {
 		element_t(): type(type_t::all), exclude(false) {}
 	};
 	const wchar_t* pstr = mainGame->ebCardName->getText();
+	int trycode = BufferIO::GetVal(pstr);
 	std::wstring str = std::wstring(pstr);
 	std::vector<element_t> query_elements;
 	if(mainGame->gameConf.search_multiple_keywords) {
@@ -1492,16 +1493,12 @@ void DeckBuilder::FilterCards() {
 				match = CardNameContains(text.name.c_str(), elements_iterator->keyword.c_str());
 			} else if (elements_iterator->type == element_t::type_t::setcode) {
 				match = data.is_setcodes(elements_iterator->setcodes);
+			} else if (trycode && (data.code == trycode || data.alias == trycode && data.is_alternative())){
+				match = true;
 			} else {
-				int trycode = BufferIO::GetVal(elements_iterator->keyword.c_str());
-				bool tryresult = dataManager.GetData(trycode, 0);
-				if(!tryresult) {
-					match = CardNameContains(text.name.c_str(), elements_iterator->keyword.c_str())
-						|| text.text.find(elements_iterator->keyword) != std::wstring::npos
-						|| data.is_setcodes(elements_iterator->setcodes);
-				} else {
-					match = data.code == trycode || data.alias == trycode;
-				}
+				match = CardNameContains(text.name.c_str(), elements_iterator->keyword.c_str())
+					|| text.text.find(elements_iterator->keyword) != std::wstring::npos
+					|| data.is_setcodes(elements_iterator->setcodes);
 			}
 			if(elements_iterator->exclude)
 				match = !match;

premake/lua/premake5.lua

@@ -10,6 +10,9 @@ project "lua"
     filter "not action:vs*"
         buildoptions { "-x c++" }
 
+    filter "configurations:Debug"
+        defines { "LUA_USE_APICHECK" }
+
     filter "system:bsd"
         defines { "LUA_USE_POSIX" }