From 14cb5cf76511d1cede8c9f54d51dff4d75a46662 Mon Sep 17 00:00:00 2001
From: Simon Robertshaw <simon@hardwired.org.uk>
Date: Tue, 12 Jun 2012 16:02:09 +0100
Subject: TPT: Gel won't move solids any more 68ab2e3148


diff --git a/src/simulation/elements/GEL.cpp b/src/simulation/elements/GEL.cpp
index 2d3baeb..274f7c1 100644
--- a/src/simulation/elements/GEL.cpp
+++ b/src/simulation/elements/GEL.cpp
@@ -98,8 +98,13 @@ int Element_GEL::update(UPDATE_FUNC_ARGS)
 						per *= 0.1;
 
 					dx *= per; dy *= per;
-					parts[i].vx += dx; parts[r>>8].vx -= dx;
-					parts[i].vy += dy; parts[r>>8].vy -= dy;
+					parts[i].vx += dx;
+					parts[i].vy += dy;
+					if ((sim->elements[r&0xFF].State!=ST_SOLID && sim->elements[r&0xFF].State!=ST_NONE) || (r&0xFF)==PT_GOO)
+					{
+						parts[r>>8].vx -= dx;
+						parts[r>>8].vy -= dy;
+					}
 				}
 			}
 	return 0;
@@ -120,4 +125,4 @@ int Element_GEL::graphics(GRAPHICS_FUNC_ARGS)
 
 
 
-Element_GEL::~Element_GEL() {}
\ No newline at end of file
+Element_GEL::~Element_GEL() {}
--
cgit v0.9.2-21-gd62e