Skip to content

Y
ygopro-core
Commit 7e09ab94 authored by salix5's avatar salix5 Committed by GitHub
Browse files
Options

use int32 playerid (#613) 

* use int32 if possible

* remove include in effectset.h

* use int32 playerid

* update playerid in class effect

* update playerid in class field
parent b053acb9
Hide whitespace changes
Inline Side-by-side
Showing with 85 additions and 86 deletions
effect.cpp
View file @ 7e09ab94
...@@ -657,7 +657,7 @@ int32 effect::reset(uint32 reset_level, uint32 reset_type) { ...@@ -657,7 +657,7 @@ int32 effect::reset(uint32 reset_level, uint32 reset_type) {
} }
return FALSE; return FALSE;
} }
void effect::dec_count(uint32 playerid) { void effect::dec_count(uint8 playerid) {
if(!is_flag(EFFECT_FLAG_COUNT_LIMIT)) if(!is_flag(EFFECT_FLAG_COUNT_LIMIT))
return; return;
if(count_limit == 0) if(count_limit == 0)
......
effect.h
View file @ 7e09ab94
...@@ -89,7 +89,7 @@ public: ...@@ -89,7 +89,7 @@ public:
int32 is_chainable(uint8 tp); int32 is_chainable(uint8 tp);
int32 is_hand_trigger(); int32 is_hand_trigger();
int32 reset(uint32 reset_level, uint32 reset_type); int32 reset(uint32 reset_level, uint32 reset_type);
void dec_count(uint32 playerid = 2); void dec_count(uint8 playerid = PLAYER_NONE);
void recharge(); void recharge();
int32 get_value(uint32 extraargs = 0); int32 get_value(uint32 extraargs = 0);
int32 get_value(card* pcard, uint32 extraargs = 0); int32 get_value(card* pcard, uint32 extraargs = 0);
......
effectset.h
View file @ 7e09ab94
...@@ -8,7 +8,6 @@ ...@@ -8,7 +8,6 @@
#ifndef EFFECTSET_H_ #ifndef EFFECTSET_H_
#define EFFECTSET_H_ #define EFFECTSET_H_
#include <stdlib.h>
#include <array> #include <array>
#include <vector> #include <vector>
#include <algorithm> #include <algorithm>
......
field.cpp
View file @ 7e09ab94
...@@ -513,8 +513,8 @@ void field::set_control(card* pcard, uint8 playerid, uint16 reset_phase, uint8 r ...@@ -513,8 +513,8 @@ void field::set_control(card* pcard, uint8 playerid, uint16 reset_phase, uint8 r
pcard->current.controler = playerid; pcard->current.controler = playerid;
} }
card* field::get_field_card(uint32 playerid, uint32 location, uint32 sequence) { card* field::get_field_card(uint8 playerid, uint32 general_location, uint8 sequence) {
switch(location) { switch(general_location) {
case LOCATION_MZONE: { case LOCATION_MZONE: {
if(sequence < player[playerid].list_mzone.size()) if(sequence < player[playerid].list_mzone.size())
return player[playerid].list_mzone[sequence]; return player[playerid].list_mzone[sequence];
...@@ -585,9 +585,9 @@ card* field::get_field_card(uint32 playerid, uint32 location, uint32 sequence) { ...@@ -585,9 +585,9 @@ card* field::get_field_card(uint32 playerid, uint32 location, uint32 sequence) {
} }
return nullptr; return nullptr;
} }
int32 field::is_location_useable(uint32 playerid, uint32 location, uint32 sequence) { int32 field::is_location_useable(uint8 playerid, uint32 general_location, uint8 sequence) {
uint32 flag = player[playerid].disabled_location | player[playerid].used_location; uint32 flag = player[playerid].disabled_location | player[playerid].used_location;
if (location == LOCATION_MZONE) { if (general_location == LOCATION_MZONE) {
if(flag & (0x1u << sequence)) if(flag & (0x1u << sequence))
return FALSE; return FALSE;
if(sequence >= 5) { if(sequence >= 5) {
...@@ -595,13 +595,13 @@ int32 field::is_location_useable(uint32 playerid, uint32 location, uint32 sequen ...@@ -595,13 +595,13 @@ int32 field::is_location_useable(uint32 playerid, uint32 location, uint32 sequen
if(oppo & (0x1u << (11 - sequence))) if(oppo & (0x1u << (11 - sequence)))
return FALSE; return FALSE;
} }
} else if (location == LOCATION_SZONE) { } else if (general_location == LOCATION_SZONE) {
if(flag & (0x100u << sequence)) if(flag & (0x100u << sequence))
return FALSE; return FALSE;
} else if (location == LOCATION_FZONE) { } else if (general_location == LOCATION_FZONE) {
if(flag & (0x100u << (5 + sequence))) if(flag & (0x100u << (5 + sequence)))
return FALSE; return FALSE;
} else if (location == LOCATION_PZONE) { } else if (general_location == LOCATION_PZONE) {
if(core.duel_rule >= 4) { if(core.duel_rule >= 4) {
if(flag & (0x100u << (sequence * 4))) if(flag & (0x100u << (sequence * 4)))
return FALSE; return FALSE;
...@@ -1016,7 +1016,7 @@ void field::shuffle(uint8 playerid, uint8 location) { ...@@ -1016,7 +1016,7 @@ void field::shuffle(uint8 playerid, uint8 location) {
void field::reset_sequence(uint8 playerid, uint8 location) { void field::reset_sequence(uint8 playerid, uint8 location) {
if(location & (LOCATION_ONFIELD)) if(location & (LOCATION_ONFIELD))
return; return;
uint32 i = 0; int32 i = 0;
switch(location) { switch(location) {
case LOCATION_DECK: case LOCATION_DECK:
for(auto& pcard : player[playerid].list_main) for(auto& pcard : player[playerid].list_main)
......
field.h
View file @ 7e09ab94
...@@ -393,8 +393,8 @@ public: ...@@ -393,8 +393,8 @@ public:
void swap_card(card* pcard1, card* pcard2, uint8 new_sequence1, uint8 new_sequence2); void swap_card(card* pcard1, card* pcard2, uint8 new_sequence1, uint8 new_sequence2);
void swap_card(card* pcard1, card* pcard2); void swap_card(card* pcard1, card* pcard2);
void set_control(card* pcard, uint8 playerid, uint16 reset_phase, uint8 reset_count); void set_control(card* pcard, uint8 playerid, uint16 reset_phase, uint8 reset_count);
card* get_field_card(uint32 playerid, uint32 location, uint32 sequence); card* get_field_card(uint8 playerid, uint32 general_location, uint8 sequence);
int32 is_location_useable(uint32 playerid, uint32 location, uint32 sequence); int32 is_location_useable(uint8 playerid, uint32 general_location, uint8 sequence);
int32 get_useable_count(card* pcard, uint8 playerid, uint8 location, uint8 uplayer, uint32 reason, uint32 zone = 0xff, uint32* list = nullptr); int32 get_useable_count(card* pcard, uint8 playerid, uint8 location, uint8 uplayer, uint32 reason, uint32 zone = 0xff, uint32* list = nullptr);
int32 get_useable_count_fromex(card* pcard, uint8 playerid, uint8 uplayer, uint32 zone = 0xff, uint32* list = nullptr); int32 get_useable_count_fromex(card* pcard, uint8 playerid, uint8 uplayer, uint32 zone = 0xff, uint32* list = nullptr);
int32 get_spsummonable_count(card* pcard, uint8 playerid, uint32 zone = 0xff, uint32* list = nullptr); int32 get_spsummonable_count(card* pcard, uint8 playerid, uint32 zone = 0xff, uint32* list = nullptr);
......
libcard.cpp
View file @ 7e09ab94
...@@ -2971,7 +2971,7 @@ int32 scriptlib::card_is_can_remove_counter(lua_State *L) { ...@@ -2971,7 +2971,7 @@ int32 scriptlib::card_is_can_remove_counter(lua_State *L) {
check_param_count(L, 5); check_param_count(L, 5);
check_param(L, PARAM_TYPE_CARD, 1); check_param(L, PARAM_TYPE_CARD, 1);
card* pcard = *(card**) lua_touserdata(L, 1); card* pcard = *(card**) lua_touserdata(L, 1);
uint32 playerid = (uint32)lua_tointeger(L, 2); int32 playerid = (int32)lua_tointeger(L, 2);
if(playerid != 0 && playerid != 1) if(playerid != 0 && playerid != 1)
return 0; return 0;
uint32 countertype = (uint32)lua_tointeger(L, 3); uint32 countertype = (uint32)lua_tointeger(L, 3);
......
libdebug.cpp
View file @ 7e09ab94
...@@ -72,10 +72,10 @@ int32 scriptlib::debug_add_card(lua_State *L) { ...@@ -72,10 +72,10 @@ int32 scriptlib::debug_add_card(lua_State *L) {
int32 scriptlib::debug_set_player_info(lua_State *L) { int32 scriptlib::debug_set_player_info(lua_State *L) {
check_param_count(L, 4); check_param_count(L, 4);
duel* pduel = interpreter::get_duel_info(L); duel* pduel = interpreter::get_duel_info(L);
uint32 playerid = (uint32)lua_tointeger(L, 1); int32 playerid = (int32)lua_tointeger(L, 1);
uint32 lp = (uint32)lua_tointeger(L, 2); int32 lp = (int32)lua_tointeger(L, 2);
uint32 startcount = (uint32)lua_tointeger(L, 3); int32 startcount = (int32)lua_tointeger(L, 3);
uint32 drawcount = (uint32)lua_tointeger(L, 4); int32 drawcount = (int32)lua_tointeger(L, 4);
if(playerid != 0 && playerid != 1) if(playerid != 0 && playerid != 1)
return 0; return 0;
pduel->game_field->player[playerid].lp = lp; pduel->game_field->player[playerid].lp = lp;
......
libduel.cpp
View file @ 7e09ab94
...@@ -83,7 +83,7 @@ int32 scriptlib::duel_register_effect(lua_State *L) { ...@@ -83,7 +83,7 @@ int32 scriptlib::duel_register_effect(lua_State *L) {
check_param_count(L, 2); check_param_count(L, 2);
check_param(L, PARAM_TYPE_EFFECT, 1); check_param(L, PARAM_TYPE_EFFECT, 1);
effect* peffect = *(effect**)lua_touserdata(L, 1); effect* peffect = *(effect**)lua_touserdata(L, 1);
uint32 playerid = (uint32)lua_tointeger(L, 2); int32 playerid = (int32)lua_tointeger(L, 2);
if(playerid != 0 && playerid != 1) if(playerid != 0 && playerid != 1)
return 0; return 0;
duel* pduel = peffect->pduel; duel* pduel = peffect->pduel;
...@@ -279,7 +279,7 @@ int32 scriptlib::duel_summon(lua_State *L) { ...@@ -279,7 +279,7 @@ int32 scriptlib::duel_summon(lua_State *L) {
check_action_permission(L); check_action_permission(L);
check_param_count(L, 4); check_param_count(L, 4);
check_param(L, PARAM_TYPE_CARD, 2); check_param(L, PARAM_TYPE_CARD, 2);
uint32 playerid = (uint32)lua_tointeger(L, 1); int32 playerid = (int32)lua_tointeger(L, 1);
if(playerid != 0 && playerid != 1) if(playerid != 0 && playerid != 1)
return 0; return 0;
card* pcard = *(card**)lua_touserdata(L, 2); card* pcard = *(card**)lua_touserdata(L, 2);
...@@ -314,7 +314,7 @@ int32 scriptlib::duel_special_summon_rule(lua_State *L) { ...@@ -314,7 +314,7 @@ int32 scriptlib::duel_special_summon_rule(lua_State *L) {
check_action_permission(L); check_action_permission(L);
check_param_count(L, 2); check_param_count(L, 2);
check_param(L, PARAM_TYPE_CARD, 2); check_param(L, PARAM_TYPE_CARD, 2);
uint32 playerid = (uint32)lua_tointeger(L, 1); int32 playerid = (int32)lua_tointeger(L, 1);
if(playerid != 0 && playerid != 1) if(playerid != 0 && playerid != 1)
return 0; return 0;
card* pcard = *(card**)lua_touserdata(L, 2); card* pcard = *(card**)lua_touserdata(L, 2);
...@@ -340,7 +340,7 @@ int32 scriptlib::duel_synchro_summon(lua_State *L) { ...@@ -340,7 +340,7 @@ int32 scriptlib::duel_synchro_summon(lua_State *L) {
check_action_permission(L); check_action_permission(L);
check_param_count(L, 3); check_param_count(L, 3);
check_param(L, PARAM_TYPE_CARD, 2); check_param(L, PARAM_TYPE_CARD, 2);
uint32 playerid = (uint32)lua_tointeger(L, 1); int32 playerid = (int32)lua_tointeger(L, 1);
if(playerid != 0 && playerid != 1) if(playerid != 0 && playerid != 1)
return 0; return 0;
card* pcard = *(card**)lua_touserdata(L, 2); card* pcard = *(card**)lua_touserdata(L, 2);
...@@ -387,7 +387,7 @@ int32 scriptlib::duel_xyz_summon(lua_State *L) { ...@@ -387,7 +387,7 @@ int32 scriptlib::duel_xyz_summon(lua_State *L) {
check_action_permission(L); check_action_permission(L);
check_param_count(L, 3); check_param_count(L, 3);
check_param(L, PARAM_TYPE_CARD, 2); check_param(L, PARAM_TYPE_CARD, 2);
uint32 playerid = (uint32)lua_tointeger(L, 1); int32 playerid = (int32)lua_tointeger(L, 1);
if(playerid != 0 && playerid != 1) if(playerid != 0 && playerid != 1)
return 0; return 0;
card* pcard = *(card**)lua_touserdata(L, 2); card* pcard = *(card**)lua_touserdata(L, 2);
...@@ -426,7 +426,7 @@ int32 scriptlib::duel_link_summon(lua_State *L) { ...@@ -426,7 +426,7 @@ int32 scriptlib::duel_link_summon(lua_State *L) {
check_action_permission(L); check_action_permission(L);
check_param_count(L, 3); check_param_count(L, 3);
check_param(L, PARAM_TYPE_CARD, 2); check_param(L, PARAM_TYPE_CARD, 2);
uint32 playerid = (uint32)lua_tointeger(L, 1); int32 playerid = (int32)lua_tointeger(L, 1);
if(playerid != 0 && playerid != 1) if(playerid != 0 && playerid != 1)
return 0; return 0;
card* pcard = *(card**)lua_touserdata(L, 2); card* pcard = *(card**)lua_touserdata(L, 2);
...@@ -473,7 +473,7 @@ int32 scriptlib::duel_setm(lua_State *L) { ...@@ -473,7 +473,7 @@ int32 scriptlib::duel_setm(lua_State *L) {
check_action_permission(L); check_action_permission(L);
check_param_count(L, 4); check_param_count(L, 4);
check_param(L, PARAM_TYPE_CARD, 2); check_param(L, PARAM_TYPE_CARD, 2);
uint32 playerid = (uint32)lua_tointeger(L, 1); int32 playerid = (int32)lua_tointeger(L, 1);
if(playerid != 0 && playerid != 1) if(playerid != 0 && playerid != 1)
return 0; return 0;
card* pcard = *(card**)lua_touserdata(L, 2); card* pcard = *(card**)lua_touserdata(L, 2);
...@@ -507,7 +507,7 @@ int32 scriptlib::duel_setm(lua_State *L) { ...@@ -507,7 +507,7 @@ int32 scriptlib::duel_setm(lua_State *L) {
int32 scriptlib::duel_sets(lua_State *L) { int32 scriptlib::duel_sets(lua_State *L) {
check_action_permission(L); check_action_permission(L);
check_param_count(L, 2); check_param_count(L, 2);
uint32 playerid = (uint32)lua_tointeger(L, 1); int32 playerid = (int32)lua_tointeger(L, 1);
if(playerid != 0 && playerid != 1) if(playerid != 0 && playerid != 1)
return 0; return 0;
uint32 toplayer = playerid; uint32 toplayer = playerid;
...@@ -569,7 +569,7 @@ int32 scriptlib::duel_special_summon(lua_State *L) { ...@@ -569,7 +569,7 @@ int32 scriptlib::duel_special_summon(lua_State *L) {
return luaL_error(L, "Parameter %d should be \"Card\" or \"Group\".", 1); return luaL_error(L, "Parameter %d should be \"Card\" or \"Group\".", 1);
uint32 sumtype = (uint32)lua_tointeger(L, 2); uint32 sumtype = (uint32)lua_tointeger(L, 2);
uint32 sumplayer = (uint32)lua_tointeger(L, 3); uint32 sumplayer = (uint32)lua_tointeger(L, 3);
uint32 playerid = (uint32)lua_tointeger(L, 4); int32 playerid = (int32)lua_tointeger(L, 4);
uint32 nocheck = lua_toboolean(L, 5); uint32 nocheck = lua_toboolean(L, 5);
uint32 nolimit = lua_toboolean(L, 6); uint32 nolimit = lua_toboolean(L, 6);
uint32 positions = (uint32)lua_tointeger(L, 7); uint32 positions = (uint32)lua_tointeger(L, 7);
...@@ -596,7 +596,7 @@ int32 scriptlib::duel_special_summon_step(lua_State *L) { ...@@ -596,7 +596,7 @@ int32 scriptlib::duel_special_summon_step(lua_State *L) {
duel* pduel = pcard->pduel; duel* pduel = pcard->pduel;
uint32 sumtype = (uint32)lua_tointeger(L, 2); uint32 sumtype = (uint32)lua_tointeger(L, 2);
uint32 sumplayer = (uint32)lua_tointeger(L, 3); uint32 sumplayer = (uint32)lua_tointeger(L, 3);
uint32 playerid = (uint32)lua_tointeger(L, 4); int32 playerid = (int32)lua_tointeger(L, 4);
uint32 nocheck = lua_toboolean(L, 5); uint32 nocheck = lua_toboolean(L, 5);
uint32 nolimit = lua_toboolean(L, 6); uint32 nolimit = lua_toboolean(L, 6);
uint32 positions = (uint32)lua_tointeger(L, 7); uint32 positions = (uint32)lua_tointeger(L, 7);
...@@ -634,7 +634,7 @@ int32 scriptlib::duel_sendto_hand(lua_State *L) { ...@@ -634,7 +634,7 @@ int32 scriptlib::duel_sendto_hand(lua_State *L) {
pduel = pgroup->pduel; pduel = pgroup->pduel;
} else } else
return luaL_error(L, "Parameter %d should be \"Card\" or \"Group\".", 1); return luaL_error(L, "Parameter %d should be \"Card\" or \"Group\".", 1);
uint32 playerid = (uint32)lua_tointeger(L, 2); int32 playerid = (int32)lua_tointeger(L, 2);
if(lua_isnil(L, 2) || (playerid != 0 && playerid != 1)) if(lua_isnil(L, 2) || (playerid != 0 && playerid != 1))
playerid = PLAYER_NONE; playerid = PLAYER_NONE;
uint32 reason = (uint32)lua_tointeger(L, 3); uint32 reason = (uint32)lua_tointeger(L, 3);
...@@ -665,7 +665,7 @@ int32 scriptlib::duel_sendto_deck(lua_State *L) { ...@@ -665,7 +665,7 @@ int32 scriptlib::duel_sendto_deck(lua_State *L) {
pduel = pgroup->pduel; pduel = pgroup->pduel;
} else } else
return luaL_error(L, "Parameter %d should be \"Card\" or \"Group\".", 1); return luaL_error(L, "Parameter %d should be \"Card\" or \"Group\".", 1);
uint32 playerid = (uint32)lua_tointeger(L, 2); int32 playerid = (int32)lua_tointeger(L, 2);
if(lua_isnil(L, 2) || (playerid != 0 && playerid != 1)) if(lua_isnil(L, 2) || (playerid != 0 && playerid != 1))
playerid = PLAYER_NONE; playerid = PLAYER_NONE;
uint32 sequence = (uint32)lua_tointeger(L, 3); uint32 sequence = (uint32)lua_tointeger(L, 3);
...@@ -700,7 +700,7 @@ int32 scriptlib::duel_sendto_extra(lua_State *L) { ...@@ -700,7 +700,7 @@ int32 scriptlib::duel_sendto_extra(lua_State *L) {
pduel = pgroup->pduel; pduel = pgroup->pduel;
} else } else
return luaL_error(L, "Parameter %d should be \"Card\" or \"Group\".", 1); return luaL_error(L, "Parameter %d should be \"Card\" or \"Group\".", 1);
uint32 playerid = (uint32)lua_tointeger(L, 2); int32 playerid = (int32)lua_tointeger(L, 2);
if(lua_isnil(L, 2) || (playerid != 0 && playerid != 1)) if(lua_isnil(L, 2) || (playerid != 0 && playerid != 1))
playerid = PLAYER_NONE; playerid = PLAYER_NONE;
uint32 reason = (uint32)lua_tointeger(L, 3); uint32 reason = (uint32)lua_tointeger(L, 3);
...@@ -775,7 +775,7 @@ int32 scriptlib::duel_is_can_remove_counter(lua_State *L) { ...@@ -775,7 +775,7 @@ int32 scriptlib::duel_is_can_remove_counter(lua_State *L) {
} }
int32 scriptlib::duel_get_counter(lua_State *L) { int32 scriptlib::duel_get_counter(lua_State *L) {
check_param_count(L, 4); check_param_count(L, 4);
uint32 playerid = (uint32)lua_tointeger(L, 1); int32 playerid = (int32)lua_tointeger(L, 1);
if(playerid != 0 && playerid != 1) if(playerid != 0 && playerid != 1)
return 0; return 0;
uint32 s = (uint32)lua_tointeger(L, 2); uint32 s = (uint32)lua_tointeger(L, 2);
...@@ -852,7 +852,7 @@ int32 scriptlib::duel_move_to_field(lua_State *L) { ...@@ -852,7 +852,7 @@ int32 scriptlib::duel_move_to_field(lua_State *L) {
check_param(L, PARAM_TYPE_CARD, 1); check_param(L, PARAM_TYPE_CARD, 1);
card* pcard = *(card**) lua_touserdata(L, 1); card* pcard = *(card**) lua_touserdata(L, 1);
uint32 move_player = (uint32)lua_tointeger(L, 2); uint32 move_player = (uint32)lua_tointeger(L, 2);
uint32 playerid = (uint32)lua_tointeger(L, 3); int32 playerid = (int32)lua_tointeger(L, 3);
if(playerid != 0 && playerid != 1) if(playerid != 0 && playerid != 1)
return 0; return 0;
uint32 destination = (uint32)lua_tointeger(L, 4); uint32 destination = (uint32)lua_tointeger(L, 4);
...@@ -1181,9 +1181,9 @@ int32 scriptlib::duel_check_timing(lua_State *L) { ...@@ -1181,9 +1181,9 @@ int32 scriptlib::duel_check_timing(lua_State *L) {
int32 scriptlib::duel_is_environment(lua_State *L) { int32 scriptlib::duel_is_environment(lua_State *L) {
check_param_count(L, 1); check_param_count(L, 1);
uint32 code = (uint32)lua_tointeger(L, 1); uint32 code = (uint32)lua_tointeger(L, 1);
uint32 playerid = PLAYER_ALL; int32 playerid = PLAYER_ALL;
if(lua_gettop(L) >= 2) if(lua_gettop(L) >= 2)
playerid = (uint32)lua_tointeger(L, 2); playerid = (int32)lua_tointeger(L, 2);
uint32 loc = LOCATION_ONFIELD; uint32 loc = LOCATION_ONFIELD;
if(lua_gettop(L) >= 3) if(lua_gettop(L) >= 3)
loc = (uint32)lua_tointeger(L, 3); loc = (uint32)lua_tointeger(L, 3);
...@@ -1261,7 +1261,7 @@ int32 scriptlib::duel_is_environment(lua_State *L) { ...@@ -1261,7 +1261,7 @@ int32 scriptlib::duel_is_environment(lua_State *L) {
} }
int32 scriptlib::duel_win(lua_State *L) { int32 scriptlib::duel_win(lua_State *L) {
check_param_count(L, 2); check_param_count(L, 2);
uint32 playerid = (uint32)lua_tointeger(L, 1); int32 playerid = (int32)lua_tointeger(L, 1);
uint32 reason = (uint32)lua_tointeger(L, 2); uint32 reason = (uint32)lua_tointeger(L, 2);
if(playerid != 0 && playerid != 1 && playerid != 2) if(playerid != 0 && playerid != 1 && playerid != 2)
return 0; return 0;
...@@ -1275,7 +1275,7 @@ int32 scriptlib::duel_win(lua_State *L) { ...@@ -1275,7 +1275,7 @@ int32 scriptlib::duel_win(lua_State *L) {
int32 scriptlib::duel_draw(lua_State *L) { int32 scriptlib::duel_draw(lua_State *L) {
check_action_permission(L); check_action_permission(L);
check_param_count(L, 3); check_param_count(L, 3);
uint32 playerid = (uint32)lua_tointeger(L, 1); int32 playerid = (int32)lua_tointeger(L, 1);
if(playerid != 0 && playerid != 1) if(playerid != 0 && playerid != 1)
return 0; return 0;
int32 count = (int32)lua_tointeger(L, 2); int32 count = (int32)lua_tointeger(L, 2);
...@@ -1293,7 +1293,7 @@ int32 scriptlib::duel_draw(lua_State *L) { ...@@ -1293,7 +1293,7 @@ int32 scriptlib::duel_draw(lua_State *L) {
int32 scriptlib::duel_damage(lua_State *L) { int32 scriptlib::duel_damage(lua_State *L) {
check_action_permission(L); check_action_permission(L);
check_param_count(L, 3); check_param_count(L, 3);
uint32 playerid = (uint32)lua_tointeger(L, 1); int32 playerid = (int32)lua_tointeger(L, 1);
if(playerid != 0 && playerid != 1) if(playerid != 0 && playerid != 1)
return 0; return 0;
int32 amount = (int32)lua_tonumber(L, 2); int32 amount = (int32)lua_tonumber(L, 2);
...@@ -1314,7 +1314,7 @@ int32 scriptlib::duel_damage(lua_State *L) { ...@@ -1314,7 +1314,7 @@ int32 scriptlib::duel_damage(lua_State *L) {
int32 scriptlib::duel_recover(lua_State *L) { int32 scriptlib::duel_recover(lua_State *L) {
check_action_permission(L); check_action_permission(L);
check_param_count(L, 3); check_param_count(L, 3);
uint32 playerid = (uint32)lua_tointeger(L, 1); int32 playerid = (int32)lua_tointeger(L, 1);
if(playerid != 0 && playerid != 1) if(playerid != 0 && playerid != 1)
return 0; return 0;
int32 amount = (int32)lua_tonumber(L, 2); int32 amount = (int32)lua_tonumber(L, 2);
...@@ -1342,7 +1342,7 @@ int32 scriptlib::duel_equip(lua_State *L) { ...@@ -1342,7 +1342,7 @@ int32 scriptlib::duel_equip(lua_State *L) {
check_param_count(L, 3); check_param_count(L, 3);
check_param(L, PARAM_TYPE_CARD, 2); check_param(L, PARAM_TYPE_CARD, 2);
check_param(L, PARAM_TYPE_CARD, 3); check_param(L, PARAM_TYPE_CARD, 3);
uint32 playerid = (uint32)lua_tointeger(L, 1); int32 playerid = (int32)lua_tointeger(L, 1);
if(playerid != 0 && playerid != 1) if(playerid != 0 && playerid != 1)
return 0; return 0;
card* equip_card = *(card**) lua_touserdata(L, 2); card* equip_card = *(card**) lua_touserdata(L, 2);
...@@ -1395,7 +1395,7 @@ int32 scriptlib::duel_get_control(lua_State *L) { ...@@ -1395,7 +1395,7 @@ int32 scriptlib::duel_get_control(lua_State *L) {
pduel = pgroup->pduel; pduel = pgroup->pduel;
} else } else
return luaL_error(L, "Parameter %d should be \"Card\" or \"Group\".", 1); return luaL_error(L, "Parameter %d should be \"Card\" or \"Group\".", 1);
uint32 playerid = (uint32)lua_tointeger(L, 2); int32 playerid = (int32)lua_tointeger(L, 2);
if(playerid != 0 && playerid != 1) if(playerid != 0 && playerid != 1)
return 0; return 0;
uint32 reset_phase = 0; uint32 reset_phase = 0;
...@@ -1453,7 +1453,7 @@ int32 scriptlib::duel_swap_control(lua_State *L) { ...@@ -1453,7 +1453,7 @@ int32 scriptlib::duel_swap_control(lua_State *L) {
} }
int32 scriptlib::duel_check_lp_cost(lua_State *L) { int32 scriptlib::duel_check_lp_cost(lua_State *L) {
check_param_count(L, 2); check_param_count(L, 2);
uint32 playerid = (uint32)lua_tointeger(L, 1); int32 playerid = (int32)lua_tointeger(L, 1);
if(playerid != 0 && playerid != 1) if(playerid != 0 && playerid != 1)
return 0; return 0;
int32 cost = (int32)lua_tointeger(L, 2); int32 cost = (int32)lua_tointeger(L, 2);
...@@ -1471,7 +1471,7 @@ int32 scriptlib::duel_check_lp_cost(lua_State *L) { ...@@ -1471,7 +1471,7 @@ int32 scriptlib::duel_check_lp_cost(lua_State *L) {
int32 scriptlib::duel_pay_lp_cost(lua_State *L) { int32 scriptlib::duel_pay_lp_cost(lua_State *L) {
check_action_permission(L); check_action_permission(L);
check_param_count(L, 2); check_param_count(L, 2);
uint32 playerid = (uint32)lua_tointeger(L, 1); int32 playerid = (int32)lua_tointeger(L, 1);
if(playerid != 0 && playerid != 1) if(playerid != 0 && playerid != 1)
return 0; return 0;
uint32 cost = (uint32)lua_tointeger(L, 2); uint32 cost = (uint32)lua_tointeger(L, 2);
...@@ -1485,7 +1485,7 @@ int32 scriptlib::duel_pay_lp_cost(lua_State *L) { ...@@ -1485,7 +1485,7 @@ int32 scriptlib::duel_pay_lp_cost(lua_State *L) {
int32 scriptlib::duel_discard_deck(lua_State *L) { int32 scriptlib::duel_discard_deck(lua_State *L) {
check_action_permission(L); check_action_permission(L);
check_param_count(L, 3); check_param_count(L, 3);
uint32 playerid = (uint32)lua_tointeger(L, 1); int32 playerid = (int32)lua_tointeger(L, 1);
uint32 count = (uint32)lua_tointeger(L, 2); uint32 count = (uint32)lua_tointeger(L, 2);
uint32 reason = (uint32)lua_tointeger(L, 3); uint32 reason = (uint32)lua_tointeger(L, 3);
duel* pduel = interpreter::get_duel_info(L); duel* pduel = interpreter::get_duel_info(L);
...@@ -1512,7 +1512,7 @@ int32 scriptlib::duel_discard_hand(lua_State *L) { ...@@ -1512,7 +1512,7 @@ int32 scriptlib::duel_discard_hand(lua_State *L) {
extraargs = lua_gettop(L) - 6; extraargs = lua_gettop(L) - 6;
} }
duel* pduel = interpreter::get_duel_info(L); duel* pduel = interpreter::get_duel_info(L);
uint32 playerid = (uint32)lua_tointeger(L, 1); int32 playerid = (int32)lua_tointeger(L, 1);
uint32 min = (uint32)lua_tointeger(L, 3); uint32 min = (uint32)lua_tointeger(L, 3);
uint32 max = (uint32)lua_tointeger(L, 4); uint32 max = (uint32)lua_tointeger(L, 4);
uint32 reason = (uint32)lua_tointeger(L, 5); uint32 reason = (uint32)lua_tointeger(L, 5);
...@@ -1556,7 +1556,7 @@ int32 scriptlib::duel_preserve_select_deck_seq(lua_State* L) { ...@@ -1556,7 +1556,7 @@ int32 scriptlib::duel_preserve_select_deck_seq(lua_State* L) {
} }
int32 scriptlib::duel_shuffle_deck(lua_State *L) { int32 scriptlib::duel_shuffle_deck(lua_State *L) {
check_param_count(L, 1); check_param_count(L, 1);
uint32 playerid = (uint32)lua_tointeger(L, 1); int32 playerid = (int32)lua_tointeger(L, 1);
if(playerid != 0 && playerid != 1) if(playerid != 0 && playerid != 1)
return 0; return 0;
duel* pduel = interpreter::get_duel_info(L); duel* pduel = interpreter::get_duel_info(L);
...@@ -1565,7 +1565,7 @@ int32 scriptlib::duel_shuffle_deck(lua_State *L) { ...@@ -1565,7 +1565,7 @@ int32 scriptlib::duel_shuffle_deck(lua_State *L) {
} }
int32 scriptlib::duel_shuffle_extra(lua_State *L) { int32 scriptlib::duel_shuffle_extra(lua_State *L) {
check_param_count(L, 1); check_param_count(L, 1);
uint32 playerid = (uint32)lua_tointeger(L, 1); int32 playerid = (int32)lua_tointeger(L, 1);
if (playerid != 0 && playerid != 1) if (playerid != 0 && playerid != 1)
return 0; return 0;
duel* pduel = interpreter::get_duel_info(L); duel* pduel = interpreter::get_duel_info(L);
...@@ -1574,7 +1574,7 @@ int32 scriptlib::duel_shuffle_extra(lua_State *L) { ...@@ -1574,7 +1574,7 @@ int32 scriptlib::duel_shuffle_extra(lua_State *L) {
} }
int32 scriptlib::duel_shuffle_hand(lua_State *L) { int32 scriptlib::duel_shuffle_hand(lua_State *L) {
check_param_count(L, 1); check_param_count(L, 1);
uint32 playerid = (uint32)lua_tointeger(L, 1); int32 playerid = (int32)lua_tointeger(L, 1);
if(playerid != 0 && playerid != 1) if(playerid != 0 && playerid != 1)
return 0; return 0;
duel* pduel = interpreter::get_duel_info(L); duel* pduel = interpreter::get_duel_info(L);
...@@ -1588,8 +1588,8 @@ int32 scriptlib::duel_shuffle_setcard(lua_State *L) { ...@@ -1588,8 +1588,8 @@ int32 scriptlib::duel_shuffle_setcard(lua_State *L) {
if(pgroup->container.size() <= 1) if(pgroup->container.size() <= 1)
return 0; return 0;
duel* pduel = pgroup->pduel; duel* pduel = pgroup->pduel;
card* ms[5]; card* ms[5]{};
uint8 seq[5]; uint8 seq[5]{};
uint8 tp = 2; uint8 tp = 2;
uint8 loc = 0; uint8 loc = 0;
uint8 ct = 0; uint8 ct = 0;
...@@ -1759,7 +1759,7 @@ int32 scriptlib::duel_change_target(lua_State *L) { ...@@ -1759,7 +1759,7 @@ int32 scriptlib::duel_change_target(lua_State *L) {
int32 scriptlib::duel_change_target_player(lua_State *L) { int32 scriptlib::duel_change_target_player(lua_State *L) {
check_param_count(L, 2); check_param_count(L, 2);
uint32 count = (uint32)lua_tointeger(L, 1); uint32 count = (uint32)lua_tointeger(L, 1);
uint32 playerid = (uint32)lua_tointeger(L, 2); int32 playerid = (int32)lua_tointeger(L, 2);
if(playerid != 0 && playerid != 1) if(playerid != 0 && playerid != 1)
return 0; return 0;
duel* pduel = interpreter::get_duel_info(L); duel* pduel = interpreter::get_duel_info(L);
...@@ -1920,7 +1920,7 @@ int32 scriptlib::duel_increase_summon_count(lua_State *L) { ...@@ -1920,7 +1920,7 @@ int32 scriptlib::duel_increase_summon_count(lua_State *L) {
pcard = *(card**) lua_touserdata(L, 1); pcard = *(card**) lua_touserdata(L, 1);
} }
duel* pduel = interpreter::get_duel_info(L); duel* pduel = interpreter::get_duel_info(L);
uint32 playerid = pduel->game_field->core.reason_player; int32 playerid = pduel->game_field->core.reason_player;
if(pcard && (pextra = pcard->is_affected_by_effect(EFFECT_EXTRA_SUMMON_COUNT))) if(pcard && (pextra = pcard->is_affected_by_effect(EFFECT_EXTRA_SUMMON_COUNT)))
pextra->get_value(pcard); pextra->get_value(pcard);
else else
...@@ -1934,7 +1934,7 @@ int32 scriptlib::duel_check_summon_count(lua_State *L) { ...@@ -1934,7 +1934,7 @@ int32 scriptlib::duel_check_summon_count(lua_State *L) {
pcard = *(card**) lua_touserdata(L, 1); pcard = *(card**) lua_touserdata(L, 1);
} }
duel* pduel = interpreter::get_duel_info(L); duel* pduel = interpreter::get_duel_info(L);
uint32 playerid = pduel->game_field->core.reason_player; int32 playerid = pduel->game_field->core.reason_player;
if((pcard && pcard->is_affected_by_effect(EFFECT_EXTRA_SUMMON_COUNT)) if((pcard && pcard->is_affected_by_effect(EFFECT_EXTRA_SUMMON_COUNT))
|| pduel->game_field->core.summon_count[playerid] < pduel->game_field->get_summon_count_limit(playerid)) || pduel->game_field->core.summon_count[playerid] < pduel->game_field->get_summon_count_limit(playerid))
lua_pushboolean(L, 1); lua_pushboolean(L, 1);
...@@ -1945,7 +1945,7 @@ int32 scriptlib::duel_check_summon_count(lua_State *L) { ...@@ -1945,7 +1945,7 @@ int32 scriptlib::duel_check_summon_count(lua_State *L) {
// Return usable count in zone of playerid's Main MZONE or SZONE(0~4) when uplayer moves a card to playerid's field (can be negative). // Return usable count in zone of playerid's Main MZONE or SZONE(0~4) when uplayer moves a card to playerid's field (can be negative).
int32 scriptlib::duel_get_location_count(lua_State *L) { int32 scriptlib::duel_get_location_count(lua_State *L) {
check_param_count(L, 2); check_param_count(L, 2);
uint32 playerid = (uint32)lua_tointeger(L, 1); int32 playerid = (int32)lua_tointeger(L, 1);
uint32 location = (uint32)lua_tointeger(L, 2); uint32 location = (uint32)lua_tointeger(L, 2);
if(playerid != 0 && playerid != 1) if(playerid != 0 && playerid != 1)
return 0; return 0;
...@@ -1967,7 +1967,7 @@ int32 scriptlib::duel_get_location_count(lua_State *L) { ...@@ -1967,7 +1967,7 @@ int32 scriptlib::duel_get_location_count(lua_State *L) {
// Return usable count in zone of playerid's Main MZONE after mcard or mgroup leaves the field. // Return usable count in zone of playerid's Main MZONE after mcard or mgroup leaves the field.
int32 scriptlib::duel_get_mzone_count(lua_State *L) { int32 scriptlib::duel_get_mzone_count(lua_State *L) {
check_param_count(L, 1); check_param_count(L, 1);
uint32 playerid = (uint32)lua_tointeger(L, 1); int32 playerid = (int32)lua_tointeger(L, 1);
if(playerid != 0 && playerid != 1) if(playerid != 0 && playerid != 1)
return 0; return 0;
duel* pduel = interpreter::get_duel_info(L); duel* pduel = interpreter::get_duel_info(L);
...@@ -2023,7 +2023,7 @@ int32 scriptlib::duel_get_mzone_count(lua_State *L) { ...@@ -2023,7 +2023,7 @@ int32 scriptlib::duel_get_mzone_count(lua_State *L) {
// Return usable count in zone of playerid's MZONE after mcard or mgroup leaves the field // Return usable count in zone of playerid's MZONE after mcard or mgroup leaves the field
int32 scriptlib::duel_get_location_count_fromex(lua_State *L) { int32 scriptlib::duel_get_location_count_fromex(lua_State *L) {
check_param_count(L, 1); check_param_count(L, 1);
uint32 playerid = (uint32)lua_tointeger(L, 1); int32 playerid = (int32)lua_tointeger(L, 1);
if(playerid != 0 && playerid != 1) if(playerid != 0 && playerid != 1)
return 0; return 0;
duel* pduel = interpreter::get_duel_info(L); duel* pduel = interpreter::get_duel_info(L);
...@@ -2097,7 +2097,7 @@ int32 scriptlib::duel_get_location_count_fromex(lua_State *L) { ...@@ -2097,7 +2097,7 @@ int32 scriptlib::duel_get_location_count_fromex(lua_State *L) {
// Return the number of available slots in the Main MZONE and Extra MZONE of `playerid`. // Return the number of available slots in the Main MZONE and Extra MZONE of `playerid`.
int32 scriptlib::duel_get_usable_mzone_count(lua_State *L) { int32 scriptlib::duel_get_usable_mzone_count(lua_State *L) {
check_param_count(L, 1); check_param_count(L, 1);
uint32 playerid = (uint32)lua_tointeger(L, 1); int32 playerid = (int32)lua_tointeger(L, 1);
if(playerid != 0 && playerid != 1) if(playerid != 0 && playerid != 1)
return 0; return 0;
duel* pduel = interpreter::get_duel_info(L); duel* pduel = interpreter::get_duel_info(L);
...@@ -2145,7 +2145,7 @@ int32 scriptlib::duel_get_linked_group_count(lua_State *L) { ...@@ -2145,7 +2145,7 @@ int32 scriptlib::duel_get_linked_group_count(lua_State *L) {
} }
int32 scriptlib::duel_get_linked_zone(lua_State *L) { int32 scriptlib::duel_get_linked_zone(lua_State *L) {
check_param_count(L, 1); check_param_count(L, 1);
uint32 playerid = (uint32)lua_tointeger(L, 1); int32 playerid = (int32)lua_tointeger(L, 1);
if(playerid != 0 && playerid != 1) if(playerid != 0 && playerid != 1)
return 0; return 0;
duel* pduel = interpreter::get_duel_info(L); duel* pduel = interpreter::get_duel_info(L);
...@@ -2154,7 +2154,7 @@ int32 scriptlib::duel_get_linked_zone(lua_State *L) { ...@@ -2154,7 +2154,7 @@ int32 scriptlib::duel_get_linked_zone(lua_State *L) {
} }
int32 scriptlib::duel_get_field_card(lua_State *L) { int32 scriptlib::duel_get_field_card(lua_State *L) {
check_param_count(L, 3); check_param_count(L, 3);
uint32 playerid = (uint32)lua_tointeger(L, 1); int32 playerid = (int32)lua_tointeger(L, 1);
uint32 location = (uint32)lua_tointeger(L, 2); uint32 location = (uint32)lua_tointeger(L, 2);
uint32 sequence = (uint32)lua_tointeger(L, 3); uint32 sequence = (uint32)lua_tointeger(L, 3);
if(playerid != 0 && playerid != 1) if(playerid != 0 && playerid != 1)
...@@ -2168,7 +2168,7 @@ int32 scriptlib::duel_get_field_card(lua_State *L) { ...@@ -2168,7 +2168,7 @@ int32 scriptlib::duel_get_field_card(lua_State *L) {
} }
int32 scriptlib::duel_check_location(lua_State *L) { int32 scriptlib::duel_check_location(lua_State *L) {
check_param_count(L, 3); check_param_count(L, 3);
uint32 playerid = (uint32)lua_tointeger(L, 1); int32 playerid = (int32)lua_tointeger(L, 1);
uint32 location = (uint32)lua_tointeger(L, 2); uint32 location = (uint32)lua_tointeger(L, 2);
uint32 sequence = (uint32)lua_tointeger(L, 3); uint32 sequence = (uint32)lua_tointeger(L, 3);
if(playerid != 0 && playerid != 1) if(playerid != 0 && playerid != 1)
...@@ -2353,7 +2353,7 @@ int32 scriptlib::duel_get_current_phase(lua_State *L) { ...@@ -2353,7 +2353,7 @@ int32 scriptlib::duel_get_current_phase(lua_State *L) {
} }
int32 scriptlib::duel_skip_phase(lua_State *L) { int32 scriptlib::duel_skip_phase(lua_State *L) {
check_param_count(L, 4); check_param_count(L, 4);
uint32 playerid = (uint32)lua_tointeger(L, 1); int32 playerid = (int32)lua_tointeger(L, 1);
if(playerid != 0 && playerid != 1) if(playerid != 0 && playerid != 1)
return 0; return 0;
uint32 phase = (uint32)lua_tointeger(L, 2); uint32 phase = (uint32)lua_tointeger(L, 2);
...@@ -2413,7 +2413,7 @@ int32 scriptlib::duel_get_battle_monster(lua_State *L) { ...@@ -2413,7 +2413,7 @@ int32 scriptlib::duel_get_battle_monster(lua_State *L) {
check_param_count(L, 1); check_param_count(L, 1);
check_param(L, PARAM_TYPE_INT, 1); check_param(L, PARAM_TYPE_INT, 1);
duel* pduel = interpreter::get_duel_info(L); duel* pduel = interpreter::get_duel_info(L);
uint32 playerid = (uint32)lua_tointeger(L, 1); int32 playerid = (int32)lua_tointeger(L, 1);
card* attacker = pduel->game_field->core.attacker; card* attacker = pduel->game_field->core.attacker;
card* defender = pduel->game_field->core.attack_target; card* defender = pduel->game_field->core.attack_target;
for(int32 i = 0; i < 2; i++) { for(int32 i = 0; i < 2; i++) {
...@@ -2485,7 +2485,7 @@ int32 scriptlib::duel_adjust_all(lua_State* L) { ...@@ -2485,7 +2485,7 @@ int32 scriptlib::duel_adjust_all(lua_State* L) {
*/ */
int32 scriptlib::duel_get_field_group(lua_State *L) { int32 scriptlib::duel_get_field_group(lua_State *L) {
check_param_count(L, 3); check_param_count(L, 3);
uint32 playerid = (uint32)lua_tointeger(L, 1); int32 playerid = (int32)lua_tointeger(L, 1);
uint32 location1 = (uint32)lua_tointeger(L, 2); uint32 location1 = (uint32)lua_tointeger(L, 2);
uint32 location2 = (uint32)lua_tointeger(L, 3); uint32 location2 = (uint32)lua_tointeger(L, 3);
duel* pduel = interpreter::get_duel_info(L); duel* pduel = interpreter::get_duel_info(L);
...@@ -2501,7 +2501,7 @@ int32 scriptlib::duel_get_field_group(lua_State *L) { ...@@ -2501,7 +2501,7 @@ int32 scriptlib::duel_get_field_group(lua_State *L) {
*/ */
int32 scriptlib::duel_get_field_group_count(lua_State *L) { int32 scriptlib::duel_get_field_group_count(lua_State *L) {
check_param_count(L, 3); check_param_count(L, 3);
uint32 playerid = (uint32)lua_tointeger(L, 1); int32 playerid = (int32)lua_tointeger(L, 1);
uint32 location1 = (uint32)lua_tointeger(L, 2); uint32 location1 = (uint32)lua_tointeger(L, 2);
uint32 location2 = (uint32)lua_tointeger(L, 3); uint32 location2 = (uint32)lua_tointeger(L, 3);
duel* pduel = interpreter::get_duel_info(L); duel* pduel = interpreter::get_duel_info(L);
...@@ -2516,7 +2516,7 @@ int32 scriptlib::duel_get_field_group_count(lua_State *L) { ...@@ -2516,7 +2516,7 @@ int32 scriptlib::duel_get_field_group_count(lua_State *L) {
*/ */
int32 scriptlib::duel_get_decktop_group(lua_State *L) { int32 scriptlib::duel_get_decktop_group(lua_State *L) {
check_param_count(L, 2); check_param_count(L, 2);
uint32 playerid = (uint32)lua_tointeger(L, 1); int32 playerid = (int32)lua_tointeger(L, 1);
uint32 count = (uint32)lua_tointeger(L, 2); uint32 count = (uint32)lua_tointeger(L, 2);
duel* pduel = interpreter::get_duel_info(L); duel* pduel = interpreter::get_duel_info(L);
group* pgroup = pduel->new_group(); group* pgroup = pduel->new_group();
...@@ -2533,7 +2533,7 @@ int32 scriptlib::duel_get_decktop_group(lua_State *L) { ...@@ -2533,7 +2533,7 @@ int32 scriptlib::duel_get_decktop_group(lua_State *L) {
*/ */
int32 scriptlib::duel_get_extratop_group(lua_State *L) { int32 scriptlib::duel_get_extratop_group(lua_State *L) {
check_param_count(L, 2); check_param_count(L, 2);
uint32 playerid = (uint32)lua_tointeger(L, 1); int32 playerid = (int32)lua_tointeger(L, 1);
uint32 count = (uint32)lua_tointeger(L, 2); uint32 count = (uint32)lua_tointeger(L, 2);
duel* pduel = interpreter::get_duel_info(L); duel* pduel = interpreter::get_duel_info(L);
group* pgroup = pduel->new_group(); group* pgroup = pduel->new_group();
...@@ -2662,7 +2662,7 @@ int32 scriptlib::duel_select_matching_cards(lua_State *L) { ...@@ -2662,7 +2662,7 @@ int32 scriptlib::duel_select_matching_cards(lua_State *L) {
else if(check_param(L, PARAM_TYPE_GROUP, 8, TRUE)) else if(check_param(L, PARAM_TYPE_GROUP, 8, TRUE))
pexgroup = *(group**) lua_touserdata(L, 8); pexgroup = *(group**) lua_touserdata(L, 8);
uint32 extraargs = lua_gettop(L) - 8; uint32 extraargs = lua_gettop(L) - 8;
uint32 playerid = (uint32)lua_tointeger(L, 1); int32 playerid = (int32)lua_tointeger(L, 1);
if(playerid != 0 && playerid != 1) if(playerid != 0 && playerid != 1)
return 0; return 0;
duel* pduel = interpreter::get_duel_info(L); duel* pduel = interpreter::get_duel_info(L);
...@@ -2693,7 +2693,7 @@ int32 scriptlib::duel_select_matching_cards(lua_State *L) { ...@@ -2693,7 +2693,7 @@ int32 scriptlib::duel_select_matching_cards(lua_State *L) {
*/ */
int32 scriptlib::duel_get_release_group(lua_State *L) { int32 scriptlib::duel_get_release_group(lua_State *L) {
check_param_count(L, 1); check_param_count(L, 1);
uint32 playerid = (uint32)lua_tointeger(L, 1); int32 playerid = (int32)lua_tointeger(L, 1);
if(playerid != 0 && playerid != 1) if(playerid != 0 && playerid != 1)
return 0; return 0;
uint32 hand = FALSE; uint32 hand = FALSE;
...@@ -2715,7 +2715,7 @@ int32 scriptlib::duel_get_release_group(lua_State *L) { ...@@ -2715,7 +2715,7 @@ int32 scriptlib::duel_get_release_group(lua_State *L) {
*/ */
int32 scriptlib::duel_get_release_group_count(lua_State *L) { int32 scriptlib::duel_get_release_group_count(lua_State *L) {
check_param_count(L, 1); check_param_count(L, 1);
uint32 playerid = (uint32)lua_tointeger(L, 1); int32 playerid = (int32)lua_tointeger(L, 1);
if(playerid != 0 && playerid != 1) if(playerid != 0 && playerid != 1)
return 0; return 0;
uint32 hand = FALSE; uint32 hand = FALSE;
...@@ -2926,7 +2926,7 @@ int32 scriptlib::duel_select_tribute(lua_State *L) { ...@@ -2926,7 +2926,7 @@ int32 scriptlib::duel_select_tribute(lua_State *L) {
check_action_permission(L); check_action_permission(L);
check_param_count(L, 4); check_param_count(L, 4);
check_param(L, PARAM_TYPE_CARD, 2); check_param(L, PARAM_TYPE_CARD, 2);
uint32 playerid = (uint32)lua_tointeger(L, 1); int32 playerid = (int32)lua_tointeger(L, 1);
if(playerid != 0 && playerid != 1) if(playerid != 0 && playerid != 1)
return 0; return 0;
card* target = *(card**) lua_touserdata(L, 2); card* target = *(card**) lua_touserdata(L, 2);
...@@ -3036,7 +3036,7 @@ int32 scriptlib::duel_select_target(lua_State *L) { ...@@ -3036,7 +3036,7 @@ int32 scriptlib::duel_select_target(lua_State *L) {
else if(check_param(L, PARAM_TYPE_GROUP, 8, TRUE)) else if(check_param(L, PARAM_TYPE_GROUP, 8, TRUE))
pexgroup = *(group**) lua_touserdata(L, 8); pexgroup = *(group**) lua_touserdata(L, 8);
uint32 extraargs = lua_gettop(L) - 8; uint32 extraargs = lua_gettop(L) - 8;
uint32 playerid = (uint32)lua_tointeger(L, 1); int32 playerid = (int32)lua_tointeger(L, 1);
if(playerid != 0 && playerid != 1) if(playerid != 0 && playerid != 1)
return 0; return 0;
duel* pduel = interpreter::get_duel_info(L); duel* pduel = interpreter::get_duel_info(L);
...@@ -3450,7 +3450,7 @@ int32 scriptlib::duel_clear_target_card(lua_State *L) { ...@@ -3450,7 +3450,7 @@ int32 scriptlib::duel_clear_target_card(lua_State *L) {
int32 scriptlib::duel_set_target_player(lua_State *L) { int32 scriptlib::duel_set_target_player(lua_State *L) {
check_action_permission(L); check_action_permission(L);
check_param_count(L, 1); check_param_count(L, 1);
uint32 playerid = (uint32)lua_tointeger(L, 1); int32 playerid = (int32)lua_tointeger(L, 1);
duel* pduel = interpreter::get_duel_info(L); duel* pduel = interpreter::get_duel_info(L);
chain* ch = pduel->game_field->get_chain(0); chain* ch = pduel->game_field->get_chain(0);
if(ch) if(ch)
...@@ -3481,7 +3481,7 @@ int32 scriptlib::duel_set_operation_info(lua_State *L) { ...@@ -3481,7 +3481,7 @@ int32 scriptlib::duel_set_operation_info(lua_State *L) {
uint32 ct = (uint32)lua_tointeger(L, 1); uint32 ct = (uint32)lua_tointeger(L, 1);
uint32 cate = (uint32)lua_tointeger(L, 2); uint32 cate = (uint32)lua_tointeger(L, 2);
uint32 count = (uint32)lua_tointeger(L, 4); uint32 count = (uint32)lua_tointeger(L, 4);
uint32 playerid = (uint32)lua_tointeger(L, 5); int32 playerid = (int32)lua_tointeger(L, 5);
uint32 param = (uint32)lua_tointeger(L, 6); uint32 param = (uint32)lua_tointeger(L, 6);
duel* pduel; duel* pduel;
if(check_param(L, PARAM_TYPE_CARD, 3, TRUE)) { if(check_param(L, PARAM_TYPE_CARD, 3, TRUE)) {
...@@ -3594,7 +3594,7 @@ int32 scriptlib::duel_select_xyz_material(lua_State *L) { ...@@ -3594,7 +3594,7 @@ int32 scriptlib::duel_select_xyz_material(lua_State *L) {
findex = 3; findex = 3;
} }
card* scard = *(card**) lua_touserdata(L, 2); card* scard = *(card**) lua_touserdata(L, 2);
uint32 playerid = (uint32)lua_tointeger(L, 1); int32 playerid = (int32)lua_tointeger(L, 1);
uint32 lv = (uint32)lua_tointeger(L, 4); uint32 lv = (uint32)lua_tointeger(L, 4);
uint32 minc = (uint32)lua_tointeger(L, 5); uint32 minc = (uint32)lua_tointeger(L, 5);
uint32 maxc = (uint32)lua_tointeger(L, 6); uint32 maxc = (uint32)lua_tointeger(L, 6);
......
libeffect.cpp
View file @ 7e09ab94
...@@ -97,7 +97,7 @@ int32 scriptlib::effect_set_absolute_range(lua_State *L) { ...@@ -97,7 +97,7 @@ int32 scriptlib::effect_set_absolute_range(lua_State *L) {
check_param_count(L, 4); check_param_count(L, 4);
check_param(L, PARAM_TYPE_EFFECT, 1); check_param(L, PARAM_TYPE_EFFECT, 1);
effect* peffect = *(effect**) lua_touserdata(L, 1); effect* peffect = *(effect**) lua_touserdata(L, 1);
uint32 playerid = (uint32)lua_tointeger(L, 2); int32 playerid = (int32)lua_tointeger(L, 2);
uint32 s = (uint32)lua_tointeger(L, 3); uint32 s = (uint32)lua_tointeger(L, 3);
uint32 o = (uint32)lua_tointeger(L, 4); uint32 o = (uint32)lua_tointeger(L, 4);
if(playerid == 0) { if(playerid == 0) {
...@@ -292,7 +292,7 @@ int32 scriptlib::effect_set_owner_player(lua_State *L) { ...@@ -292,7 +292,7 @@ int32 scriptlib::effect_set_owner_player(lua_State *L) {
check_param_count(L, 1); check_param_count(L, 1);
check_param(L, PARAM_TYPE_EFFECT, 1); check_param(L, PARAM_TYPE_EFFECT, 1);
effect* peffect = *(effect**) lua_touserdata(L, 1); effect* peffect = *(effect**) lua_touserdata(L, 1);
uint32 p = (uint32)lua_tointeger(L, 2); int32 p = (int32)lua_tointeger(L, 2);
if(p != 0 && p != 1) if(p != 0 && p != 1)
return 0; return 0;
peffect->effect_owner = p; peffect->effect_owner = p;
...@@ -502,7 +502,7 @@ int32 scriptlib::effect_is_has_type(lua_State *L) { ...@@ -502,7 +502,7 @@ int32 scriptlib::effect_is_has_type(lua_State *L) {
int32 scriptlib::effect_is_activatable(lua_State *L) { int32 scriptlib::effect_is_activatable(lua_State *L) {
check_param_count(L, 2); check_param_count(L, 2);
check_param(L, PARAM_TYPE_EFFECT, 1); check_param(L, PARAM_TYPE_EFFECT, 1);
uint32 playerid = (uint32)lua_tointeger(L, 2); int32 playerid = (int32)lua_tointeger(L, 2);
effect* peffect = *(effect**) lua_touserdata(L, 1); effect* peffect = *(effect**) lua_touserdata(L, 1);
uint32 neglect_loc = 0; uint32 neglect_loc = 0;
uint32 neglect_target = 0; uint32 neglect_target = 0;
...@@ -554,7 +554,7 @@ int32 scriptlib::effect_check_count_limit(lua_State *L) { ...@@ -554,7 +554,7 @@ int32 scriptlib::effect_check_count_limit(lua_State *L) {
check_param_count(L, 2); check_param_count(L, 2);
check_param(L, PARAM_TYPE_EFFECT, 1); check_param(L, PARAM_TYPE_EFFECT, 1);
effect* peffect = *(effect**) lua_touserdata(L, 1); effect* peffect = *(effect**) lua_touserdata(L, 1);
uint32 p = (uint32)lua_tointeger(L, 2); int32 p = (int32)lua_tointeger(L, 2);
lua_pushboolean(L, peffect->check_count_limit(p)); lua_pushboolean(L, peffect->check_count_limit(p));
return 1; return 1;
} }
...@@ -562,12 +562,12 @@ int32 scriptlib::effect_use_count_limit(lua_State *L) { ...@@ -562,12 +562,12 @@ int32 scriptlib::effect_use_count_limit(lua_State *L) {
check_param_count(L, 2); check_param_count(L, 2);
check_param(L, PARAM_TYPE_EFFECT, 1); check_param(L, PARAM_TYPE_EFFECT, 1);
effect* peffect = *(effect**) lua_touserdata(L, 1); effect* peffect = *(effect**) lua_touserdata(L, 1);
uint32 p = (uint32)lua_tointeger(L, 2); int32 p = (int32)lua_tointeger(L, 2);
uint32 count = 1; int32 count = 1;
uint32 oath_only = 0; int32 oath_only = 0;
uint32 code = peffect->count_code; uint32 code = peffect->count_code;
if(lua_gettop(L) > 2) { if(lua_gettop(L) > 2) {
count = (uint32)lua_tointeger(L, 3); count = (int32)lua_tointeger(L, 3);
if (lua_gettop(L) > 3) if (lua_gettop(L) > 3)
oath_only = lua_toboolean(L, 4); oath_only = lua_toboolean(L, 4);
} }
......
libgroup.cpp
View file @ 7e09ab94
...@@ -214,7 +214,7 @@ int32 scriptlib::group_filter_select(lua_State *L) { ...@@ -214,7 +214,7 @@ int32 scriptlib::group_filter_select(lua_State *L) {
cset.erase(pcard); cset.erase(pcard);
} }
duel* pduel = pgroup->pduel; duel* pduel = pgroup->pduel;
uint32 playerid = (uint32)lua_tointeger(L, 2); int32 playerid = (int32)lua_tointeger(L, 2);
if(playerid != 0 && playerid != 1) if(playerid != 0 && playerid != 1)
return 0; return 0;
uint32 min = (uint32)lua_tointeger(L, 4); uint32 min = (uint32)lua_tointeger(L, 4);
...@@ -252,7 +252,7 @@ int32 scriptlib::group_select(lua_State *L) { ...@@ -252,7 +252,7 @@ int32 scriptlib::group_select(lua_State *L) {
cset.erase(pcard); cset.erase(pcard);
} }
duel* pduel = pgroup->pduel; duel* pduel = pgroup->pduel;
uint32 playerid = (uint32)lua_tointeger(L, 2); int32 playerid = (int32)lua_tointeger(L, 2);
if(playerid != 0 && playerid != 1) if(playerid != 0 && playerid != 1)
return 0; return 0;
uint32 min = (uint32)lua_tointeger(L, 3); uint32 min = (uint32)lua_tointeger(L, 3);
...@@ -282,7 +282,7 @@ int32 scriptlib::group_select_unselect(lua_State *L) { ...@@ -282,7 +282,7 @@ int32 scriptlib::group_select_unselect(lua_State *L) {
if(check_param(L, PARAM_TYPE_GROUP, 2, TRUE)) if(check_param(L, PARAM_TYPE_GROUP, 2, TRUE))
unselect_group = *(group**)lua_touserdata(L, 2); unselect_group = *(group**)lua_touserdata(L, 2);
duel* pduel = select_group->pduel; duel* pduel = select_group->pduel;
uint32 playerid = (uint32)lua_tointeger(L, 3); int32 playerid = (int32)lua_tointeger(L, 3);
if(playerid != 0 && playerid != 1) if(playerid != 0 && playerid != 1)
return 0; return 0;
if(select_group->container.size() == 0 && (!unselect_group || unselect_group->container.size() == 0)) if(select_group->container.size() == 0 && (!unselect_group || unselect_group->container.size() == 0))
...@@ -390,7 +390,7 @@ int32 scriptlib::group_cancelable_select(lua_State *L) { ...@@ -390,7 +390,7 @@ int32 scriptlib::group_cancelable_select(lua_State *L) {
cset.erase(pcard); cset.erase(pcard);
} }
duel* pduel = pgroup->pduel; duel* pduel = pgroup->pduel;
uint32 playerid = (uint32)lua_tointeger(L, 2); int32 playerid = (int32)lua_tointeger(L, 2);
if(playerid != 0 && playerid != 1) if(playerid != 0 && playerid != 1)
return 0; return 0;
uint32 min = (uint32)lua_tointeger(L, 3); uint32 min = (uint32)lua_tointeger(L, 3);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment