Skip to content

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

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

parents 9ebbdf39 2e6ad0eb
Hide whitespace changes
Inline Side-by-side
Showing with 14 additions and 3 deletions
interpreter.cpp
View file @ 73765181
...@@ -157,9 +157,18 @@ int32 interpreter::load_card_script(uint32 code) { ...@@ -157,9 +157,18 @@ int32 interpreter::load_card_script(uint32 code) {
lua_pushstring(current_state, "__index"); lua_pushstring(current_state, "__index");
lua_pushvalue(current_state, -2); lua_pushvalue(current_state, -2);
lua_rawset(current_state, -3); lua_rawset(current_state, -3);
lua_getglobal(current_state, class_name);
lua_setglobal(current_state, "self_table");
lua_pushinteger(current_state, code);
lua_setglobal(current_state, "self_code");
char script_name[64]; char script_name[64];
sprintf(script_name, "./script/c%d.lua", code); sprintf(script_name, "./script/c%d.lua", code);
if(!load_script(script_name)) { int32 res = load_script(script_name);
lua_pushnil(current_state);
lua_setglobal(current_state, "self_table");
lua_pushnil(current_state);
lua_setglobal(current_state, "self_code");
if(!res) {
return OPERATION_FAIL; return OPERATION_FAIL;
} }
} }
......
processor.cpp
View file @ 73765181
...@@ -5012,8 +5012,10 @@ int32 field::adjust_step(uint16 step) { ...@@ -5012,8 +5012,10 @@ int32 field::adjust_step(uint16 step) {
return FALSE; return FALSE;
} }
case 15: { case 15: {
raise_event((card*)0, EVENT_ADJUST, 0, 0, PLAYER_NONE, PLAYER_NONE, 0); if(!check_event(EVENT_ADJUST)) {
process_instant_event(); raise_event((card*)0, EVENT_ADJUST, 0, 0, PLAYER_NONE, PLAYER_NONE, 0);
process_instant_event();
}
return FALSE; return FALSE;
} }
case 16: { case 16: {
......
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