kill darks only if system is in night

git-svn-id: http://svn.code.sf.net/p/rts-2/code/trunk/rts-2@10837 65ab8f4e-f147-0410-b3a9-f14133ecfe55
RTS2 · Sep 10, 2012 · eaf8d10 · eaf8d10
1 parent c4db76a
commit eaf8d10
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/src/plan/executor.cpp b/src/plan/executor.cpp
@@ -607,7 +607,8 @@ int Executor::queueTarget (int tarId, double t_start, double t_end)
 		{
 			return setNow (nt);
 		}
-		if (next_night->getValueBool () && currentTarget && currentTarget->getTargetType () == TYPE_DARK && nt->getTargetType () != TYPE_DARK)
+		// kill darks during nights..
+		if (next_night->getValueBool () && getMasterState () == SERVERD_NIGHT && currentTarget && currentTarget->getTargetType () == TYPE_DARK && nt->getTargetType () != TYPE_DARK)
 		{
 			next_night->setValueBool (false);
 			sendValueAll (next_night);