Move 'effects' global into Game struct

We change the type to std::vector<> while we're at it and make
cave_type::effect to a boost::optional<>

1 files changed, 5 insertions, 4 deletions

diff --git a/src/spells1.cc b/src/spells1.cc
index 7cdabda7..8fc4a23b 100644
--- a/src/spells1.cc
+++ b/src/spells1.cc
@@ -7898,8 +7898,6 @@ bool_ project(int who, int rad, int y, int x, int dam, int typ, int flg)
 	/* Number of grids in the "blast area" (including the "beam" path) */
 	int grids = 0;
 
-	int effect = 0;
-
 	/* Coordinates of the affected grids */
 	byte gx[1024], gy[1024];
 
@@ -8220,10 +8218,13 @@ bool_ project(int who, int rad, int y, int x, int dam, int typ, int flg)
 		/* Start with "dist" of zero */
 		dist = 0;
 
+		/* Which effect? */
+		boost::optional<s16b> maybe_effect = boost::none;
+
 		/* Effect ? */
 		if (flg & PROJECT_STAY)
 		{
-			effect = new_effect(typ, dam, project_time, p_ptr->py, p_ptr->px, rad, project_time_effect);
+			maybe_effect = new_effect(typ, dam, project_time, p_ptr->py, p_ptr->px, rad, project_time_effect);
 			project_time = 0;
 			project_time_effect = 0;
 		}
@@ -8244,7 +8245,7 @@ bool_ project(int who, int rad, int y, int x, int dam, int typ, int flg)
 			/* Effect ? */
 			if (flg & PROJECT_STAY)
 			{
-				cave[y][x].effect = effect;
+				cave[y][x].maybe_effect = maybe_effect;
 				lite_spot(y, x);
 			}
 		}