Card.GetFlagEffectLabel()

libcard.cpp

@@ -1076,7 +1076,7 @@ int32 scriptlib::card_set_flag_effect_label(lua_State *L) {
 	check_param_count(L, 3);
 	check_param(L, PARAM_TYPE_CARD, 1);
 	card* pcard = *(card**) lua_touserdata(L, 1);
-	int32 code = (lua_tointeger(L, 2) & 0xfffffff) | 0x10000000;
+	uint32 code = (lua_tounsigned(L, 2) & 0xfffffff) | 0x10000000;
 	int lab = lua_tointeger(L, 3);
 	auto eit = pcard->single_effect.find(code);
 	if(eit == pcard->single_effect.end())
@@ -1091,13 +1091,19 @@ int32 scriptlib::card_get_flag_effect_label(lua_State *L) {
 	check_param_count(L, 2);
 	check_param(L, PARAM_TYPE_CARD, 1);
 	card* pcard = *(card**) lua_touserdata(L, 1);
-	int32 code = (lua_tointeger(L, 2) & 0xfffffff) | 0x10000000;
+	uint32 code = (lua_tounsigned(L, 2) & 0xfffffff) | 0x10000000;
 	auto rg = pcard->single_effect.equal_range(code);
 	int32 count = 0;
+	if(rg.first == rg.second) {
+ -		lua_pushnil(L);
+		count = 1;
+	}
+	else {
 		for(; rg.first != rg.second; ++rg.first) {
 			lua_pushinteger(L, rg.first->second->label);
 			count++;
 		}
+	}
 	return count;
 }
 int32 scriptlib::card_create_relation(lua_State *L) {