Skip to content

Y
ygopro-core
Commit e98fd8cc authored by mercury233's avatar mercury233
Browse files
Options

Merge branch 'master' of https://github.com/Fluorohydride/ygopro-core

parents 7b4cd8d5 ac12ab98
Show whitespace changes
Inline Side-by-side
Showing with 9 additions and 5 deletions
field.cpp
View file @ e98fd8cc
...@@ -120,6 +120,8 @@ field::field(duel* pduel) { ...@@ -120,6 +120,8 @@ field::field(duel* pduel) {
nil_event.reason = 0; nil_event.reason = 0;
nil_event.reason_effect = 0; nil_event.reason_effect = 0;
nil_event.reason_player = PLAYER_NONE; nil_event.reason_player = PLAYER_NONE;
returns = { 0 };
temp_card = NULL;
} }
void field::reload_field_info() { void field::reload_field_info() {
pduel->write_buffer8(MSG_RELOAD_FIELD); pduel->write_buffer8(MSG_RELOAD_FIELD);
......
libduel.cpp
View file @ e98fd8cc
...@@ -865,11 +865,13 @@ int32 scriptlib::duel_move_sequence(lua_State *L) { ...@@ -865,11 +865,13 @@ int32 scriptlib::duel_move_sequence(lua_State *L) {
int32 seq = (int32)lua_tointeger(L, 2); int32 seq = (int32)lua_tointeger(L, 2);
duel* pduel = pcard->pduel; duel* pduel = pcard->pduel;
int32 playerid = pcard->current.controler; int32 playerid = pcard->current.controler;
if(pcard->is_affect_by_effect(pduel->game_field->core.reason_effect)) {
pduel->game_field->move_card(playerid, pcard, pcard->current.location, seq); pduel->game_field->move_card(playerid, pcard, pcard->current.location, seq);
pduel->game_field->raise_single_event(pcard, 0, EVENT_MOVE, pduel->game_field->core.reason_effect, 0, pduel->game_field->core.reason_player, playerid, 0); pduel->game_field->raise_single_event(pcard, 0, EVENT_MOVE, pduel->game_field->core.reason_effect, 0, pduel->game_field->core.reason_player, playerid, 0);
pduel->game_field->raise_event(pcard, EVENT_MOVE, pduel->game_field->core.reason_effect, 0, pduel->game_field->core.reason_player, playerid, 0); pduel->game_field->raise_event(pcard, EVENT_MOVE, pduel->game_field->core.reason_effect, 0, pduel->game_field->core.reason_player, playerid, 0);
pduel->game_field->process_single_event(); pduel->game_field->process_single_event();
pduel->game_field->process_instant_event(); pduel->game_field->process_instant_event();
}
return 0; return 0;
} }
int32 scriptlib::duel_swap_sequence(lua_State *L) { int32 scriptlib::duel_swap_sequence(lua_State *L) {
......
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