Merge branch 'master' into server

gframe/deck_con.cpp

@@ -830,9 +830,9 @@ void DeckBuilder::FilterCards() {
 	std::vector<std::wstring> query_elements;
 	std::vector<std::vector<std::wstring>::iterator> query_elements_track;
 	size_t element_start = 0;
-	while (1) {
+	while(1) {
 		size_t element_end = str.find_first_of(L' ', element_start);
-		if (element_end == std::wstring::npos)
+		if(element_end == std::wstring::npos)
 			break;
 		size_t length = element_end - element_start;
 		if(length > 0) {
@@ -843,18 +843,17 @@ void DeckBuilder::FilterCards() {
 	}
 	query_elements.push_back(str.substr(element_start));
 	std::unordered_map<std::wstring, unsigned int> set_code_map;
-	for (auto elements_iterator = query_elements.begin(); elements_iterator != query_elements.end(); elements_iterator++) {
+	for(auto elements_iterator = query_elements.begin(); elements_iterator != query_elements.end(); elements_iterator++) {
 		const wchar_t* element_pointer = elements_iterator->c_str();
-		if (element_pointer[0] == L'@')
+		if(element_pointer[0] == L'@')
 			set_code_map[*elements_iterator] = dataManager.GetSetCode(&element_pointer[1]);
 		else
 			set_code_map[*elements_iterator] = dataManager.GetSetCode(&element_pointer[0]);			
-		if (element_pointer[0] == 0 || (element_pointer[0] == L'$' && element_pointer[1] == 0) || (element_pointer[0] == L'@' && element_pointer[1] == 0))
+		if(element_pointer[0] == 0 || (element_pointer[0] == L'$' && element_pointer[1] == 0) || (element_pointer[0] == L'@' && element_pointer[1] == 0))
 			query_elements_track.push_back(elements_iterator);
 	}
-	for (auto elements_track_iterator = query_elements_track.begin(); elements_track_iterator != query_elements_track.end(); elements_track_iterator++) {
+	for(auto elements_track_iterator = query_elements_track.begin(); elements_track_iterator != query_elements_track.end(); elements_track_iterator++)
 		query_elements.erase(*elements_track_iterator);
-	}
 	auto strpointer = dataManager._strings.begin();
 	for(code_pointer ptr = dataManager._datas.begin(); ptr != dataManager._datas.end(); ++ptr, ++strpointer) {
 		const CardDataC& data = ptr->second;
@@ -943,14 +942,14 @@ void DeckBuilder::FilterCards() {
 					break;
 				}
 			} else {
-				if (!CardNameContains(text.name.c_str(), elements_iterator->c_str()) && text.text.find(elements_iterator->c_str()) == std::wstring::npos
+				if(!CardNameContains(text.name.c_str(), elements_iterator->c_str()) && text.text.find(elements_iterator->c_str()) == std::wstring::npos
 					&& (!set_code_map[*elements_iterator] || !check_set_code(data, set_code_map[*elements_iterator]))) {
 					is_target = false;
 					break;
 				}
 			}
 		}
-		if (is_target)
+		if(is_target)
 			results.push_back(ptr);
 		else
 			continue;

ocgcore @ b4e44eb5

-Subproject commit 48955fb8c9f97cf68f415ec48566fb0197924de3
+Subproject commit b4e44eb523755772ccc7544ed116c4173e148db8

script @ 553675f9

-Subproject commit fbc740f2ab59813f586121aa7da8ba6400a4c26a
+Subproject commit 553675f957fa41ff5dc5d8a74ea739be320d44a2