Merge branch 'master' of github.com:FacialTurd/The-Powder-Toy

This commit is contained in:
Simon Robertshaw 2011-11-12 16:24:39 +00:00
commit ee72977da8

View File

@ -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;