@@ -777,20 +760,34 @@ void map_info(unsigned y, unsigned x, grid_data *g)
 	g->is_player = (cave->m_idx[y][x] < 0) ? TRUE : FALSE;
 	g->m_idx = (g->is_player) ? 0 : cave->m_idx[y][x];
 	g->hallucinate = p_ptr->timed[TMD_IMAGE] ? TRUE : FALSE;
 	g->trapborder = (dtrap_edge(y, x)) ? TRUE : FALSE;
 
+	
 	if (g->in_view)
 	{
-		g->lighting = FEAT_LIGHTING_LIT;
-
-		if (!(info & CAVE_GLOW) && OPT(view_yellow_light))
+		if (!OPT(view_yellow_light))
+		{
 			g->lighting = FEAT_LIGHTING_BRIGHT;
+		}
+		else if (info & CAVE_GLOW)
+		{
+			g->lighting = FEAT_LIGHTING_LIT;
+		}
+		else
+		{
+			g->lighting = FEAT_LIGHTING_BRIGHT;
+		}
 	}
 	else if (!(info & CAVE_MARK))
 	{
 		g->f_idx = FEAT_NONE;
+		g->lighting = FEAT_LIGHTING_DARK;
+	}
+	else if ((info & CAVE_GLOW) && !OPT(view_yellow_light))
+	{
+		g->lighting = FEAT_LIGHTING_LIT;
 	}
 
 
 	/* Objects */
 	for (o_ptr = get_first_object(y, x); o_ptr; o_ptr = get_next_object(o_ptr))