Fix some compiler warnings

3 files changed, 20 insertions, 19 deletions

diff --git a/src/elements/fwrk.c b/src/elements/fwrk.c
index 06390c5..5095cde 100644
--- a/src/elements/fwrk.c
+++ b/src/elements/fwrk.c
@@ -16,7 +16,7 @@ int update_FWRK(UPDATE_FUNC_ARGS) {
 	}
 	if (parts[i].life>=45)
 		parts[i].life=0;
-	if ((parts[i].life<3&&parts[i].life>0)||parts[i].vy>6&&parts[i].life>0)
+	if ((parts[i].life<3&&parts[i].life>0)||(parts[i].vy>6&&parts[i].life>0))
 	{
 		int q = (rand()%255+1);
 		int w = (rand()%255+1);
diff --git a/src/main.c b/src/main.c
index 46f99b1..946d87b 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1510,7 +1510,7 @@ int main(int argc, char *argv[])
 					free(load_data);
 			}
 		}
-		if (sdl_key=='s' && (sdl_mod & (KMOD_CTRL)) || (sdl_key=='s' && !isplayer2))
+		if ((sdl_key=='s' && (sdl_mod & (KMOD_CTRL))) || (sdl_key=='s' && !isplayer2))
 		{
 			if (it > 50)
 				it = 50;
@@ -1644,7 +1644,7 @@ int main(int argc, char *argv[])
 					bsy = 0;
 			}
 		}
-		if (sdl_key=='d'&&(sdl_mod & (KMOD_CTRL)) || (sdl_key=='d' && !isplayer2))
+		if ((sdl_key=='d'&&(sdl_mod & (KMOD_CTRL))) || (sdl_key=='d' && !isplayer2))
 			DEBUG_MODE = !DEBUG_MODE;
 		if (sdl_key=='i')
 		{
@@ -1901,7 +1901,7 @@ int main(int argc, char *argv[])
 			console = console_ui(vid_buf,console_error);
 			console = mystrdup(console);
 			strcpy(console_error,"");
-			if(process_command(vid_buf,console,&console_error)==-1)
+			if(process_command(vid_buf,console,console_error)==-1)
 			{
 				free(console);
 				break;
@@ -2740,7 +2740,7 @@ int process_command(pixel *vid_buf,char *console,char *console_error) {
 		{
 			return -1;
 		}
-		else if(strcmp(console2, "file")==0 && console3)
+		else if(strcmp(console2, "file")==0)
 		{
 			FILE *f=fopen(console3, "r");
 			if(f)
@@ -2753,8 +2753,7 @@ int process_command(pixel *vid_buf,char *console,char *console_error) {
 				ny = 0;
 				j = 0;
 				m = 0;
-				if(console4)
-					console_parse_coords(console4, &nx , &ny, console_error);
+				console_parse_coords(console4, &nx , &ny, console_error);
 				memset(pch,0,sizeof(pch));
 				memset(fileread,0,sizeof(fileread));
 				fread(fileread,1,5000,f);
@@ -2821,12 +2820,12 @@ int process_command(pixel *vid_buf,char *console,char *console_error) {
 			else
 				sprintf(console_error, "%s does not exist", console3);
 		}
-		else if(strcmp(console2, "sound")==0 && console3)
+		else if(strcmp(console2, "sound")==0)
 		{
 			if (sound_enable) play_sound(console3);
 			else strcpy(console_error, "Audio device not available - cannot play sounds");
 		}
-		else if(strcmp(console2, "load")==0 && console3)
+		else if(strcmp(console2, "load")==0)
 		{
 			j = atoi(console3);
 			if(j)
@@ -2835,7 +2834,7 @@ int process_command(pixel *vid_buf,char *console,char *console_error) {
 				console_mode = 0;
 			}
 		}
-		else if(strcmp(console2, "if")==0 && console3)
+		else if(strcmp(console2, "if")==0)
 		{
 			if(strcmp(console3, "type")==0)//TODO: add more than just type, and be able to check greater/less than
 			{
@@ -2851,7 +2850,7 @@ int process_command(pixel *vid_buf,char *console,char *console_error) {
 					return 0;
 			}
 		}
-		else if (strcmp(console2, "create")==0 && console3 && console4)
+		else if (strcmp(console2, "create")==0)
 		{
 			if (console_parse_type(console3, &j, console_error)
 			        && console_parse_coords(console4, &nx, &ny, console_error))
@@ -2862,12 +2861,12 @@ int process_command(pixel *vid_buf,char *console,char *console_error) {
 					strcpy(console_error, "Could not create particle");
 			}
 		}
-		else if ((strcmp(console2, "delete")==0 || strcmp(console2, "kill")==0) && console3)
+		else if (strcmp(console2, "delete")==0 || strcmp(console2, "kill")==0)
 		{
 			if (console_parse_partref(console3, &i, console_error))
 				kill_part(i);
 		}
-		else if(strcmp(console2, "reset")==0 && console3)
+		else if(strcmp(console2, "reset")==0)
 		{
 			if(strcmp(console3, "pressure")==0)
 			{
@@ -2908,7 +2907,7 @@ int process_command(pixel *vid_buf,char *console,char *console_error) {
 				}
 			}
 		}
-		else if(strcmp(console2, "set")==0 && console3 && console4 && console5)
+		else if(strcmp(console2, "set")==0)
 		{
 			if(strcmp(console3, "life")==0)
 			{
@@ -3173,7 +3172,7 @@ int process_command(pixel *vid_buf,char *console,char *console_error) {
 			}
 		}
 		else
-			sprintf(console_error, "Invalid Command", console2);
+			strcpy(console_error, "Invalid Command");
 	}
 	return 1;
 }
diff --git a/src/powder.c b/src/powder.c
index 78562b8..914bb4e 100644
--- a/src/powder.c
+++ b/src/powder.c
@@ -488,7 +488,7 @@ inline int create_n_parts(int n, int x, int y, float vx, float vy, int t)
 	if (x<0 || y<0 || x>=XRES || y>=YRES || t<0 || t>=PT_NUM)
 		return -1;
 
-	for (c; c<n; c++) {
+	for (c=0; c<n; c++) {
 		float r = (rand()%128+128)/127.0f;
 		float a = (rand()%360)*3.14159f/180.0f;
 		if (pfree == -1)
@@ -741,7 +741,7 @@ inline int create_part(int p, int x, int y, int t)
 	{
 		if (isplayer==0)
 		{
-			if (pmap[y][x]&0xFF==PT_SPAWN)
+			if ((pmap[y][x]&0xFF)==PT_SPAWN)
 			{
 				parts[pmap[y][x]>>8].type = PT_STKM;
 				parts[pmap[y][x]>>8].vx = 0;
@@ -799,7 +799,7 @@ inline int create_part(int p, int x, int y, int t)
 	{
 		if (isplayer2==0)
 		{
-			if (pmap[y][x]&0xFF==PT_SPAWN2)
+			if ((pmap[y][x]&0xFF)==PT_SPAWN2)
 			{
 				parts[pmap[y][x]>>8].type = PT_STKM2;
 				parts[pmap[y][x]>>8].vx = 0;
@@ -1335,7 +1335,7 @@ void update_particles_i(pixel *vid, int start, int inc)
 			{
 				r = pmap[ny][nx];
 				neighbors = gol2[nx][ny][0];
-				if(neighbors==0 || !(ptypes[r&0xFF].properties&PROP_LIFE || !r&0xFF) || (r>>8)>=NPART)
+				if(neighbors==0 || !(ptypes[r&0xFF].properties&PROP_LIFE || !(r&0xFF)) || (r>>8)>=NPART)
 					continue;
 				for ( golnum = 1; golnum<=NGOL; golnum++)
 					for ( goldelete = 0; goldelete<9; goldelete++)
@@ -2925,10 +2925,12 @@ int create_parts(int x, int y, int rx, int ry, int c)
 			for (j=-ry; j<=ry; j++)
 				for (i=-rx; i<=rx; i++)
 					if ((CURRENT_BRUSH==CIRCLE_BRUSH && (pow(i,2))/(pow(rx,2))+(pow(j,2))/(pow(ry,2))<=1)||(CURRENT_BRUSH==SQUARE_BRUSH&&i*j<=ry*rx))
+					{
 						if (!REPLACE_MODE)
 							create_part(-2, x+i, y+j, c);
 						else if ((pmap[y+j][x+i]&0xFF)==SLALT&&SLALT!=0)
 							create_part(-2, x+i, y+j, c);
+					}
 		return 1;
 	}