summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorSimon Robertshaw <simon@hardwired.org.uk>2011-11-12 16:24:39 (GMT)
committer Simon Robertshaw <simon@hardwired.org.uk>2011-11-12 16:24:39 (GMT)
commitee72977da8e47fece6c831d7c8004898cf4f400d (patch)
tree3286047f3bdcb2b51c31df3e990df3e4bd6f680b /src
parent2bd9d61ab5f26c11157214dfddd2927037d80008 (diff)
parent73460283a2f07e52069fe18671433dc29522dfb0 (diff)
downloadpowder-ee72977da8e47fece6c831d7c8004898cf4f400d.zip
powder-ee72977da8e47fece6c831d7c8004898cf4f400d.tar.gz
Merge branch 'master' of github.com:FacialTurd/The-Powder-Toy
Diffstat (limited to 'src')
-rw-r--r--src/main.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/src/main.c b/src/main.c
index 3d61f42..6d7b028 100644
--- a/src/main.c
+++ b/src/main.c
@@ -2724,6 +2724,16 @@ int main(int argc, char *argv[])
sprintf(nametext, "Molten %s", lowername);
}
+ else if ((cr&0xFF)==PT_PIPE && (parts[cr>>8].tmp&0xFF) > 0 && (parts[cr>>8].tmp&0xFF) < PT_NUM )
+ {
+ char lowername[6];
+ int ix;
+ strcpy(lowername, ptypes[parts[cr>>8].tmp&0xFF].name);
+ for (ix = 0; lowername[ix]; ix++)
+ lowername[ix] = tolower(lowername[ix]);
+
+ sprintf(nametext, "Pipe with %s", lowername);
+ }
else if (DEBUG_MODE)
{
int tctype = parts[cr>>8].ctype;