From cdd7399cc1c009838970ab5dce60c5ad4c332d46 Mon Sep 17 00:00:00 2001
From: jacksonmj <jacksonmj@jacksonmj.none>
Date: Mon, 31 Jan 2011 02:42:34 +0000
Subject: [PATCH] Make console recognise element names

---
 includes/interface.h |  2 ++
 src/interface.c      | 16 +++++++++++++++
 src/main.c           | 49 +++++++++++++++++++++++++++++---------------
 3 files changed, 50 insertions(+), 17 deletions(-)

diff --git a/includes/interface.h b/includes/interface.h
index de1c95509..870e917e1 100644
--- a/includes/interface.h
+++ b/includes/interface.h
@@ -228,5 +228,7 @@ int report_ui(pixel *vid_buf, char *save_id);
 
 char *console_ui(pixel *vid_buf, char error[255]);
 
+int console_get_type(char *element);
+
 #endif
 
diff --git a/src/interface.c b/src/interface.c
index 7975278c6..221f2d5a0 100644
--- a/src/interface.c
+++ b/src/interface.c
@@ -3927,3 +3927,19 @@ char *console_ui(pixel *vid_buf,char error[255]) { //TODO: error messages, show
 
 }
 
+int console_get_type(char *element)
+{
+	int i;
+	char num[4];
+	i = atoi(element);
+	sprintf(num,"%d",i);
+	if (i>=0 && i<PT_NUM && strcmp(element,num)==0)
+		return i;
+	if (strcasecmp(element,"C4")==0) return PT_PLEX;
+	if (strcasecmp(element,"C5")==0) return PT_C5;
+	for (i=0; i<PT_NUM; i++) {
+		if (strcasecmp(element,ptypes[i].name)==0)
+			return i;
+	}
+	return -1;
+}
diff --git a/src/main.c b/src/main.c
index 5b0f124ed..ea3ba71f6 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1783,7 +1783,8 @@ int main(int argc, char *argv[])
 								if(parts[i].type)
 									parts[i].life = j;
 							}
-						} else
+						}
+						else
 						{
 							i = atoi(console4);
 							if(parts[i].type)
@@ -1797,19 +1798,26 @@ int main(int argc, char *argv[])
 					{
 						if(strcmp(console4, "all")==0)
 						{
-							j = atoi(console5);
-							for(i=0; i<NPART; i++)
-							{
-								if(parts[i].type)
-									parts[i].type = j;
-							}
-						} else
+							j = console_get_type(console5);
+							if (j<0)
+								sprintf(error, "Particle type not recognised", console2);
+							else
+								for(i=0; i<NPART; i++)
+								{
+									if(parts[i].type)
+										parts[i].type = j;
+								}
+						}
+						else
 						{
 							i = atoi(console4);
 							if(parts[i].type)
 							{
-								j = atoi(console5);
-								parts[i].type = j;
+								j = console_get_type(console5);
+								if (j<0)
+									sprintf(error, "Particle type not recognised", console2);
+								else
+									parts[i].type = j;
 							}
 						}
 					}
@@ -1823,7 +1831,8 @@ int main(int argc, char *argv[])
 								if(parts[i].type)
 									parts[i].temp = j;
 							}
-						} else
+						}
+						else
 						{
 							i = atoi(console4);
 							if(parts[i].type)
@@ -1843,7 +1852,8 @@ int main(int argc, char *argv[])
 								if(parts[i].type)
 									parts[i].tmp = j;
 							}
-						} else
+						}
+						else
 						{
 							i = atoi(console4);
 							if(parts[i].type)
@@ -1863,7 +1873,8 @@ int main(int argc, char *argv[])
 								if(parts[i].type)
 									parts[i].x = j;
 							}
-						} else
+						}
+						else
 						{
 							i = atoi(console4);
 							if(parts[i].type)
@@ -1883,7 +1894,8 @@ int main(int argc, char *argv[])
 								if(parts[i].type)
 									parts[i].y = j;
 							}
-						} else
+						}
+						else
 						{
 							i = atoi(console4);
 							if(parts[i].type)
@@ -1903,7 +1915,8 @@ int main(int argc, char *argv[])
 								if(parts[i].type)
 									parts[i].ctype = j;
 							}
-						} else
+						}
+						else
 						{
 							i = atoi(console4);
 							if(parts[i].type)
@@ -1923,7 +1936,8 @@ int main(int argc, char *argv[])
 								if(parts[i].type)
 									parts[i].vx = j;
 							}
-						} else
+						}
+						else
 						{
 							i = atoi(console4);
 							if(parts[i].type)
@@ -1943,7 +1957,8 @@ int main(int argc, char *argv[])
 								if(parts[i].type)
 									parts[i].vy = j;
 							}
-						} else
+						}
+						else
 						{
 							i = atoi(console4);
 							if(parts[i].type)