card_data: add is_alternative()

card.cpp

@@ -421,7 +421,7 @@ uint32 card::get_info_location() {
 }
 // get the printed code on card
 uint32 card::get_original_code() const {
-	if (data.alias && (data.alias < data.code + CARD_ARTWORK_VERSIONS_OFFSET) && (data.code < data.alias + CARD_ARTWORK_VERSIONS_OFFSET))
+	if (data.is_alternative())
 		return data.alias;
 	else
 		return data.code;

card.h

@@ -429,6 +429,4 @@ public:
 #define SUMMON_INFO_REASON_EFFECT	0x200
 #define SUMMON_INFO_REASON_PLAYER	0x400
 
-#define CARD_ARTWORK_VERSIONS_OFFSET	10
-
 #endif /* CARD_H_ */

card_data.h

@@ -4,6 +4,8 @@
 #include "common.h"
 #include <vector>
 
+constexpr int CARD_ARTWORK_VERSIONS_OFFSET = 10;
+
 struct card_data {
 	uint32 code{};
 	uint32 alias{};
@@ -43,6 +45,10 @@ struct card_data {
 		return false;
 	}
 
+	bool is_alternative() const {
+		return alias && (alias < code + CARD_ARTWORK_VERSIONS_OFFSET) && (code < alias + CARD_ARTWORK_VERSIONS_OFFSET);
+	}
+
 	void set_setcode(uint64 value) {
 		setcode.clear();
 		while (value) {

interpreter.cpp

@@ -56,7 +56,7 @@ int32 interpreter::register_card(card *pcard) {
 	//some userdata may be created in script like token so use current_state
 	lua_rawgeti(current_state, LUA_REGISTRYINDEX, pcard->ref_handle);
 	//load script
-	if(pcard->data.alias && (pcard->data.alias < pcard->data.code + CARD_ARTWORK_VERSIONS_OFFSET) && (pcard->data.code < pcard->data.alias + CARD_ARTWORK_VERSIONS_OFFSET))
+	if(pcard->data.is_alternative())
 		load_card_script(pcard->data.alias);
 	else
 		load_card_script(pcard->data.code);