initialize variables in air.cpp and simulation.cpp

2 files changed, 20 insertions, 8 deletions

diff --git a/src/simulation/Air.cpp b/src/simulation/Air.cpp
index a6bd16c..b992388 100644
--- a/src/simulation/Air.cpp
+++ b/src/simulation/Air.cpp
@@ -320,6 +320,14 @@ Air::Air(Simulation & simulation):
 {
 	//Simulation should do this.
 	make_kernel();
-
-
+	std::fill(&bmap_blockair[0][0], &bmap_blockairh[0][0]+((XRES/CELL)*(YRES/CELL)), 0);
+	std::fill(&bmap_blockairh[0][0], &bmap_blockair[0][0]+((XRES/CELL)*(YRES/CELL)), 0);
+	std::fill(&vx[0][0], &vx[0][0]+((XRES/CELL)*(YRES/CELL)), 0.0f);
+	std::fill(&ovx[0][0], &ovx[0][0]+((XRES/CELL)*(YRES/CELL)), 0.0f);
+	std::fill(&vy[0][0], &vy[0][0]+((XRES/CELL)*(YRES/CELL)), 0.0f);
+	std::fill(&ovy[0][0], &ovy[0][0]+((XRES/CELL)*(YRES/CELL)), 0.0f);
+	std::fill(&hv[0][0], &hv[0][0]+((XRES/CELL)*(YRES/CELL)), 0.0f);
+	std::fill(&ohv[0][0], &ohv[0][0]+((XRES/CELL)*(YRES/CELL)), 0.0f);
+	std::fill(&pv[0][0], &pv[0][0]+((XRES/CELL)*(YRES/CELL)), 0.0f);
+	std::fill(&opv[0][0], &opv[0][0]+((XRES/CELL)*(YRES/CELL)), 0.0f);
 }
diff --git a/src/simulation/Simulation.cpp b/src/simulation/Simulation.cpp
index bbd2324..6506141 100644
--- a/src/simulation/Simulation.cpp
+++ b/src/simulation/Simulation.cpp
@@ -4767,11 +4767,7 @@ Simulation::~Simulation()
 		delete tools[i];
 }
 
-Simulation::Simulation():
-	sys_pause(0),
-	framerender(false),
-	pretty_powder(0),
-	sandcolour_frame(0)
+Simulation::Simulation()
 {
     
     int tportal_rx[] = {-1, 0, 1, 1, 1, 0,-1,-1};
@@ -4806,7 +4802,15 @@ Simulation::Simulation():
 	vy = air->vy;
 	pv = air->pv;
 	hv = air->hv;
-	aheat_enable = false;
+
+	sys_pause = 0;
+	framerender = 0;
+	pretty_powder = 0;
+	sandcolour_frame = 0;
+	aheat_enable = 0;
+	legacy_enable = 0;
+	VINE_MODE = 0;
+	water_equal_test = 0;
 
 	int menuCount;
 	menu_section * msectionsT = LoadMenus(menuCount);