summaryrefslogtreecommitdiff
path: root/src/elements/bcln.c
diff options
context:
space:
mode:
authorjacksonmj <mj-pt@jacksonmj.co.uk>2012-06-10 21:53:40 (GMT)
committer jacksonmj <mj-pt@jacksonmj.co.uk>2012-06-10 21:57:26 (GMT)
commit77079439819dca2da9a3dda9120ea304e5e2d4fb (patch)
tree4e46697d5cac79daaf952e47014f8e06744eefb1 /src/elements/bcln.c
parent3c14787064cba769be045a56de5406fa791ad541 (diff)
downloadpowder-77079439819dca2da9a3dda9120ea304e5e2d4fb.zip
powder-77079439819dca2da9a3dda9120ea304e5e2d4fb.tar.gz
Remember ctype when cloning lava
Diffstat (limited to 'src/elements/bcln.c')
-rw-r--r--src/elements/bcln.c14
1 files changed, 11 insertions, 3 deletions
diff --git a/src/elements/bcln.c b/src/elements/bcln.c
index 328fc6e..91dac12 100644
--- a/src/elements/bcln.c
+++ b/src/elements/bcln.c
@@ -38,18 +38,26 @@ int update_BCLN(UPDATE_FUNC_ARGS) {
continue;
if ((r&0xFF)!=PT_CLNE && (r&0xFF)!=PT_PCLN &&
(r&0xFF)!=PT_BCLN && (r&0xFF)!=PT_STKM &&
- (r&0xFF)!=PT_STKM2 && (r&0xFF)!=PT_PBCN &&
+ (r&0xFF)!=PT_PBCN && (r&0xFF)!=PT_STKM2 &&
(r&0xFF)<PT_NUM)
{
parts[i].ctype = r&0xFF;
- if ((r&0xFF)==PT_LIFE)
+ if ((r&0xFF)==PT_LIFE || (r&0xFF)==PT_LAVA)
parts[i].tmp = parts[r>>8].ctype;
}
}
}
else {
if (parts[i].ctype==PT_LIFE) create_part(-1, x+rand()%3-1, y+rand()%3-1, parts[i].ctype|(parts[i].tmp<<8));
- else create_part(-1, x+rand()%3-1, y+rand()%3-1, parts[i].ctype);
+ else
+ {
+ int np = create_part(-1, x+rand()%3-1, y+rand()%3-1, parts[i].ctype);
+ if (np>=0)
+ {
+ if (parts[i].ctype==PT_LAVA && parts[i].tmp>0 && parts[i].tmp<PT_NUM && ptransitions[parts[i].tmp].tht==PT_LAVA)
+ parts[np].ctype = parts[i].tmp;
+ }
+ }
}
return 0;
}