From 5892c745955fb3afeb69176a1233efb7eb3751b4 Mon Sep 17 00:00:00 2001
From: jacksonmj <mj-pt@jacksonmj.co.uk>
Date: Sat, 3 Sep 2011 06:24:29 +0800
Subject: Visual Studio fixes


diff --git a/font/unpacker.c b/font/unpacker.c
index 95fbf0c..d2df723 100644
--- a/font/unpacker.c
+++ b/font/unpacker.c
@@ -1,3 +1,5 @@
+#ifdef FONTEDITOR
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -106,4 +108,6 @@ int main(int argc, char *argv[])
     fclose(f);
 
     return 0;
-}
\ No newline at end of file
+}
+
+#endif
diff --git a/includes/powder.h b/includes/powder.h
index 1810e69..3182d05 100644
--- a/includes/powder.h
+++ b/includes/powder.h
@@ -739,7 +739,7 @@ static part_transition ptransitions[PT_NUM] =
 	/* PBCN */ {IPL,	NT,			IPH,	NT,			ITL,	NT,			ITH,	NT},
 	/* GPMP */ {IPL,    NT,         IPH,    NT,         ITL,    NT,         ITH,	NT},
 	/* CLST */ {IPL,	NT,			IPH,	NT,			ITL,	NT,			1256.0f,	PT_LAVA},
-	/* WIRE */ {IPL,	NT,			IPH,	NT,			ITL,	NT,			ITH,	NT, PT_WIRE},
+	/* WIRE */ {IPL,	NT,			IPH,	NT,			ITL,	NT,			ITH,	NT},
 	/* GBMB */ {IPL,	NT,			IPH,	NT,			ITL,	NT,			ITH,	NT},
 };
 #undef IPL
diff --git a/src/elements/stkm.c b/src/elements/stkm.c
index ad197ef..a96de2a 100644
--- a/src/elements/stkm.c
+++ b/src/elements/stkm.c
@@ -17,6 +17,8 @@ int run_stickman(float* playerp, UPDATE_FUNC_ARGS) {
 	int r, rx, ry;
 	float pp, d;
 	float dt = 0.9;///(FPSB*FPSB);  //Delta time in square
+	float gvx, gvy;
+	float gx, gy, dl, dr;
 
 	if ((parts[i].ctype>0 && parts[i].ctype<PT_NUM && ptypes[parts[i].ctype].falldown>0) || parts[i].ctype==SPC_AIR || parts[i].ctype == PT_NEUT || parts[i].ctype == PT_PHOT)
 		playerp[2] = parts[i].ctype;
@@ -42,7 +44,6 @@ int run_stickman(float* playerp, UPDATE_FUNC_ARGS) {
 	}
 
 	//Follow gravity
-	float gvx, gvy;
 	gvx = gvy = 0.0f;
 	switch (gravityMode)
 	{
@@ -110,8 +111,6 @@ int run_stickman(float* playerp, UPDATE_FUNC_ARGS) {
 	playerp[25] = 0;
 	playerp[26] = 0;
 
-	float gx, gy, dl, dr;
-
 	gx = (playerp[7] + playerp[15])/2 - gvy;
 	gy = (playerp[8] + playerp[16])/2 + gvx;
 	dl = pow(gx - playerp[7], 2) + pow(gy - playerp[8], 2);
diff --git a/src/interface.c b/src/interface.c
index 5f78eed..3370883 100644
--- a/src/interface.c
+++ b/src/interface.c
@@ -3322,9 +3322,9 @@ int open_ui(pixel *vid_buf, char *save_id, char *save_date)
 	ui_edit ed;
 	ui_copytext ctb;
 
-	viewcountbuffer[0] = 0;
 	pixel *old_vid=(pixel *)calloc((XRES+BARSIZE)*(YRES+MENUSIZE), PIXELSIZE);
 	fillrect(vid_buf, -1, -1, XRES+BARSIZE, YRES+MENUSIZE, 0, 0, 0, 192);
+	viewcountbuffer[0] = 0;
 
 	fillrect(vid_buf, 50, 50, XRES+BARSIZE-100, YRES+MENUSIZE-100, 0, 0, 0, 255);
 	drawrect(vid_buf, 50, 50, XRES+BARSIZE-100, YRES+MENUSIZE-100, 255, 255, 255, 255);
diff --git a/src/main.c b/src/main.c
index 1f75087..9327123 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1564,7 +1564,6 @@ int main(int argc, char *argv[])
 #else
 int main(int argc, char *argv[])
 {
-	limitFPS = 60;
 	pixel *part_vbuf; //Extra video buffer
 	pixel *part_vbuf_store;
 #ifdef BETA
@@ -1597,6 +1596,7 @@ int main(int argc, char *argv[])
     pthread_win32_process_attach_np();
     pthread_win32_thread_attach_np();
 #endif
+	limitFPS = 60;
 	vid_buf = calloc((XRES+BARSIZE)*(YRES+MENUSIZE), PIXELSIZE);
 	part_vbuf = calloc((XRES+BARSIZE)*(YRES+MENUSIZE), PIXELSIZE); //Extra video buffer
 	part_vbuf_store = part_vbuf;
@@ -2585,8 +2585,8 @@ int main(int argc, char *argv[])
 				else if ((cr&0xFF)==PT_LAVA && parts[cr>>8].ctype > 0 && parts[cr>>8].ctype < PT_NUM )
 				{
 					char lowername[6];
-					strcpy(lowername, ptypes[parts[cr>>8].ctype].name);
 					int ix;
+					strcpy(lowername, ptypes[parts[cr>>8].ctype].name);
 					for (ix = 0; lowername[ix]; ix++)
 						lowername[ix] = tolower(lowername[ix]);
 
--
cgit v0.9.2-21-gd62e