Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Donald Haase
Cockatrice
Commits
6fa34c6c
Commit
6fa34c6c
authored
Jan 29, 2015
by
Gavin Bises
Browse files
Add cmc to card db filter model
parent
7893ab08
Changes
4
Hide whitespace changes
Inline
Side-by-side
cockatrice/src/cardfilter.cpp
View file @
6fa34c6c
...
@@ -31,6 +31,8 @@ const char *CardFilter::attrName(Attr a)
...
@@ -31,6 +31,8 @@ const char *CardFilter::attrName(Attr a)
return
"set"
;
return
"set"
;
case
AttrManaCost
:
case
AttrManaCost
:
return
"mana cost"
;
return
"mana cost"
;
case
AttrCmc
:
return
"cmc"
;
default:
default:
return
""
;
return
""
;
}
}
...
...
cockatrice/src/cardfilter.h
View file @
6fa34c6c
...
@@ -22,6 +22,7 @@ public:
...
@@ -22,6 +22,7 @@ public:
AttrText
,
AttrText
,
AttrSet
,
AttrSet
,
AttrManaCost
,
AttrManaCost
,
AttrCmc
,
AttrEnd
AttrEnd
};
};
...
...
cockatrice/src/filtertree.cpp
View file @
6fa34c6c
...
@@ -199,34 +199,31 @@ bool FilterItem::acceptManaCost(const CardInfo *info) const
...
@@ -199,34 +199,31 @@ bool FilterItem::acceptManaCost(const CardInfo *info) const
return
(
info
->
getManaCost
()
==
term
);
return
(
info
->
getManaCost
()
==
term
);
}
}
bool
FilterItem
::
acceptC
ardAttr
(
const
CardInfo
*
info
,
CardFilter
::
Attr
attr
)
const
bool
FilterItem
::
acceptC
mc
(
const
CardInfo
*
info
)
const
{
{
bool
status
;
return
(
info
->
getCmc
()
==
term
);
}
bool
FilterItem
::
acceptCardAttr
(
const
CardInfo
*
info
,
CardFilter
::
Attr
attr
)
const
{
switch
(
attr
)
{
switch
(
attr
)
{
case
CardFilter
::
AttrName
:
case
CardFilter
::
AttrName
:
status
=
acceptName
(
info
);
return
acceptName
(
info
);
break
;
case
CardFilter
::
AttrType
:
case
CardFilter
::
AttrType
:
status
=
acceptType
(
info
);
return
acceptType
(
info
);
break
;
case
CardFilter
::
AttrColor
:
case
CardFilter
::
AttrColor
:
status
=
acceptColor
(
info
);
return
acceptColor
(
info
);
break
;
case
CardFilter
::
AttrText
:
case
CardFilter
::
AttrText
:
status
=
acceptText
(
info
);
return
acceptText
(
info
);
break
;
case
CardFilter
::
AttrSet
:
case
CardFilter
::
AttrSet
:
status
=
acceptSet
(
info
);
return
acceptSet
(
info
);
break
;
case
CardFilter
::
AttrManaCost
:
case
CardFilter
::
AttrManaCost
:
status
=
acceptManaCost
(
info
);
return
acceptManaCost
(
info
);
break
;
case
CardFilter
::
AttrCmc
:
return
acceptCmc
(
info
);
default:
default:
status
=
true
;
/* ignore this attribute */
return
true
;
/* ignore this attribute */
}
}
return
status
;
}
}
/* need to define these here to make QT happy, otherwise
/* need to define these here to make QT happy, otherwise
...
...
cockatrice/src/filtertree.h
View file @
6fa34c6c
...
@@ -117,6 +117,7 @@ public:
...
@@ -117,6 +117,7 @@ public:
bool
acceptText
(
const
CardInfo
*
info
)
const
;
bool
acceptText
(
const
CardInfo
*
info
)
const
;
bool
acceptSet
(
const
CardInfo
*
info
)
const
;
bool
acceptSet
(
const
CardInfo
*
info
)
const
;
bool
acceptManaCost
(
const
CardInfo
*
info
)
const
;
bool
acceptManaCost
(
const
CardInfo
*
info
)
const
;
bool
acceptCmc
(
const
CardInfo
*
info
)
const
;
bool
acceptCardAttr
(
const
CardInfo
*
info
,
CardFilter
::
Attr
attr
)
const
;
bool
acceptCardAttr
(
const
CardInfo
*
info
,
CardFilter
::
Attr
attr
)
const
;
};
};
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment