Commit 44f163ae authored by argon.sun's avatar argon.sun

fix

parent cb12d793
...@@ -411,6 +411,13 @@ bool ClientField::OnEvent(const irr::SEvent& event) { ...@@ -411,6 +411,13 @@ bool ClientField::OnEvent(const irr::SEvent& event) {
mainGame->wCmdMenu->setVisible(false); mainGame->wCmdMenu->setVisible(false);
selectable_cards.clear(); selectable_cards.clear();
switch(command_location) { switch(command_location) {
case LOCATION_DECK: {
for(int i = deck[hovered_controler].size() - 1; i >= 0 ; --i)
selectable_cards.push_back(deck[command_controler][i]);
myswprintf(formatBuffer, L"%ls(%d)", dataManager.GetSysString(1000), deck[command_controler].size());
mainGame->wCardSelect->setText(formatBuffer);
break;
}
case LOCATION_MZONE: { case LOCATION_MZONE: {
ClientCard* pcard = mzone[command_controler][command_sequence]; ClientCard* pcard = mzone[command_controler][command_sequence];
for(int i = 0; i < pcard->overlayed.size(); ++i) for(int i = 0; i < pcard->overlayed.size(); ++i)
...@@ -924,8 +931,12 @@ bool ClientField::OnEvent(const irr::SEvent& event) { ...@@ -924,8 +931,12 @@ bool ClientField::OnEvent(const irr::SEvent& event) {
switch(hovered_location) { switch(hovered_location) {
case LOCATION_DECK: { case LOCATION_DECK: {
int command_flag = 0; int command_flag = 0;
if(deck[hovered_controler].size() == 0)
break;
for(int i = 0; i < deck[hovered_controler].size(); ++i) for(int i = 0; i < deck[hovered_controler].size(); ++i)
command_flag |= deck[hovered_controler][i]->cmdFlag; command_flag |= deck[hovered_controler][i]->cmdFlag;
if(mainGame->dInfo.isSingleMode)
command_flag |= COMMAND_LIST;
list_command = 1; list_command = 1;
ShowMenu(command_flag, x, y); ShowMenu(command_flag, x, y);
break; break;
......
...@@ -603,7 +603,7 @@ int32 interpreter::load_script(char* script_name) { ...@@ -603,7 +603,7 @@ int32 interpreter::load_script(char* script_name) {
} }
int32 interpreter::load_card_script(uint32 code) { int32 interpreter::load_card_script(uint32 code) {
char class_name[20]; char class_name[20];
char script_name[20]; char script_name[64];
sprintf(class_name, "c%d", code); sprintf(class_name, "c%d", code);
lua_getglobal(current_state, class_name); lua_getglobal(current_state, class_name);
//if script is not loaded, create and load it //if script is not loaded, create and load it
......
...@@ -80,6 +80,7 @@ int32 scriptlib::debug_reload_field_begin(lua_State *L) { ...@@ -80,6 +80,7 @@ int32 scriptlib::debug_reload_field_begin(lua_State *L) {
uint32 flag = lua_tointeger(L, 1); uint32 flag = lua_tointeger(L, 1);
pduel->clear(); pduel->clear();
pduel->game_field->core.duel_options = flag; pduel->game_field->core.duel_options = flag;
return 0;
} }
int32 scriptlib::debug_reload_field_end(lua_State *L) { int32 scriptlib::debug_reload_field_end(lua_State *L) {
duel* pduel = interpreter::get_duel_info(L); duel* pduel = interpreter::get_duel_info(L);
...@@ -104,6 +105,7 @@ int32 scriptlib::debug_set_ai_name(lua_State *L) { ...@@ -104,6 +105,7 @@ int32 scriptlib::debug_set_ai_name(lua_State *L) {
pduel->bufferp += len; pduel->bufferp += len;
pduel->bufferlen += len; pduel->bufferlen += len;
pduel->write_buffer8(0); pduel->write_buffer8(0);
return 0;
} }
int32 scriptlib::debug_show_hint(lua_State *L) { int32 scriptlib::debug_show_hint(lua_State *L) {
check_param_count(L, 1); check_param_count(L, 1);
...@@ -119,4 +121,5 @@ int32 scriptlib::debug_show_hint(lua_State *L) { ...@@ -119,4 +121,5 @@ int32 scriptlib::debug_show_hint(lua_State *L) {
pduel->bufferp += len; pduel->bufferp += len;
pduel->bufferlen += len; pduel->bufferlen += len;
pduel->write_buffer8(0); pduel->write_buffer8(0);
return 0;
} }
...@@ -316,6 +316,7 @@ extern "C" DECL_DLLEXPORT int32 query_field_info(ptr pduel, byte* buf) { ...@@ -316,6 +316,7 @@ extern "C" DECL_DLLEXPORT int32 query_field_info(ptr pduel, byte* buf) {
*buf++ = ptduel->game_field->player[playerid].list_remove.size(); *buf++ = ptduel->game_field->player[playerid].list_remove.size();
*buf++ = ptduel->game_field->player[playerid].list_extra.size(); *buf++ = ptduel->game_field->player[playerid].list_extra.size();
} }
return 0;
} }
extern "C" DECL_DLLEXPORT void set_responsei(ptr pduel, int32 value) { extern "C" DECL_DLLEXPORT void set_responsei(ptr pduel, int32 value) {
((duel*)pduel)->set_responsei(value); ((duel*)pduel)->set_responsei(value);
......
...@@ -26,6 +26,7 @@ function c13474291.initial_effect(c) ...@@ -26,6 +26,7 @@ function c13474291.initial_effect(c)
local e4=Effect.CreateEffect(c) local e4=Effect.CreateEffect(c)
e4:SetDescription(aux.Stringid(13474291,0)) e4:SetDescription(aux.Stringid(13474291,0))
e4:SetType(EFFECT_TYPE_IGNITION) e4:SetType(EFFECT_TYPE_IGNITION)
e4:SetProperty(EFFECT_FLAG_CARD_TARGET)
e4:SetRange(LOCATION_MZONE) e4:SetRange(LOCATION_MZONE)
e4:SetCountLimit(1) e4:SetCountLimit(1)
e4:SetTarget(c13474291.cttg) e4:SetTarget(c13474291.cttg)
......
...@@ -9,5 +9,5 @@ lastdeck = sample ...@@ -9,5 +9,5 @@ lastdeck = sample
textfont = c:/windows/fonts/simsun.ttc 14 textfont = c:/windows/fonts/simsun.ttc 14
numfont = c:/windows/fonts/arialbd.ttf numfont = c:/windows/fonts/arialbd.ttf
serverport = 7911 serverport = 7911
lastip = 192.168.3.235 lastip = 119.140.142.231
lastport = 7911 lastport = 7911
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