fix MSG_SELECT_SUM

bad range check

fix MSG_SELECT_SUM
bad range check
2891ed57 · VanillaSalt · bc7d3a9e · 2891ed57 · 130de2f6 · bb5f1dd1
Commit 2891ed57 authored Dec 24, 2015 by VanillaSalt
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

gframe/client_field.cpp gframe/client_field.cpp +1 -1

ocgcore ocgcore +1 -1

script script +1 -1

No files found.
--- a/gframe/client_field.cpp
+++ b/gframe/client_field.cpp
@@ -1214,7 +1214,7 @@ bool ClientField::check_sel_sum_s(const std::set<ClientCard*>& left, int index,
 	return res1 || res2;
 }
 void ClientField::check_sel_sum_t(const std::set<ClientCard*>& left, int acc) {
-	int count = selected_cards.size() + 1;
+	int count = selected_cards.size() + 1 - must_select_count;
 	for (auto sit = left.begin(); sit != left.end(); ++sit) {
 		if (selectsum_cards.find(*sit) != selectsum_cards.end())
 			continue;

--- a/ocgcore @ 130de2f6
+++ b/ocgcore @ 130de2f6
-Subproject commit 76442092e35ac6cbb3487aee4a6183312a2f36ab
+Subproject commit 130de2f618693c34a7ebffeb9c5011c699a789c5
--- a/script @ bb5f1dd1
+++ b/script @ bb5f1dd1
-Subproject commit 45397d1c05a9283517ef0736c16f36c8882fe5d2
+Subproject commit bb5f1dd13d95f3f666bc4f4e3b4e95557ecb2612