fix the mechanics of a couple of warnings

Author: bhaller

core/chromosome.cpp

@@ -2124,14 +2124,12 @@ void Chromosome::ZeroMutationRunExperimentClock(void)
 		{
 			// Clocks should only get logged in the interval within which they are used; if there are leftover counts
 			// at this point, somebody is logging counts that are not getting used in the total.  Warn once.
-			static bool beenHere = false;
-			
-			if (!beenHere)
+			if (!community_.warned_experiment_run_clocks_)
 			{
 				THREAD_SAFETY_IN_ANY_PARALLEL("Chromosome::PrepareForCycle(): usage of statics");
 
 				std::cerr << "WARNING: mutation run experiment clocks were logged outside of the measurement interval!" << std::endl;
-				beenHere = true;
+				community_.warned_experiment_run_clocks_ = true;
 			}
 
 			x_total_gen_clocks_ = 0;

core/community.h

@@ -151,6 +151,9 @@ class Community : public EidosDictionaryUnretained
 	bool warned_no_max_distance_ = false;
 	bool warned_readFromVCF_mutIDs_unused_ = false;
 	bool warned_no_ancestry_read_ = false;
+	bool warned_experiment_run_clocks_ = false;
+	bool warned_spatial_map_color_deprecated_ = false;
+	bool warned_spatial_map_image_deprecated_ = false;
 
 	// these ivars are set around callbacks so we know what type of callback we're in, to prevent illegal operations during callbacks
 	// to make them easier to find, such checks should always be marked with a comment: // TIMING RESTRICTION

core/subpopulation.cpp

@@ -12253,12 +12253,11 @@ EidosValue_SP Subpopulation::ExecuteMethod_spatialMapColor(EidosGlobalStringID p
 
 	if (map_iter != spatial_maps_.end())
 	{
-		static bool beenHere = false;
 		SpatialMap *map = map_iter->second;
 
-		if (!beenHere && !gEidosSuppressWarnings) {
+		if (!community_.warned_spatial_map_color_deprecated_ && !gEidosSuppressWarnings) {
 			SLIM_ERRSTREAM << "#WARNING (Subpopulation::ExecuteMethod_spatialMapColor): spatialMapColor() has been deprecated; use the SpatialMap method mapColor() instead." << std::endl;
-			beenHere = true;
+			community_.warned_spatial_map_color_deprecated_ = true;
 		}
 
 		// call out to SpatialMap::ExecuteMethod_mapValue() to do the work
@@ -12286,12 +12285,11 @@ EidosValue_SP Subpopulation::ExecuteMethod_spatialMapImage(EidosGlobalStringID p
 
 	if (map_iter != spatial_maps_.end())
 	{
-		static bool beenHere = false;
 		SpatialMap *map = map_iter->second;
 
-		if (!beenHere && !gEidosSuppressWarnings) {
+		if (!community_.warned_spatial_map_image_deprecated_ && !gEidosSuppressWarnings) {
 			SLIM_ERRSTREAM << "#WARNING (Subpopulation::ExecuteMethod_spatialMapImage): spatialMapImage() has been deprecated; use the SpatialMap method mapImage() instead." << std::endl;
-			beenHere = true;
+			community_.warned_spatial_map_image_deprecated_ = true;
 		}
 
 		// call out to SpatialMap::ExecuteMethod_mapValue() to do the work