This commit was manufactured by cvs2svn to create tag

[hengbandforosx/hengbandosx.git] / src / grid.h

diff --git a/src/grid.h b/src/grid.h
index 360951d..67c1b5d 100644 (file)
--- a/src/grid.h
+++ b/src/grid.h
@@ -40,115 +40,130 @@
 
 #define place_floor_bold(Y, X) \
 { \
-  set_cave_feat(Y,X,floor_type[randint0(100)]); \
-  cave[Y][X].info &= ~(CAVE_MASK); \
-  add_cave_info(Y,X,CAVE_FLOOR); \
+       set_cave_feat(Y,X,floor_type[randint0(100)]); \
+       cave[Y][X].info &= ~(CAVE_MASK); \
+       add_cave_info(Y,X,CAVE_FLOOR); \
+       delete_monster(Y, X); \
 }
 
 #define place_floor_grid(C) \
 { \
-  (C)->feat = floor_type[randint0(100)]; \
-  (C)->info &= ~(CAVE_MASK); \
-  (C)->info |= CAVE_FLOOR; \
+       (C)->feat = floor_type[randint0(100)]; \
+       (C)->info &= ~(CAVE_MASK); \
+       (C)->info |= CAVE_FLOOR; \
+       if ((C)->m_idx) delete_monster_idx((C)->m_idx); \
 }
 
 #define place_extra_bold(Y, X) \
 { \
-  set_cave_feat(Y,X,fill_type[randint0(100)]); \
-  cave[Y][X].info &= ~(CAVE_MASK); \
-  add_cave_info(Y,X,CAVE_EXTRA); \
+       set_cave_feat(Y,X,fill_type[randint0(100)]); \
+       cave[Y][X].info &= ~(CAVE_MASK); \
+       add_cave_info(Y,X,CAVE_EXTRA); \
+       delete_monster(Y, X); \
 }
 
 #define place_extra_grid(C) \
 { \
-  (C)->feat = fill_type[randint0(100)]; \
-  (C)->info &= ~(CAVE_MASK); \
-  (C)->info |= CAVE_EXTRA; \
+       (C)->feat = fill_type[randint0(100)]; \
+       (C)->info &= ~(CAVE_MASK); \
+       (C)->info |= CAVE_EXTRA; \
+       if ((C)->m_idx) delete_monster_idx((C)->m_idx); \
 }
 
 #define place_extra_noperm_bold(Y, X) \
 { \
-  set_cave_feat(Y,X,fill_type[randint0(100)]); \
-  if ((cave[Y][X].feat >= FEAT_PERM_EXTRA) && (cave[Y][X].feat <= FEAT_PERM_SOLID)) cave[Y][X].feat -= 0x04; \
-  else if (cave[Y][X].feat == FEAT_MOUNTAIN) cave[Y][X].feat = feat_wall_inner; \
-  cave[Y][X].info &= ~(CAVE_MASK); \
-  add_cave_info(Y,X,CAVE_EXTRA); \
+       set_cave_feat(Y,X,fill_type[randint0(100)]); \
+       if ((cave[Y][X].feat >= FEAT_PERM_EXTRA) && (cave[Y][X].feat <= FEAT_PERM_SOLID)) cave[Y][X].feat -= 0x04; \
+       else if (cave[Y][X].feat == FEAT_MOUNTAIN) cave[Y][X].feat = feat_wall_inner; \
+       cave[Y][X].info &= ~(CAVE_MASK); \
+       add_cave_info(Y,X,CAVE_EXTRA); \
+       delete_monster(Y, X); \
 }
 
 #define place_inner_bold(Y, X) \
 { \
-  set_cave_feat(Y,X,feat_wall_inner); \
-  cave[Y][X].info &= ~(CAVE_MASK); \
-  add_cave_info(Y,X,CAVE_INNER); \
+       set_cave_feat(Y,X,feat_wall_inner); \
+       cave[Y][X].info &= ~(CAVE_MASK); \
+       add_cave_info(Y,X,CAVE_INNER); \
+       delete_monster(Y, X); \
 }
 
 #define place_inner_grid(C) \
 { \
-  (C)->feat = feat_wall_inner; \
-  (C)->info &= ~(CAVE_MASK); \
-  (C)->info |= CAVE_INNER; \
+       (C)->feat = feat_wall_inner; \
+       (C)->info &= ~(CAVE_MASK); \
+       (C)->info |= CAVE_INNER; \
+       if ((C)->m_idx) delete_monster_idx((C)->m_idx); \
 }
 
 #define place_outer_bold(Y, X) \
 { \
-  set_cave_feat(Y,X,feat_wall_outer); \
-  cave[Y][X].info &= ~(CAVE_MASK); \
-  add_cave_info(Y,X,CAVE_OUTER); \
+       set_cave_feat(Y,X,feat_wall_outer); \
+       cave[Y][X].info &= ~(CAVE_MASK); \
+       add_cave_info(Y,X,CAVE_OUTER); \
+       delete_monster(Y, X); \
 }
 
 #define place_outer_grid(C) \
 { \
-  (C)->feat = feat_wall_outer; \
-  (C)->info &= ~(CAVE_MASK); \
-  (C)->info |= CAVE_OUTER; \
+       (C)->feat = feat_wall_outer; \
+       (C)->info &= ~(CAVE_MASK); \
+       (C)->info |= CAVE_OUTER; \
+       if ((C)->m_idx) delete_monster_idx((C)->m_idx); \
 }
 
 #define place_outer_noperm_bold(Y, X) \
 { \
-  if ((feat_wall_outer >= FEAT_PERM_EXTRA) && (feat_wall_outer <= FEAT_PERM_SOLID)) set_cave_feat(Y, X, feat_wall_outer-0x04); \
-  else if (feat_wall_outer == FEAT_MOUNTAIN) cave[Y][X].feat = feat_wall_inner; \
-  else set_cave_feat(Y,X,feat_wall_outer); \
-  cave[Y][X].info &= ~(CAVE_MASK); \
-  add_cave_info(Y,X,(CAVE_OUTER | CAVE_VAULT)); \
+       if ((feat_wall_outer >= FEAT_PERM_EXTRA) && (feat_wall_outer <= FEAT_PERM_SOLID)) set_cave_feat(Y, X, feat_wall_outer-0x04); \
+       else if (feat_wall_outer == FEAT_MOUNTAIN) cave[Y][X].feat = feat_wall_inner; \
+       else set_cave_feat(Y,X,feat_wall_outer); \
+       cave[Y][X].info &= ~(CAVE_MASK); \
+       add_cave_info(Y,X,(CAVE_OUTER | CAVE_VAULT)); \
+       delete_monster(Y, X); \
 }
 
 #define place_outer_noperm_grid(C) \
 { \
-  if ((feat_wall_outer >= FEAT_PERM_EXTRA) && (feat_wall_outer <= FEAT_PERM_SOLID)) (C)->feat = feat_wall_outer-0x04; \
-  else if (feat_wall_outer == FEAT_MOUNTAIN) (C)->feat = feat_wall_inner; \
-  else (C)->feat = feat_wall_outer; \
-  (C)->info &= ~(CAVE_MASK); \
-  (C)->info |= (CAVE_OUTER | CAVE_VAULT); \
+       if ((feat_wall_outer >= FEAT_PERM_EXTRA) && (feat_wall_outer <= FEAT_PERM_SOLID)) (C)->feat = feat_wall_outer-0x04; \
+       else if (feat_wall_outer == FEAT_MOUNTAIN) (C)->feat = feat_wall_inner; \
+       else (C)->feat = feat_wall_outer; \
+       (C)->info &= ~(CAVE_MASK); \
+       (C)->info |= (CAVE_OUTER | CAVE_VAULT); \
+       if ((C)->m_idx) delete_monster_idx((C)->m_idx); \
 }
 
 #define place_solid_bold(Y, X) \
 { \
-  set_cave_feat(Y,X,feat_wall_solid); \
-  cave[Y][X].info &= ~(CAVE_MASK); \
-  add_cave_info(Y,X,CAVE_SOLID); \
+       set_cave_feat(Y,X,feat_wall_solid); \
+       cave[Y][X].info &= ~(CAVE_MASK); \
+       add_cave_info(Y,X,CAVE_SOLID); \
+       delete_monster(Y, X); \
 }
 
 #define place_solid_grid(C) \
 { \
-  (C)->feat = feat_wall_solid; \
-  (C)->info &= ~(CAVE_MASK); \
-  (C)->info |= CAVE_SOLID; \
+       (C)->feat = feat_wall_solid; \
+       (C)->info &= ~(CAVE_MASK); \
+       (C)->info |= CAVE_SOLID; \
+       if ((C)->m_idx) delete_monster_idx((C)->m_idx); \
 }
 
 #define place_solid_noperm_bold(Y, X) \
 { \
-  if ((cave[Y][X].info & CAVE_VAULT) && (feat_wall_solid >= FEAT_PERM_EXTRA) && (feat_wall_solid <= FEAT_PERM_SOLID)) set_cave_feat(Y, X, feat_wall_solid-0x04); \
-  else set_cave_feat(Y,X,feat_wall_solid); \
-  cave[Y][X].info &= ~(CAVE_MASK); \
-  add_cave_info(Y,X,CAVE_SOLID); \
+       if ((cave[Y][X].info & CAVE_VAULT) && (feat_wall_solid >= FEAT_PERM_EXTRA) && (feat_wall_solid <= FEAT_PERM_SOLID)) set_cave_feat(Y, X, feat_wall_solid-0x04); \
+       else set_cave_feat(Y,X,feat_wall_solid); \
+       cave[Y][X].info &= ~(CAVE_MASK); \
+       add_cave_info(Y,X,CAVE_SOLID); \
+       delete_monster(Y, X); \
 }
 
 #define place_solid_noperm_grid(C) \
 { \
-  if ((c_ptr->info & CAVE_VAULT) && (feat_wall_solid >= FEAT_PERM_EXTRA) && (feat_wall_solid <= FEAT_PERM_SOLID)) (C)->feat = feat_wall_solid-0x04; \
-  else (C)->feat = feat_wall_solid; \
-  (C)->info &= ~(CAVE_MASK); \
-  (C)->info |= CAVE_SOLID; \
+       if ((c_ptr->info & CAVE_VAULT) && (feat_wall_solid >= FEAT_PERM_EXTRA) && (feat_wall_solid <= FEAT_PERM_SOLID)) (C)->feat = feat_wall_solid-0x04; \
+       else (C)->feat = feat_wall_solid; \
+       (C)->info &= ~(CAVE_MASK); \
+       (C)->info |= CAVE_SOLID; \
+       if ((C)->m_idx) delete_monster_idx((C)->m_idx); \
 }