Skip to content

Y
ygopro-core
Commit 94dcb8a2 authored by Chen Bill's avatar Chen Bill Committed by GitHub
Browse files
Options

field: change signature of group raise_event (#666) 

* field: update draw(uint16 step, ...

* field: change signature of group raise_event

* remove (card*)0
parent 6b9b2419
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 98 additions and 104 deletions
card.cpp
View file @ 94dcb8a2
...@@ -1650,10 +1650,10 @@ void card::xyz_overlay(card_set* materials) { ...@@ -1650,10 +1650,10 @@ void card::xyz_overlay(card_set* materials) {
} }
if(leave_grave.size() || leave_deck.size()) { if(leave_grave.size() || leave_deck.size()) {
if(leave_grave.size()) { if(leave_grave.size()) {
pduel->game_field->raise_event(&leave_grave, EVENT_LEAVE_GRAVE, pduel->game_field->core.reason_effect, REASON_XYZ + REASON_MATERIAL, pduel->game_field->core.reason_player, 0, 0); pduel->game_field->raise_event(leave_grave, EVENT_LEAVE_GRAVE, pduel->game_field->core.reason_effect, REASON_XYZ + REASON_MATERIAL, pduel->game_field->core.reason_player, 0, 0);
} }
if(leave_deck.size()) { if(leave_deck.size()) {
pduel->game_field->raise_event(&leave_deck, EVENT_LEAVE_DECK, pduel->game_field->core.reason_effect, REASON_XYZ + REASON_MATERIAL, pduel->game_field->core.reason_player, 0, 0); pduel->game_field->raise_event(leave_deck, EVENT_LEAVE_DECK, pduel->game_field->core.reason_effect, REASON_XYZ + REASON_MATERIAL, pduel->game_field->core.reason_player, 0, 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();
......
field.h
View file @ 94dcb8a2
...@@ -527,7 +527,7 @@ public: ...@@ -527,7 +527,7 @@ public:
int32 execute_operation(uint16 step, effect* peffect, uint8 triggering_player); int32 execute_operation(uint16 step, effect* peffect, uint8 triggering_player);
int32 execute_target(uint16 step, effect* peffect, uint8 triggering_player); int32 execute_target(uint16 step, effect* peffect, uint8 triggering_player);
void raise_event(card* event_card, uint32 event_code, effect* reason_effect, uint32 reason, uint8 reason_player, uint8 event_player, uint32 event_value); void raise_event(card* event_card, uint32 event_code, effect* reason_effect, uint32 reason, uint8 reason_player, uint8 event_player, uint32 event_value);
void raise_event(card_set* event_cards, uint32 event_code, effect* reason_effect, uint32 reason, uint8 reason_player, uint8 event_player, uint32 event_value); void raise_event(const card_set& event_cards, uint32 event_code, effect* reason_effect, uint32 reason, uint8 reason_player, uint8 event_player, uint32 event_value);
void raise_single_event(card* trigger_card, card_set* event_cards, uint32 event_code, effect* reason_effect, uint32 reason, uint8 reason_player, uint8 event_player, uint32 event_value); void raise_single_event(card* trigger_card, card_set* event_cards, uint32 event_code, effect* reason_effect, uint32 reason, uint8 reason_player, uint8 event_player, uint32 event_value);
int32 check_event(uint32 code, tevent* pe = nullptr); int32 check_event(uint32 code, tevent* pe = nullptr);
int32 check_event_c(effect* peffect, uint8 playerid, int32 neglect_con, int32 neglect_cost, int32 copy_info, tevent* pe = nullptr); int32 check_event_c(effect* peffect, uint8 playerid, int32 neglect_con, int32 neglect_cost, int32 copy_info, tevent* pe = nullptr);
......
libduel.cpp
View file @ 94dcb8a2
...@@ -939,7 +939,7 @@ int32 scriptlib::duel_swap_sequence(lua_State *L) { ...@@ -939,7 +939,7 @@ int32 scriptlib::duel_swap_sequence(lua_State *L) {
swapped.insert(pcard2); swapped.insert(pcard2);
pduel->game_field->raise_single_event(pcard1, 0, EVENT_MOVE, pduel->game_field->core.reason_effect, 0, pduel->game_field->core.reason_player, player, 0); pduel->game_field->raise_single_event(pcard1, 0, EVENT_MOVE, pduel->game_field->core.reason_effect, 0, pduel->game_field->core.reason_player, player, 0);
pduel->game_field->raise_single_event(pcard2, 0, EVENT_MOVE, pduel->game_field->core.reason_effect, 0, pduel->game_field->core.reason_player, player, 0); pduel->game_field->raise_single_event(pcard2, 0, EVENT_MOVE, pduel->game_field->core.reason_effect, 0, pduel->game_field->core.reason_player, player, 0);
pduel->game_field->raise_event(&swapped, EVENT_MOVE, pduel->game_field->core.reason_effect, 0, pduel->game_field->core.reason_player, player, 0); pduel->game_field->raise_event(swapped, EVENT_MOVE, pduel->game_field->core.reason_effect, 0, pduel->game_field->core.reason_player, player, 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();
} }
...@@ -1147,7 +1147,7 @@ int32 scriptlib::duel_raise_event(lua_State *L) { ...@@ -1147,7 +1147,7 @@ int32 scriptlib::duel_raise_event(lua_State *L) {
if(pcard) if(pcard)
pduel->game_field->raise_event(pcard, code, peffect, r, rp, ep, ev); pduel->game_field->raise_event(pcard, code, peffect, r, rp, ep, ev);
else else
pduel->game_field->raise_event(&pgroup->container, code, peffect, r, rp, ep, ev); pduel->game_field->raise_event(pgroup->container, code, peffect, r, rp, ep, ev);
pduel->game_field->process_instant_event(); pduel->game_field->process_instant_event();
return lua_yield(L, 0); return lua_yield(L, 0);
} }
...@@ -1373,7 +1373,7 @@ int32 scriptlib::duel_equip_complete(lua_State *L) { ...@@ -1373,7 +1373,7 @@ int32 scriptlib::duel_equip_complete(lua_State *L) {
for(auto& equip_target : etargets) for(auto& equip_target : etargets)
pduel->game_field->raise_single_event(equip_target, &pduel->game_field->core.equiping_cards, EVENT_EQUIP, pduel->game_field->raise_single_event(equip_target, &pduel->game_field->core.equiping_cards, EVENT_EQUIP,
pduel->game_field->core.reason_effect, 0, pduel->game_field->core.reason_player, PLAYER_NONE, 0); pduel->game_field->core.reason_effect, 0, pduel->game_field->core.reason_player, PLAYER_NONE, 0);
pduel->game_field->raise_event(&pduel->game_field->core.equiping_cards, EVENT_EQUIP, pduel->game_field->raise_event(pduel->game_field->core.equiping_cards, EVENT_EQUIP,
pduel->game_field->core.reason_effect, 0, pduel->game_field->core.reason_player, PLAYER_NONE, 0); pduel->game_field->core.reason_effect, 0, pduel->game_field->core.reason_player, PLAYER_NONE, 0);
pduel->game_field->core.hint_timing[0] |= TIMING_EQUIP; pduel->game_field->core.hint_timing[0] |= TIMING_EQUIP;
pduel->game_field->core.hint_timing[1] |= TIMING_EQUIP; pduel->game_field->core.hint_timing[1] |= TIMING_EQUIP;
...@@ -1620,7 +1620,7 @@ int32 scriptlib::duel_shuffle_setcard(lua_State *L) { ...@@ -1620,7 +1620,7 @@ int32 scriptlib::duel_shuffle_setcard(lua_State *L) {
pcard->current.sequence = seq[i]; pcard->current.sequence = seq[i];
pduel->game_field->raise_single_event(pcard, 0, EVENT_MOVE, pcard->current.reason_effect, pcard->current.reason, pcard->current.reason_player, tp, 0); pduel->game_field->raise_single_event(pcard, 0, EVENT_MOVE, pcard->current.reason_effect, pcard->current.reason, pcard->current.reason_player, tp, 0);
} }
pduel->game_field->raise_event(&pgroup->container, EVENT_MOVE, pduel->game_field->core.reason_effect, 0, pduel->game_field->core.reason_player, tp, 0); pduel->game_field->raise_event(pgroup->container, EVENT_MOVE, pduel->game_field->core.reason_effect, 0, pduel->game_field->core.reason_player, tp, 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();
for(int32 i = 0; i < ct; ++i) { for(int32 i = 0; i < ct; ++i) {
...@@ -1778,7 +1778,7 @@ int32 scriptlib::duel_break_effect(lua_State *L) { ...@@ -1778,7 +1778,7 @@ int32 scriptlib::duel_break_effect(lua_State *L) {
check_action_permission(L); check_action_permission(L);
duel* pduel = interpreter::get_duel_info(L); duel* pduel = interpreter::get_duel_info(L);
pduel->game_field->break_effect(); pduel->game_field->break_effect();
pduel->game_field->raise_event((card*)0, EVENT_BREAK_EFFECT, 0, 0, PLAYER_NONE, PLAYER_NONE, 0); pduel->game_field->raise_event(nullptr, EVENT_BREAK_EFFECT, 0, 0, PLAYER_NONE, PLAYER_NONE, 0);
pduel->game_field->process_instant_event(); pduel->game_field->process_instant_event();
return lua_yield(L, 0); return lua_yield(L, 0);
} }
...@@ -1908,7 +1908,7 @@ int32 scriptlib::duel_disable_summon(lua_State *L) { ...@@ -1908,7 +1908,7 @@ int32 scriptlib::duel_disable_summon(lua_State *L) {
if(pcard) if(pcard)
pduel->game_field->raise_event(pcard, event_code, reason_effect, REASON_EFFECT, reason_player, sumplayer, 0); pduel->game_field->raise_event(pcard, event_code, reason_effect, REASON_EFFECT, reason_player, sumplayer, 0);
else else
pduel->game_field->raise_event(&pgroup->container, event_code, reason_effect, REASON_EFFECT, reason_player, sumplayer, 0); pduel->game_field->raise_event(pgroup->container, event_code, reason_effect, REASON_EFFECT, reason_player, sumplayer, 0);
pduel->game_field->process_instant_event(); pduel->game_field->process_instant_event();
return 0; return 0;
} }
......
operations.cpp
View file @ 94dcb8a2
This diff is collapsed.
processor.cpp
View file @ 94dcb8a2
This diff is collapsed.
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