X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=src%2Fcave.c;h=2dc97dcc800a7ef7fb620ce100d27abee760f7c1;hb=3548ab1c19aac66bbf0514af1580704192bba849;hp=11ae836e31b818dcda631ec77a109528380fda8b;hpb=9d81f8fe4c5e6b7f69248ec0afd3ef99bf8364fa;p=hengband%2Fhengband.git

diff --git a/src/cave.c b/src/cave.c
index 11ae836e3..2dc97dcc8 100644
--- a/src/cave.c
+++ b/src/cave.c
@@ -423,7 +423,7 @@ static bool check_local_illumination(POSITION y, POSITION x)
 	if (player_has_los_bold((Y), (X))) \
 	{ \
 		/* Update the monster */ \
-		if (cave[(Y)][(X)].m_idx) update_mon(cave[(Y)][(X)].m_idx, FALSE); \
+		if (cave[(Y)][(X)].m_idx) update_monster(cave[(Y)][(X)].m_idx, FALSE); \
 \
 		/* Notice and redraw */ \
 		note_spot((Y), (X)); \
@@ -1236,7 +1236,6 @@ void map_info(POSITION y, POSITION x, TERM_COLOR *ap, char *cp, TERM_COLOR *tap,
 			/* Hack -- hallucination */
 			if (p_ptr->image) image_object(ap, cp);
 
-			/* Done */
 			break;
 		}
 	}
@@ -1664,7 +1663,6 @@ void prt_map(void)
 
 	int wid, hgt;
 
-	/* Get size */
 	Term_get_size(&wid, &hgt);
 
 	/* Remove map offset */
@@ -1751,7 +1749,6 @@ void prt_path(POSITION y, POSITION x)
 	/* Get projection path */
 	path_n = project_path(path_g, (project_length ? project_length : MAX_RANGE), p_ptr->y, p_ptr->x, y, x, PROJECT_PATH|PROJECT_THRU);
 
-	/* Redraw map */
 	p_ptr->redraw |= (PR_MAP);
 
 	/* Redraw stuff */
@@ -1930,7 +1927,6 @@ void display_map(int *cy, int *cx)
 	int **match_autopick_yx;
 	object_type ***object_autopick_yx;
 
-	/* Get size */
 	Term_get_size(&wid, &hgt);
 	hgt -= 2;
 	wid -= 14;
@@ -2003,7 +1999,6 @@ void display_map(int *cy, int *cx)
 	{
 		for (j = 0; j < cur_hgt; ++j)
 		{
-			/* Location */
 			x = i / xrat + 1;
 			y = j / yrat + 1;
 
@@ -2037,7 +2032,6 @@ void display_map(int *cy, int *cx)
 	{
 		for (i = 0; i < cur_wid; ++i)
 		{
-			/* Location */
 			x = i / xrat + 1;
 			y = j / yrat + 1;
 
@@ -2190,7 +2184,7 @@ void display_map(int *cy, int *cx)
 /*
  * Display a "small-scale" map of the dungeon for the player
  *
- * Currently, the "player" is displayed on the map.  XXX XXX XXX
+ * Currently, the "player" is displayed on the map.  
  */
 void do_cmd_view_map(void)
 {
@@ -2203,7 +2197,6 @@ void do_cmd_view_map(void)
 	/* Note */
 	prt(_("お待ち下さい...", "Please wait..."), 0, 0);
 
-	/* Flush */
 	Term_fresh();
 
 	/* Clear the screen */
@@ -2510,7 +2503,6 @@ void forget_lite(void)
 		/* Forget "LITE" flag */
 		cave[y][x].info &= ~(CAVE_LITE);
 
-		/* Redraw */
 		/* lite_spot(y, x); Perhaps don't need? */
 	}
 
@@ -2544,8 +2536,6 @@ void forget_lite(void)
 
 
 /*
- * XXX XXX XXX
- *
  * This macro allows us to efficiently add a grid to the "lite" array,
  * note that we are never called for illegal grids, or for grids which
  * have already been placed into the "lite" array, and we are never
@@ -3337,8 +3327,6 @@ void forget_view(void)
 	{
 		POSITION y = view_y[i];
 		POSITION x = view_x[i];
-
-		/* Access the grid */
 		c_ptr = &cave[y][x];
 
 		/* Forget that the grid is viewable */
@@ -3419,8 +3407,6 @@ static bool update_view_aux(POSITION y, POSITION x, POSITION y1, POSITION x1, PO
 	/* Totally blocked by "unviewable neighbors" */
 	if (!v1 && !v2) return (TRUE);
 
-
-	/* Access the grid */
 	c_ptr = &cave[y][x];
 
 
@@ -3620,8 +3606,6 @@ void update_view(void)
 	{
 		y = view_y[n];
 		x = view_x[n];
-
-		/* Access the grid */
 		c_ptr = &cave[y][x];
 
 		/* Mark the grid as not in "view" */
@@ -3644,8 +3628,6 @@ void update_view(void)
 	/* Now start on the player */
 	y = p_ptr->y;
 	x = p_ptr->x;
-
-	/* Access the grid */
 	c_ptr = &cave[y][x];
 
 	/* Assume the player grid is easily viewable */
@@ -3993,8 +3975,6 @@ void update_view(void)
 	{
 		y = view_y[n];
 		x = view_x[n];
-
-		/* Access the grid */
 		c_ptr = &cave[y][x];
 
 		/* Clear the "CAVE_XTRA" flag */
@@ -4012,8 +3992,6 @@ void update_view(void)
 	{
 		y = temp_y[n];
 		x = temp_x[n];
-
-		/* Access the grid */
 		c_ptr = &cave[y][x];
 
 		/* No longer in the array */
@@ -4048,8 +4026,6 @@ void delayed_visual_update(void)
 	{
 		y = redraw_y[i];
 		x = redraw_x[i];
-
-		/* Access the grid */
 		c_ptr = &cave[y][x];
 
 		/* Update only needed grids (prevent multiple updating) */
@@ -4058,11 +4034,10 @@ void delayed_visual_update(void)
 		/* If required, note */
 		if (c_ptr->info & CAVE_NOTE) note_spot(y, x);
 
-		/* Redraw */
 		lite_spot(y, x);
 
 		/* Hack -- Visual update of monster on this grid */
-		if (c_ptr->m_idx) update_mon(c_ptr->m_idx, FALSE);
+		if (c_ptr->m_idx) update_monster(c_ptr->m_idx, FALSE);
 
 		/* No longer in the array */
 		c_ptr->info &= ~(CAVE_NOTE | CAVE_REDRAW);
@@ -4229,8 +4204,8 @@ static int scent_when = 0;
  */
 void update_smell(void)
 {
-	int i, j;
-	int y, x;
+	POSITION i, j;
+	POSITION y, x;
 
 	/* Create a table that controls the spread of scent */
 	const int scent_adjust[5][5] = 
@@ -4297,10 +4272,11 @@ void update_smell(void)
  */
 void map_area(POSITION range)
 {
-	int             i, x, y;
-	cave_type       *c_ptr;
-	s16b            feat;
-	feature_type    *f_ptr;
+	int i;
+	POSITION x, y;
+	cave_type *c_ptr;
+	FEAT_IDX feat;
+	feature_type *f_ptr;
 
 	if (d_info[dungeon_type].flags1 & DF1_DARKNESS) range /= 3;
 
@@ -4350,10 +4326,8 @@ void map_area(POSITION range)
 		}
 	}
 
-	/* Redraw map */
 	p_ptr->redraw |= (PR_MAP);
 
-	/* Window stuff */
 	p_ptr->window |= (PW_OVERHEAD | PW_DUNGEON);
 }
 
@@ -4377,7 +4351,8 @@ void map_area(POSITION range)
  */
 void wiz_lite(bool ninja)
 {
-	int i, y, x;
+	OBJECT_IDX i;
+	POSITION y, x;
 	FEAT_IDX feat;
 	feature_type *f_ptr;
 
@@ -4454,13 +4429,8 @@ void wiz_lite(bool ninja)
 		}
 	}
 
-	/* Update the monsters */
 	p_ptr->update |= (PU_MONSTERS);
-
-	/* Redraw map */
 	p_ptr->redraw |= (PR_MAP);
-
-	/* Window stuff */
 	p_ptr->window |= (PW_OVERHEAD | PW_DUNGEON);
 
 	if (p_ptr->special_defense & NINJA_S_STEALTH)
@@ -4475,8 +4445,8 @@ void wiz_lite(bool ninja)
  */
 void wiz_dark(void)
 {
-	int i, y, x;
-
+	OBJECT_IDX i;
+	POSITION y, x;
 
 	/* Forget every grid */
 	for (y = 1; y < cur_hgt - 1; y++)
@@ -4523,26 +4493,13 @@ void wiz_dark(void)
 	/* Forget travel route when we have forgotten map */
 	forget_travel_flow();
 
-	/* Mega-Hack -- Forget the view and lite */
 	p_ptr->update |= (PU_UN_VIEW | PU_UN_LITE);
-
-	/* Update the view and lite */
 	p_ptr->update |= (PU_VIEW | PU_LITE | PU_MON_LITE);
-
-	/* Update the monsters */
 	p_ptr->update |= (PU_MONSTERS);
-
-	/* Redraw map */
 	p_ptr->redraw |= (PR_MAP);
-
-	/* Window stuff */
 	p_ptr->window |= (PW_OVERHEAD | PW_DUNGEON);
 }
 
-
-
-
-
 /*
  * Change the "feat" flag for a grid, and notice/redraw the grid
  */
@@ -4563,7 +4520,8 @@ void cave_set_feat(POSITION y, POSITION x, FEAT_IDX feat)
 		/* Hack -- glow the GLOW terrain */
 		if (have_flag(f_ptr->flags, FF_GLOW) && !(d_info[dungeon_type].flags1 & DF1_DARKNESS))
 		{
-			int i, yy, xx;
+			DIRECTION i;
+			POSITION yy, xx;
 
 			for (i = 0; i < 9; i++)
 			{
@@ -4599,14 +4557,10 @@ void cave_set_feat(POSITION y, POSITION x, FEAT_IDX feat)
 
 	/* Check for change to boring grid */
 	if (!have_flag(f_ptr->flags, FF_REMEMBER)) c_ptr->info &= ~(CAVE_MARK);
+	if (c_ptr->m_idx) update_monster(c_ptr->m_idx, FALSE);
 
-	/* Update the monster */
-	if (c_ptr->m_idx) update_mon(c_ptr->m_idx, FALSE);
-
-	/* Notice */
 	note_spot(y, x);
 
-	/* Redraw */
 	lite_spot(y, x);
 
 	/* Check if los has changed */
@@ -4626,7 +4580,8 @@ void cave_set_feat(POSITION y, POSITION x, FEAT_IDX feat)
 	/* Hack -- glow the GLOW terrain */
 	if (have_flag(f_ptr->flags, FF_GLOW) && !(d_info[dungeon_type].flags1 & DF1_DARKNESS))
 	{
-		int i, yy, xx;
+		DIRECTION i;
+		POSITION yy, xx;
 		cave_type *cc_ptr;
 
 		for (i = 0; i < 9; i++)
@@ -4639,13 +4594,10 @@ void cave_set_feat(POSITION y, POSITION x, FEAT_IDX feat)
 
 			if (player_has_los_grid(cc_ptr))
 			{
-				/* Update the monster */
-				if (cc_ptr->m_idx) update_mon(cc_ptr->m_idx, FALSE);
+				if (cc_ptr->m_idx) update_monster(cc_ptr->m_idx, FALSE);
 
-				/* Notice */
 				note_spot(yy, xx);
 
-				/* Redraw */
 				lite_spot(yy, xx);
 			}
 
@@ -4660,7 +4612,7 @@ void cave_set_feat(POSITION y, POSITION x, FEAT_IDX feat)
 }
 
 
-IDX conv_dungeon_feat(IDX newfeat)
+FEAT_IDX conv_dungeon_feat(FEAT_IDX newfeat)
 {
 	feature_type *f_ptr = &f_info[newfeat];
 
@@ -4694,7 +4646,7 @@ IDX conv_dungeon_feat(IDX newfeat)
  * Take a feature, determine what that feature becomes
  * through applying the given action.
  */
-IDX feat_state(IDX feat, int action)
+FEAT_IDX feat_state(FEAT_IDX feat, int action)
 {
 	feature_type *f_ptr = &f_info[feat];
 	int i;
@@ -4782,17 +4734,13 @@ void remove_mirror(POSITION y, POSITION x)
 	{
 		c_ptr->info &= ~(CAVE_GLOW);
 		if (!view_torch_grids) c_ptr->info &= ~(CAVE_MARK);
-
-		/* Update the monster */
-		if (c_ptr->m_idx) update_mon(c_ptr->m_idx, FALSE);
+		if (c_ptr->m_idx) update_monster(c_ptr->m_idx, FALSE);
 
 		update_local_illumination(y, x);
 	}
 
-	/* Notice */
 	note_spot(y, x);
 
-	/* Redraw */
 	lite_spot(y, x);
 }
 
@@ -4992,7 +4940,6 @@ void monster_race_track(MONRACE_IDX r_idx)
 	/* Save this monster ID */
 	p_ptr->monster_race_idx = r_idx;
 
-	/* Window stuff */
 	p_ptr->window |= (PW_MONSTER);
 }
 
@@ -5006,7 +4953,6 @@ void object_kind_track(KIND_OBJECT_IDX k_idx)
 	/* Save this monster ID */
 	p_ptr->object_kind_idx = k_idx;
 
-	/* Window stuff */
 	p_ptr->window |= (PW_OBJECT);
 }
 
@@ -5021,7 +4967,7 @@ void object_kind_track(KIND_OBJECT_IDX k_idx)
  *
  * All disturbance cancels repeated commands, resting, and running.
  */
-void disturb(int stop_search, int stop_travel)
+void disturb(bool stop_search, bool stop_travel)
 {
 #ifndef TRAVEL
 	/* Unused */
@@ -5088,7 +5034,8 @@ void disturb(int stop_search, int stop_travel)
  */
 void glow_deep_lava_and_bldg(void)
 {
-	int y, x, i, yy, xx;
+	POSITION y, x, yy, xx;
+	DIRECTION i;
 	cave_type *c_ptr;
 
 	/* Not in the darkness dungeon */
@@ -5118,7 +5065,6 @@ void glow_deep_lava_and_bldg(void)
 	/* Update the view and lite */
 	p_ptr->update |= (PU_VIEW | PU_LITE | PU_MON_LITE);
 
-	/* Redraw map */
 	p_ptr->redraw |= (PR_MAP);
 }