move second_code to card_data.h (#685)

card.cpp

@@ -15,14 +15,6 @@
 #include "buffer.h"
 #include <algorithm>
 
-const std::unordered_map<uint32, uint32> card::second_code = {
-	{CARD_MARINE_DOLPHIN, 17955766u},
-	{CARD_TWINKLE_MOSS, 17732278u},
-	{CARD_TIMAEUS, 10000050u},
-	{CARD_CRITIAS, 10000060u},
-	{CARD_HERMOS, 10000070u}
-};
-
 bool card_sort::operator()(card* const& c1, card* const& c2) const {
 	return c1->cardid < c2->cardid;
 }

card.h

@@ -109,12 +109,6 @@ struct material_info {
 };
 const material_info null_info;
 
-constexpr uint32 CARD_MARINE_DOLPHIN = 78734254;
-constexpr uint32 CARD_TWINKLE_MOSS = 13857930;
-constexpr uint32 CARD_TIMAEUS = 1784686;
-constexpr uint32 CARD_CRITIAS = 11082056;
-constexpr uint32 CARD_HERMOS = 46232525;
-
 class card {
 public:
 	struct effect_relation_hash {
@@ -149,7 +143,6 @@ public:
 		uint8 location{ 0 };
 		uint8 sequence{ 0 };
 	};
-	static const std::unordered_map<uint32, uint32> second_code;
 
 	int32 ref_handle;
 	duel* pduel;

card_data.h

 #ifndef CARD_DATA_H_
 #define CARD_DATA_H_
 
+#include <unordered_map>
 #include "common.h"
 
 constexpr int CARD_ARTWORK_VERSIONS_OFFSET = 20;
 constexpr int SIZE_SETCODE = 16;
-constexpr int CARD_BLACK_LUSTER_SOLDIER2 = 5405695;
+constexpr uint32 CARD_BLACK_LUSTER_SOLDIER2 = 5405695;
+
+//double name
+constexpr uint32 CARD_MARINE_DOLPHIN = 78734254;
+constexpr uint32 CARD_TWINKLE_MOSS = 13857930;
+constexpr uint32 CARD_TIMAEUS = 1784686;
+constexpr uint32 CARD_CRITIAS = 11082056;
+constexpr uint32 CARD_HERMOS = 46232525;
+
+const std::unordered_map<uint32, uint32> second_code = {
+	{CARD_MARINE_DOLPHIN, 17955766u},
+	{CARD_TWINKLE_MOSS, 17732278u},
+	{CARD_TIMAEUS, 10000050u},
+	{CARD_CRITIAS, 10000060u},
+	{CARD_HERMOS, 10000070u},
+};
 
 struct card_data {
 	uint32 code{};

playerop.cpp

@@ -913,7 +913,7 @@ static int32 is_declarable(card_data const& cd, const std::vector<uint32>& opcod
 				stack.pop();
 				int32 lhs = stack.top();
 				stack.pop();
-				stack.push(lhs && rhs);
+				stack.push(static_cast<int32>(lhs && rhs));
 			}
 			break;
 		}
@@ -923,7 +923,7 @@ static int32 is_declarable(card_data const& cd, const std::vector<uint32>& opcod
 				stack.pop();
 				int32 lhs = stack.top();
 				stack.pop();
-				stack.push(lhs || rhs);
+				stack.push(static_cast<int32>(lhs || rhs));
 			}
 			break;
 		}
@@ -939,7 +939,7 @@ static int32 is_declarable(card_data const& cd, const std::vector<uint32>& opcod
 			if(stack.size() >= 1) {
 				int32 val = stack.top();
 				stack.pop();
-				stack.push(!val);
+				stack.push(static_cast<int32>(!val));
 			}
 			break;
 		}