From 257617576218c2aefe22e389b86dbdc7a21994b6 Mon Sep 17 00:00:00 2001
From: jacob1 <jfu614@gmail.com>
Date: Mon, 23 Dec 2019 00:34:21 -0500
Subject: [PATCH] remove unnecessary arguments to FloodINST. Fix random
 warning.

---
 src/gui/options/OptionsView.cpp  |  2 +-
 src/simulation/Simulation.cpp    | 25 +++++--------------------
 src/simulation/Simulation.h      |  2 +-
 src/simulation/elements/SPRK.cpp |  2 +-
 4 files changed, 8 insertions(+), 23 deletions(-)

diff --git a/src/gui/options/OptionsView.cpp b/src/gui/options/OptionsView.cpp
index 5ac62288f..8e502c98d 100644
--- a/src/gui/options/OptionsView.cpp
+++ b/src/gui/options/OptionsView.cpp
@@ -41,7 +41,7 @@ OptionsView::OptionsView():
 		Separator(ui::Point position, ui::Point size) : Component(position, size){}
 		virtual ~Separator(){}
 
-		void Draw(const ui::Point& screenPos)
+		void Draw(const ui::Point& screenPos) override
 		{
 			GetGraphics()->drawrect(screenPos.X, screenPos.Y, Size.X, Size.Y, 255, 255, 255, 180);
 		}		
diff --git a/src/simulation/Simulation.cpp b/src/simulation/Simulation.cpp
index 3b8aadcb0..48b6bd1d6 100644
--- a/src/simulation/Simulation.cpp
+++ b/src/simulation/Simulation.cpp
@@ -730,28 +730,13 @@ SimulationSample Simulation::GetSample(int x, int y)
 
 #define PMAP_CMP_CONDUCTIVE(pmap, t) (TYP(pmap)==(t) || (TYP(pmap)==PT_SPRK && parts[ID(pmap)].ctype==(t)))
 
-int Simulation::FloodINST(int x, int y, int fullc, int cm)
+int Simulation::FloodINST(int x, int y)
 {
-	int c = TYP(fullc);
+	const int cm = PT_INST;
 	int x1, x2;
 	int created_something = 0;
 
-	if (c>=PT_NUM)
-		return 0;
-
-	if (cm==-1)
-	{
-		if (c==0)
-		{
-			cm = TYP(pmap[y][x]);
-			if (!cm)
-				return 0;
-		}
-		else
-			cm = 0;
-	}
-
-	if (TYP(pmap[y][x])!=cm || parts[ID(pmap[y][x])].life!=0)
+	if (TYP(pmap[y][x]) != cm || parts[ID(pmap[y][x])].life != 0)
 		return 1;
 
 	CoordStack& cs = getCoordStackSingleton();
@@ -786,7 +771,7 @@ int Simulation::FloodINST(int x, int y, int fullc, int cm)
 			// fill span
 			for (x=x1; x<=x2; x++)
 			{
-				if (create_part(-1, x, y, c, ID(fullc))>=0)
+				if (create_part(-1, x, y, PT_SPRK)>=0)
 					created_something = 1;
 			}
 
@@ -3141,7 +3126,7 @@ int Simulation::create_part(int p, int x, int y, int t, int v)
 			return -1;
 		if (p == -2 && type == PT_INST)
 		{
-			FloodINST(x, y, PT_SPRK, PT_INST);
+			FloodINST(x, y);
 			return index;
 		}
 		parts[index].type = PT_SPRK;
diff --git a/src/simulation/Simulation.h b/src/simulation/Simulation.h
index a68fad7b1..cdb32b186 100644
--- a/src/simulation/Simulation.h
+++ b/src/simulation/Simulation.h
@@ -146,7 +146,7 @@ public:
 	bool FloodFillPmapCheck(int x, int y, int type);
 	int flood_prop(int x, int y, size_t propoffset, PropertyValue propvalue, StructProperty::PropertyType proptype);
 	bool flood_water(int x, int y, int i);
-	int FloodINST(int x, int y, int fullc, int cm);
+	int FloodINST(int x, int y);
 	void detach(int i);
 	bool part_change_type(int i, int x, int y, int t);
 	//int InCurrentBrush(int i, int j, int rx, int ry);
diff --git a/src/simulation/elements/SPRK.cpp b/src/simulation/elements/SPRK.cpp
index b1c39f127..0f5db0e7e 100644
--- a/src/simulation/elements/SPRK.cpp
+++ b/src/simulation/elements/SPRK.cpp
@@ -336,7 +336,7 @@ int Element_SPRK::update(UPDATE_FUNC_ARGS)
 				else if (receiver==PT_INST) {
 					if (parts[ID(r)].life==0 && parts[i].life<4)
 					{
-						sim->FloodINST(x+rx,y+ry,PT_SPRK,PT_INST);//spark the wire
+						sim->FloodINST(x+rx,y+ry);//spark the wire
 					}
 				}
 				else if (parts[ID(r)].life==0 && parts[i].life<4) {