From 2656bcec2bc9e14dca844195fab3d3c676fc7689 Mon Sep 17 00:00:00 2001
From: Jacob1 <jfu614@gmail.com>
Date: Wed, 23 May 2012 18:54:25 -0400
Subject: [PATCH] fix compiling

---
 src/elements/gel.c | 5 +++--
 src/main.c         | 4 ++--
 src/powder.c       | 4 ++--
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/elements/gel.c b/src/elements/gel.c
index e55834294..c64591a02 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;
 
diff --git a/src/main.c b/src/main.c
index b61627321..b3ac8af89 100644
--- a/src/main.c
+++ b/src/main.c
@@ -770,6 +770,7 @@ int main(int argc, char *argv[])
 	unsigned int rgbSave = PIXRGB(127,0,0);
 	SDL_AudioSpec fmt;
 	int username_flash = 0, username_flash_t = 1;
+	int saveOpenError = 0;
 #ifdef PTW32_STATIC_LIB
     pthread_win32_process_attach_np();
     pthread_win32_thread_attach_np();
@@ -779,7 +780,6 @@ int main(int argc, char *argv[])
 	part_vbuf = calloc((XRES+BARSIZE)*(YRES+MENUSIZE), PIXELSIZE); //Extra video buffer
 	part_vbuf_store = part_vbuf;
 	pers_bg = calloc((XRES+BARSIZE)*YRES, PIXELSIZE);
-	int saveOpenError = 0;
 
 	gravity_init();
 	GSPEED = 1;
@@ -902,12 +902,12 @@ int main(int argc, char *argv[])
 		}
 		else if (!strncmp(argv[i], "ptsave", 7) && i+1<argc)
 		{
-			puts("Got ptsave");
 			int ci = 0, ns = 0, okay = 0;
 			char * tempString = argv[i+1];
 			int tempStringLength = strlen(argv[i+1])-7;
 			int tempSaveID = 0;
 			char tempNumberString[32];
+			puts("Got ptsave");
 			i++;
 			tempNumberString[31] = 0;
 			tempNumberString[0] = 0;
diff --git a/src/powder.c b/src/powder.c
index 6d92bc819..798c562bc 100644
--- a/src/powder.c
+++ b/src/powder.c
@@ -1440,7 +1440,7 @@ void create_arc(int sx, int sy, int dx, int dy, int midpoints, int variance, int
 void update_particles_i(pixel *vid, int start, int inc)
 {
 	int i, j, x, y, t, nx, ny, r, surround_space, s, lt, rt, nt, nnx, nny, q, golnum, goldelete, z, neighbors, createdsomething;
-	float mv, dx, dy, ix, iy, lx, ly, nrx, nry, dp, ctemph, ctempl, gravtot;
+	float mv, dx, dy, ix, iy, lx, ly, nrx, nry, dp, ctemph, ctempl, gravtot, gel_scale;
 	int fin_x, fin_y, clear_x, clear_y, stagnant;
 	float fin_xf, fin_yf, clear_xf, clear_yf;
 	float nn, ct1, ct2, swappage;
@@ -1878,7 +1878,7 @@ void update_particles_i(pixel *vid, int start, int inc)
 					}
 				}
 
-			float gel_scale = 1.0f;
+			gel_scale = 1.0f;
 			if (t==PT_GEL)
 				gel_scale = parts[i].tmp*2.55f;