讚･ﾔ･ﾃ･ﾈ､ﾎｼﾂﾁ｣FEAT_INVIS､ｯｸｫﾁｰ､ﾎｳｫﾌ逾ﾈ･鬣ﾃ･ﾗ､ﾈ､ｷ､ﾆﾎｮﾍﾑ｡｣

[hengbandforosx/hengbandosx.git] / src / mind.c

diff --git a/src/mind.c b/src/mind.c
index e53af3b..be4ed09 100644 (file)
--- a/src/mind.c
+++ b/src/mind.c
@@ -931,7 +931,7 @@ if (!b) msg_print("
                if (plev < 25)
                        return psychometry();
                else
-                       return ident_spell(FALSE);
+                       return ident_spell(FALSE, FALSE);
                break;
        case 8:
                /* Mindwave */
@@ -1264,7 +1264,7 @@ static int number_of_mirrors( void )
   int val=0;
   for( x=0 ; x < cur_wid ; x++ ){
     for( y=0 ; y < cur_hgt ; y++ ){
-      if( cave[y][x].feat == FEAT_MIRROR )val++;
+      if( (cave[y][x].info & CAVE_IN_MIRROR) )val++;
     }
   }
   return val;
@@ -1282,7 +1282,7 @@ static bool cast_mirror_spell(int spell)
        {
        /* mirror of seeing */
        case 0:
-         tmp = cave[py][px].feat == FEAT_MIRROR ? 4 : 0;
+         tmp = (cave[py][px].info & CAVE_IN_MIRROR) ? 4 : 0;
          if( plev + tmp > 4)detect_monsters_normal(DETECT_RAD_DEFAULT);
          if( plev + tmp > 18 )detect_monsters_invis(DETECT_RAD_DEFAULT);
          if( plev + tmp > 28 )set_tim_esp(plev,FALSE);
@@ -1310,7 +1310,7 @@ msg_format("There are too many mirrors to control!");
          break;
        case 2:
          if (!get_aim_dir(&dir)) return FALSE;
-         if ( plev > 9 && cave[py][px].feat == FEAT_MIRROR ){
+         if ( plev > 9 && (cave[py][px].info & CAVE_IN_MIRROR) ){
            fire_beam(GF_LITE, dir,damroll(3+((plev-1)/5),4));
          }
          else {
@@ -1348,7 +1348,7 @@ msg_format("There are too many mirrors to control!");
        case 9:
          for(x=0;x<cur_wid;x++){
            for(y=0;y<cur_hgt;y++){
-             if(cave[y][x].feat == FEAT_MIRROR){
+             if(cave[y][x].info & CAVE_IN_MIRROR){
                project(0,2,y,x,plev,GF_OLD_SLEEP,(PROJECT_GRID|PROJECT_ITEM|PROJECT_KILL|PROJECT_JUMP|PROJECT_NO_REF|PROJECT_NO_HANGEKI),-1);
              }
            }
@@ -1377,7 +1377,7 @@ msg_format("There are too many mirrors to control!");
          break;
        /* illusion light */
        case 14:
-         tmp = cave[py][px].feat == FEAT_MIRROR ? 4 : 3;
+         tmp = (cave[py][px].feat & CAVE_IN_MIRROR) ? 4 : 3;
          slow_monsters();
          stun_monsters(plev*tmp);
          confuse_monsters(plev*tmp);
@@ -1387,7 +1387,7 @@ msg_format("There are too many mirrors to control!");
          break;
        /* mirror shift */
        case 15:
-         if(  cave[py][px].feat != FEAT_MIRROR ){
+         if( !(cave[py][px].info & CAVE_IN_MIRROR) ){
 #ifdef JP
                msg_print("¶À¤Î¹ñ¤Î¾ì½ê¤¬¤ï¤«¤é¤Ê¤¤¡ª");
 #else
@@ -1675,7 +1675,7 @@ msg_print("
                break;
        }
        case 7:
-               return ident_spell(FALSE);
+               return ident_spell(FALSE, FALSE);
                break;
        case 8:
                set_tim_ffall(randint1(20) + 20, FALSE);
@@ -2142,7 +2142,7 @@ msg_format("%s
                        break;
                case MIND_MIRROR_MASTER:
                        /* Cast the spell */
-                       if( cave[py][px].feat == FEAT_MIRROR )on_mirror = TRUE;
+                       if( (cave[py][px].info & CAVE_IN_MIRROR) )on_mirror = TRUE;
                        cast = cast_mirror_spell(n);
                        break;
                case MIND_NINJUTSU: