From 4fc87ced78d1b858c112ebe23faf55245efa557c Mon Sep 17 00:00:00 2001
From: temple <temple@wildfiregames.com>
Date: Wed, 21 Feb 2018 22:30:54 +0000
Subject: [PATCH] Grid bounds and SinkRate debug version fixes

Differential Revision: https://code.wildfiregames.com/D1209
Patch by: Angen
Reviewed by: wraitii
Comments by: Itms, Stan
This was SVN commit r21312.
---
 .../mods/public/simulation/templates/special/target_marker.xml  | 2 +-
 source/simulation2/helpers/Grid.h                               | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/binaries/data/mods/public/simulation/templates/special/target_marker.xml b/binaries/data/mods/public/simulation/templates/special/target_marker.xml
index 776998780f..6605738ffc 100644
--- a/binaries/data/mods/public/simulation/templates/special/target_marker.xml
+++ b/binaries/data/mods/public/simulation/templates/special/target_marker.xml
@@ -4,7 +4,7 @@
     <Active>true</Active>
     <SinkingAnim>false</SinkingAnim>
     <DelayTime>0.5</DelayTime>
-    <SinkRate>1000000</SinkRate>
+    <SinkRate>10000</SinkRate>
     <SinkAccel>0</SinkAccel>
   </Decay>
   <Position>
diff --git a/source/simulation2/helpers/Grid.h b/source/simulation2/helpers/Grid.h
index 612e2f5896..755e7fb881 100644
--- a/source/simulation2/helpers/Grid.h
+++ b/source/simulation2/helpers/Grid.h
@@ -105,7 +105,7 @@ public:
 	bool any_set_in_square(int i0, int j0, int i1, int j1) const
 	{
 	#if GRID_BOUNDS_DEBUG
-		ENSURE(i0 >= 0 && j0 >= 0 && i1 < m_W && j1 < m_H);
+		ENSURE(i0 >= 0 && j0 >= 0 && i1 <= m_W && j1 <= m_H);
 	#endif
 		for (int j = j0; j < j1; ++j)
 		{