From 4b4eb1a68e86ab2ed7703571b41a68be3d25d8a5 Mon Sep 17 00:00:00 2001
From: jacob1 <jfu614@gmail.com>
Date: Wed, 2 Jul 2014 23:07:10 -0400
Subject: [PATCH] Some changes which make GRVT work better

---
 src/simulation/Gravity.cpp    | 2 +-
 src/simulation/Simulation.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/simulation/Gravity.cpp b/src/simulation/Gravity.cpp
index a2670de00..3cced661e 100755
--- a/src/simulation/Gravity.cpp
+++ b/src/simulation/Gravity.cpp
@@ -144,6 +144,7 @@ void Gravity::update_grav_async()
 	//memset(th_gravy, 0, XRES*YRES*sizeof(float));
 	//memset(th_gravx, 0, XRES*YRES*sizeof(float));
 	//memset(th_gravp, 0, XRES*YRES*sizeof(float));
+	if (!grav_fft_status) grav_fft_init();
 	while(!thread_done){
 		if(!done){
 			update_grav();
@@ -301,7 +302,6 @@ void Gravity::update_grav()
 	if(changed)
 	{
 		th_gravchanged = 1;
-		if (!grav_fft_status) grav_fft_init();
 
 		//copy gravmap into padded gravmap array
 		for (y=0; y<YRES/CELL; y++)
diff --git a/src/simulation/Simulation.cpp b/src/simulation/Simulation.cpp
index c413c3aab..b520ef894 100644
--- a/src/simulation/Simulation.cpp
+++ b/src/simulation/Simulation.cpp
@@ -4236,7 +4236,7 @@ killed:
 						clear_y = (int)(clear_yf+0.5f);
 						break;
 					}
-					if (fin_x<CELL || fin_y<CELL || fin_x>=XRES-CELL || fin_y>=YRES-CELL || pmap[fin_y][fin_x] || (bmap[fin_y/CELL][fin_x/CELL] && (bmap[fin_y/CELL][fin_x/CELL]==WL_DESTROYALL || !eval_move(t,fin_x,fin_y,NULL))))
+					if (!eval_move(t, fin_x, fin_y, NULL))
 					{
 						// found an obstacle
 						clear_xf = fin_xf-dx;