return false;
}
- /* FIXME: this can be simplified... */
- switch (p)
- {
- case pawn:
-#ifndef MINISHOGI
- case lance:
- case knight:
-#endif
- case silver:
- case bishop:
- case rook:
- return true;
- };
-
- return false;
+ return (typeMask[p] & (T_PAWN|T_LANCE|T_KNIGHT|T_SILVER|T_BISHOP|T_ROOK)) != 0;
}
/* CHECKME: is this right? */
if (((rvupiece == rvuboard) && (upiece == pawn))
- || (upiece == bishop)
-#ifndef MINISHOGI
- || (upiece == knight)
-#endif
+ || typeMask[upiece] & (T_BISHOP | T_KNIGHT)
)
{
s++; /* The opposing pawn (piece) */
{
#ifdef TESUJIBONUS
/* Look at non-promoting silver or knight */
- if (piece == silver
-#ifndef MINISHOGI
- || piece == knight
-#endif
- )
+ if (typeMask[piece] & (T_SILVER | T_KNIGHT))
{
local_flag |= tesuji; /* Non-promotion */
s++;
for (piece = pawn+1; piece <= rook; piece++)
{
- if (
-#ifndef MINISHOGI
- piece == lance ||
-#endif
- piece == bishop || piece == rook)
+ if (typeMask[piece] & (T_LANCE | T_BISHOP | T_ROOK))
{
/* check for threat of xside piece */
ptyp = ptype[side][piece];