Commit b61728fe authored by argon's avatar argon

fix

parent 425c33a6
...@@ -422,7 +422,7 @@ bool ClientField::OnEvent(const irr::SEvent& event) { ...@@ -422,7 +422,7 @@ bool ClientField::OnEvent(const irr::SEvent& event) {
} }
case LOCATION_MZONE: { case LOCATION_MZONE: {
ClientCard* pcard = mzone[command_controler][command_sequence]; ClientCard* pcard = mzone[command_controler][command_sequence];
for(size_t i = 0; i < pcard->overlayed.size(); ++i) for(int32 i = 0; i < pcard->overlayed.size(); ++i)
selectable_cards.push_back(pcard->overlayed[i]); selectable_cards.push_back(pcard->overlayed[i]);
myswprintf(formatBuffer, L"%ls(%d)", dataManager.GetSysString(1007), pcard->overlayed.size()); myswprintf(formatBuffer, L"%ls(%d)", dataManager.GetSysString(1007), pcard->overlayed.size());
mainGame->wCardSelect->setText(formatBuffer); mainGame->wCardSelect->setText(formatBuffer);
...@@ -848,7 +848,7 @@ bool ClientField::OnEvent(const irr::SEvent& event) { ...@@ -848,7 +848,7 @@ bool ClientField::OnEvent(const irr::SEvent& event) {
selectable_cards.clear(); selectable_cards.clear();
switch(hovered_location) { switch(hovered_location) {
case LOCATION_DECK: { case LOCATION_DECK: {
for(int i = deck[hovered_controler].size() - 1; i >= 0 ; --i) for(int32 i = (int32)deck[hovered_controler].size() - 1; i >= 0 ; --i)
selectable_cards.push_back(deck[hovered_controler][i]); selectable_cards.push_back(deck[hovered_controler][i]);
myswprintf(formatBuffer, L"%ls(%d)", dataManager.GetSysString(1000), deck[hovered_controler].size()); myswprintf(formatBuffer, L"%ls(%d)", dataManager.GetSysString(1000), deck[hovered_controler].size());
mainGame->wCardSelect->setText(formatBuffer); mainGame->wCardSelect->setText(formatBuffer);
...@@ -856,28 +856,28 @@ bool ClientField::OnEvent(const irr::SEvent& event) { ...@@ -856,28 +856,28 @@ bool ClientField::OnEvent(const irr::SEvent& event) {
} }
case LOCATION_MZONE: { case LOCATION_MZONE: {
ClientCard* pcard = deck[hovered_controler][hovered_sequence]; ClientCard* pcard = deck[hovered_controler][hovered_sequence];
for(size_t i = 0; i < pcard->overlayed.size(); ++i) for(int32 i = 0; i < pcard->overlayed.size(); ++i)
selectable_cards.push_back(pcard->overlayed[i]); selectable_cards.push_back(pcard->overlayed[i]);
myswprintf(formatBuffer, L"%ls(%d)", dataManager.GetSysString(1007), pcard->overlayed.size()); myswprintf(formatBuffer, L"%ls(%d)", dataManager.GetSysString(1007), pcard->overlayed.size());
mainGame->wCardSelect->setText(formatBuffer); mainGame->wCardSelect->setText(formatBuffer);
break; break;
} }
case LOCATION_GRAVE: { case LOCATION_GRAVE: {
for(size_t i = grave[hovered_controler].size() - 1; i >= 0 ; --i) for(int32 i = (int32)grave[hovered_controler].size() - 1; i >= 0 ; --i)
selectable_cards.push_back(grave[hovered_controler][i]); selectable_cards.push_back(grave[hovered_controler][i]);
myswprintf(formatBuffer, L"%ls(%d)", dataManager.GetSysString(1004), grave[hovered_controler].size()); myswprintf(formatBuffer, L"%ls(%d)", dataManager.GetSysString(1004), grave[hovered_controler].size());
mainGame->wCardSelect->setText(formatBuffer); mainGame->wCardSelect->setText(formatBuffer);
break; break;
} }
case LOCATION_REMOVED: { case LOCATION_REMOVED: {
for(size_t i = remove[hovered_controler].size() - 1; i >= 0 ; --i) for(int32 i = (int32)remove[hovered_controler].size() - 1; i >= 0 ; --i)
selectable_cards.push_back(remove[hovered_controler][i]); selectable_cards.push_back(remove[hovered_controler][i]);
myswprintf(formatBuffer, L"%ls(%d)", dataManager.GetSysString(1005), remove[hovered_controler].size()); myswprintf(formatBuffer, L"%ls(%d)", dataManager.GetSysString(1005), remove[hovered_controler].size());
mainGame->wCardSelect->setText(formatBuffer); mainGame->wCardSelect->setText(formatBuffer);
break; break;
} }
case LOCATION_EXTRA: { case LOCATION_EXTRA: {
for(size_t i = extra[hovered_controler].size() - 1; i >= 0 ; --i) for(int32 i = (int32)extra[hovered_controler].size() - 1; i >= 0 ; --i)
selectable_cards.push_back(extra[hovered_controler][i]); selectable_cards.push_back(extra[hovered_controler][i]);
myswprintf(formatBuffer, L"%ls(%d)", dataManager.GetSysString(1006), extra[hovered_controler].size()); myswprintf(formatBuffer, L"%ls(%d)", dataManager.GetSysString(1006), extra[hovered_controler].size());
mainGame->wCardSelect->setText(formatBuffer); mainGame->wCardSelect->setText(formatBuffer);
......
...@@ -59,7 +59,7 @@ end ...@@ -59,7 +59,7 @@ end
function c6330307.atkcon(e,tp,eg,ep,ev,re,r,rp) function c6330307.atkcon(e,tp,eg,ep,ev,re,r,rp)
local a=Duel.GetAttacker() local a=Duel.GetAttacker()
local at=Duel.GetAttackTarget() local at=Duel.GetAttackTarget()
return a==e:GetHandler():GetEquipTarget() and at:IsRelateToBattle() and at:GetAttack()>0 and a:IsChainAttackable() return at and a==e:GetHandler():GetEquipTarget() and at:IsRelateToBattle() and at:GetAttack()>0 and a:IsChainAttackable()
end end
function c6330307.atkop(e,tp,eg,ep,ev,re,r,rp) function c6330307.atkop(e,tp,eg,ep,ev,re,r,rp)
local at=Duel.GetAttackTarget() local at=Duel.GetAttackTarget()
......
...@@ -38,7 +38,7 @@ end ...@@ -38,7 +38,7 @@ end
function c80978111.operation(e,tp,eg,ep,ev,re,r,rp) function c80978111.operation(e,tp,eg,ep,ev,re,r,rp)
local c=e:GetHandler() local c=e:GetHandler()
if c:IsRelateToEffect(e) and Duel.GetLocationCount(1-tp,LOCATION_MZONE,tp)>0 then if c:IsRelateToEffect(e) and Duel.GetLocationCount(1-tp,LOCATION_MZONE,tp)>0 then
Duel.SpecialSummon(c,0,tp,1-tp,false,false,POS_FACEUP) Duel.SpecialSummon(c,0,tp,1-tp,false,false,POS_FACEUP_DEFENCE)
end end
end end
function c80978111.splimit(e,c,tp,sumtp,sumpos) function c80978111.splimit(e,c,tp,sumtp,sumpos)
......
...@@ -14,7 +14,7 @@ function c92039899.initial_effect(c) ...@@ -14,7 +14,7 @@ function c92039899.initial_effect(c)
end end
function c92039899.spcon(e,tp,eg,ep,ev,re,r,rp) function c92039899.spcon(e,tp,eg,ep,ev,re,r,rp)
local c=e:GetHandler() local c=e:GetHandler()
return c:IsPreviousLocation(LOCATION_ONFIELD) and c:IsReason(REASON_DESTROY) return c:IsPreviousLocation(LOCATION_ONFIELD) and c:IsReason(REASON_EFFECT) and c:IsReason(REASON_DESTROY)
end end
function c92039899.spfilter(c,e,tp) function c92039899.spfilter(c,e,tp)
return c:IsSetCard(0x45) and c:GetCode()~=92039899 and c:IsCanBeSpecialSummoned(e,0,tp,false,false) return c:IsSetCard(0x45) and c:GetCode()~=92039899 and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
......
...@@ -5,7 +5,7 @@ antialias = 2 ...@@ -5,7 +5,7 @@ antialias = 2
errorlog = 1 errorlog = 1
nickname = Player nickname = Player
gamename = Game gamename = Game
lastdeck = Prop lastdeck = new
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
......
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