summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorSimon Robertshaw <simon@hardwired.org.uk>2011-08-20 17:18:28 (GMT)
committer Simon Robertshaw <simon@hardwired.org.uk>2011-08-20 17:18:28 (GMT)
commit3ce69525abd920521d065d2e60edcbc287c87736 (patch)
treec0fe4ba0afeff429bd2526abf8d88e25c915c8ac /src
parent99b67598aa7400300d7e548bc5d0293f09632c25 (diff)
parent8a4ddb1c5458044d83d8323befbab6019110cef5 (diff)
downloadpowder-3ce69525abd920521d065d2e60edcbc287c87736.zip
powder-3ce69525abd920521d065d2e60edcbc287c87736.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 e92c0a7..2441338 100644
--- a/src/main.c
+++ b/src/main.c
@@ -2575,6 +2575,16 @@ int main(int argc, char *argv[])
{
sprintf(nametext, "%s (%s)", ptypes[cr&0xFF].name, gmenu[parts[cr>>8].ctype].name);
}
+ else if ((cr&0xFF)==PT_LAVA && parts[cr>>8].ctype)
+ {
+ char lowername[6];
+ strcpy(lowername, ptypes[parts[cr>>8].ctype].name);
+ int ix;
+ for (ix = 0; lowername[ix]; ix++)
+ lowername[ix] = tolower(lowername[ix]);
+
+ sprintf(nametext, "Molten %s", lowername);
+ }
else if (DEBUG_MODE)
{
int tctype = parts[cr>>8].ctype;