fix merge

d4430f0a · nanahira · c4b71bb2 · d4430f0a
Commit d4430f0a authored Jun 03, 2024 by nanahira
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 3 deletions

card.cpp card.cpp +1 -3

No files found.
--- a/card.cpp
+++ b/card.cpp
@@ -23,9 +23,7 @@ const std::unordered_map<uint32, uint32> card::second_code = {
 	{CARD_HERMOS, 10000070u}
 };

-bool card_sort::operator()(void* const & p1, void* const & p2) const {
-	card* c1 = (card*)p1;
-	card* c2 = (card*)p2;
+bool card_sort::operator()(card* const& c1, card* const& c2) const {
 	return c1->cardid < c2->cardid;
 }