Commit 056c85f2 authored by VanillaSalt's avatar VanillaSalt

fix

parent e1b3a450
...@@ -1634,6 +1634,10 @@ void ClientField::ShowMenu(int flag, int x, int y) { ...@@ -1634,6 +1634,10 @@ void ClientField::ShowMenu(int flag, int x, int y) {
height += 21; height += 21;
} else mainGame->btnMSet->setVisible(false); } else mainGame->btnMSet->setVisible(false);
if(flag & COMMAND_SSET) { if(flag & COMMAND_SSET) {
if(!(clicked_card->type & TYPE_MONSTER))
mainGame->btnSSet->setText(dataManager.GetSysString(1153));
else
mainGame->btnSSet->setText(dataManager.GetSysString(1159));
mainGame->btnSSet->setVisible(true); mainGame->btnSSet->setVisible(true);
mainGame->btnSSet->setRelativePosition(position2di(1, height)); mainGame->btnSSet->setRelativePosition(position2di(1, height));
height += 21; height += 21;
......
...@@ -2779,6 +2779,7 @@ int32 field::send_to(uint16 step, group * targets, effect * reason_effect, uint3 ...@@ -2779,6 +2779,7 @@ int32 field::send_to(uint16 step, group * targets, effect * reason_effect, uint3
pcard->current.reason &= ~REASON_TEMPORARY; pcard->current.reason &= ~REASON_TEMPORARY;
pcard->fieldid = infos.field_id++; pcard->fieldid = infos.field_id++;
pcard->reset(RESET_LEAVE, RESET_EVENT); pcard->reset(RESET_LEAVE, RESET_EVENT);
pcard->relate_effect.clear();
remove_card(pcard); remove_card(pcard);
leave.insert(pcard); leave.insert(pcard);
continue; continue;
......
...@@ -208,6 +208,7 @@ ...@@ -208,6 +208,7 @@
!system 1156 攻击表示 !system 1156 攻击表示
!system 1157 攻击 !system 1157 攻击
!system 1158 查看列表 !system 1158 查看列表
!system 1159 放置
#menu #menu
!system 1200 联机模式 !system 1200 联机模式
!system 1201 单人模式 !system 1201 单人模式
......
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