ShuffleSetCard: use Fisher-Yates shuffle

39279c42 · VanillaSalt · 416b733f · 39279c42
Commit 39279c42 authored May 06, 2016 by VanillaSalt
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 7 deletions

libduel.cpp libduel.cpp +3 -7

No files found.
--- a/libduel.cpp
+++ b/libduel.cpp
@@ -1135,13 +1135,9 @@ int32 scriptlib::duel_shuffle_setcard(lua_State *L) {
 		seq[ct] = pcard->current.sequence;
 		ct++;
 	}
-	for(uint32 p = 0; p < 2; ++p) {
+	for(int32 i = ct - 1; i > 0; --i) {
-		for(uint32 i = 0; i < ct; ++i) {
+		int32 s = pduel->get_next_integer(0, i);
-			uint8 s = pduel->get_next_integer(0, ct - 1);
+		std::swap(ms[i], ms[s]);
-			pcard = ms[s];
-			ms[s] = ms[i];
-			ms[i] = pcard;
-		}
 	}
 	pduel->write_buffer8(MSG_SHUFFLE_SET_CARD);
 	pduel->write_buffer8(ct);