Merge pull request #66 from jacob1/Modstuff

Code structure improvements for graphics/drawing, improvements to prevent accidental infinite loops in Lua, Fixes for fusion, improvements for VOID types. And other minor improvements

1 files changed, 3 insertions, 2 deletions

diff --git a/src/elements/gel.c b/src/elements/gel.c
index e558342..c64591a 100644
--- a/src/elements/gel.c
+++ b/src/elements/gel.c
@@ -17,6 +17,8 @@
 
 int update_GEL(UPDATE_FUNC_ARGS) {
 	int r, rx, ry;
+	float dx, dy;
+	char gel;
 	if (parts[i].tmp>100) parts[i].tmp = 100;
 	if (parts[i].tmp<0) parts[i].tmp = 0;
 	for (rx=-2; rx<3; rx++)
@@ -41,7 +43,7 @@ int update_GEL(UPDATE_FUNC_ARGS) {
 					parts[i].tmp++;
 				}
 
-				char gel = 0;
+				gel = 0;
 				if ((r&0xFF)==PT_GEL)
 					gel = 1;
 
@@ -58,7 +60,6 @@ int update_GEL(UPDATE_FUNC_ARGS) {
 					parts[i].tmp--;
 				}
 
-				float dx, dy;
 				dx = parts[i].x - parts[r>>8].x;
 				dy = parts[i].y - parts[r>>8].y;