Skip to content

Y
ygopro
Commit 9a627dbb authored by salix5's avatar salix5
Browse files
Options

edit

parent 78b24970
Hide whitespace changes
Inline Side-by-side
Showing with 12 additions and 6 deletions
gframe/event_handler.cpp
View file @ 9a627dbb
...@@ -819,7 +819,8 @@ bool ClientField::OnEvent(const irr::SEvent& event) { ...@@ -819,7 +819,8 @@ bool ClientField::OnEvent(const irr::SEvent& event) {
CardString cstr; CardString cstr;
CardData cd; CardData cd;
if(dataManager.GetString(trycode, &cstr) && dataManager.GetData(trycode, &cd) if(dataManager.GetString(trycode, &cstr) && dataManager.GetData(trycode, &cd)
&& (cd.code == 78734254 || cd.code == 13857930 || !cd.alias && !((cd.type & (TYPE_MONSTER + TYPE_TOKEN)) == (TYPE_MONSTER + TYPE_TOKEN)))) { && (cd.code == CARD_MARINE_DOLPHIN || cd.code == CARD_TWINKLE_MOSS
|| !cd.alias && !((cd.type & (TYPE_MONSTER + TYPE_TOKEN)) == (TYPE_MONSTER + TYPE_TOKEN)))) {
mainGame->lstANCard->clear(); mainGame->lstANCard->clear();
ancard.clear(); ancard.clear();
mainGame->lstANCard->addItem(cstr.name); mainGame->lstANCard->addItem(cstr.name);
...@@ -834,7 +835,7 @@ bool ClientField::OnEvent(const irr::SEvent& event) { ...@@ -834,7 +835,7 @@ bool ClientField::OnEvent(const irr::SEvent& event) {
if(wcsstr(cit->second.name, pname) != 0) { if(wcsstr(cit->second.name, pname) != 0) {
auto cp = dataManager.GetCodePointer(cit->first); //verified by _strings auto cp = dataManager.GetCodePointer(cit->first); //verified by _strings
//datas.alias can be double card names or alias //datas.alias can be double card names or alias
if(cp->second.code == 78734254 || cp->second.code == 13857930 if(cp->second.code == CARD_MARINE_DOLPHIN || cp->second.code == CARD_TWINKLE_MOSS
|| !cp->second.alias && !((cp->second.type & (TYPE_MONSTER + TYPE_TOKEN)) == (TYPE_MONSTER + TYPE_TOKEN))) { || !cp->second.alias && !((cp->second.type & (TYPE_MONSTER + TYPE_TOKEN)) == (TYPE_MONSTER + TYPE_TOKEN))) {
mainGame->lstANCard->addItem(cit->second.name); mainGame->lstANCard->addItem(cit->second.name);
ancard.push_back(cit->first); ancard.push_back(cit->first);
...@@ -854,7 +855,8 @@ bool ClientField::OnEvent(const irr::SEvent& event) { ...@@ -854,7 +855,8 @@ bool ClientField::OnEvent(const irr::SEvent& event) {
CardString cstr; CardString cstr;
CardData cd; CardData cd;
if(dataManager.GetString(trycode, &cstr) && dataManager.GetData(trycode, &cd) if(dataManager.GetString(trycode, &cstr) && dataManager.GetData(trycode, &cd)
&& (cd.code == 78734254 || cd.code == 13857930 || !cd.alias && !((cd.type & (TYPE_MONSTER + TYPE_TOKEN)) == (TYPE_MONSTER + TYPE_TOKEN)))) { && (cd.code == CARD_MARINE_DOLPHIN || cd.code == CARD_TWINKLE_MOSS
|| !cd.alias && !((cd.type & (TYPE_MONSTER + TYPE_TOKEN)) == (TYPE_MONSTER + TYPE_TOKEN)))) {
mainGame->lstANCard->clear(); mainGame->lstANCard->clear();
ancard.clear(); ancard.clear();
mainGame->lstANCard->addItem(cstr.name); mainGame->lstANCard->addItem(cstr.name);
...@@ -869,7 +871,7 @@ bool ClientField::OnEvent(const irr::SEvent& event) { ...@@ -869,7 +871,7 @@ bool ClientField::OnEvent(const irr::SEvent& event) {
if(wcsstr(cit->second.name, pname) != 0) { if(wcsstr(cit->second.name, pname) != 0) {
auto cp = dataManager.GetCodePointer(cit->first); //verified by _strings auto cp = dataManager.GetCodePointer(cit->first); //verified by _strings
//datas.alias can be double card names or alias //datas.alias can be double card names or alias
if(cp->second.code == 78734254 || cp->second.code == 13857930 if(cp->second.code == CARD_MARINE_DOLPHIN || cp->second.code == CARD_TWINKLE_MOSS
|| !cp->second.alias && !((cp->second.type & (TYPE_MONSTER + TYPE_TOKEN)) == (TYPE_MONSTER + TYPE_TOKEN))) { || !cp->second.alias && !((cp->second.type & (TYPE_MONSTER + TYPE_TOKEN)) == (TYPE_MONSTER + TYPE_TOKEN))) {
mainGame->lstANCard->addItem(cit->second.name); mainGame->lstANCard->addItem(cit->second.name);
ancard.push_back(cit->first); ancard.push_back(cit->first);
......
gframe/event_handler.h
View file @ 9a627dbb
#ifndef EVENT_HANDLER_H #ifndef EVENT_HANDLER_H
#define EVENT_HANDLER_H #define EVENT_HANDLER_H
//special cards
#define CARD_MARINE_DOLPHIN 78734254
#define CARD_TWINKLE_MOSS 13857930
#include "config.h" #include "config.h"
#include "game.h" #include "game.h"
#include "client_card.h" #include "client_card.h"
......
ocgcore @ fadb2195
Subproject commit 99e817b3d4a38900f855028aac792fcf0e3a2861 Subproject commit fadb21951107f562766e91d5711222d73f2b71d7
script @ 283c0302
Subproject commit b1e1b6ad7d608814e4fb83cd9335455adf22fa45 Subproject commit 283c0302fa9aa20e70c38db3fcdefcb13e6618f8
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