matthew/The-Powder-Toy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

TPT: Remember ctype when cloning lava

Browse Source
This commit is contained in:
Simon Robertshaw 2012-06-13 01:37:32 +01:00
parent f0778c2033
commit 0cb47ab93c
4 changed files with 45 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/simulation/elements/BCLN.cpp
View File

@ -71,18 +71,26 @@ int Element_BCLN::update(UPDATE_FUNC_ARGS)
continue; continue;
if ((r&0xFF)!=PT_CLNE && (r&0xFF)!=PT_PCLN && if ((r&0xFF)!=PT_CLNE && (r&0xFF)!=PT_PCLN &&
(r&0xFF)!=PT_BCLN && (r&0xFF)!=PT_STKM && (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) (r&0xFF)<PT_NUM)
{ {
parts[i].ctype = r&0xFF; 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; parts[i].tmp = parts[r>>8].ctype;
} }
} }
} }
else { else {
if (parts[i].ctype==PT_LIFE) sim->create_part(-1, x+rand()%3-1, y+rand()%3-1, parts[i].ctype|(parts[i].tmp<<8)); if (parts[i].ctype==PT_LIFE) sim->create_part(-1, x+rand()%3-1, y+rand()%3-1, parts[i].ctype|(parts[i].tmp<<8));
else sim->create_part(-1, x+rand()%3-1, y+rand()%3-1, parts[i].ctype); else
{
int np = sim->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 && sim->elements[parts[i].tmp].HighTemperatureTransition==PT_LAVA)
parts[np].ctype = parts[i].tmp;
}
}
} }
return 0; return 0;
} }

12
src/simulation/elements/CLNE.cpp
View File

@ -67,14 +67,22 @@ int Element_CLNE::update(UPDATE_FUNC_ARGS)
(r&0xFF)<PT_NUM) (r&0xFF)<PT_NUM)
{ {
parts[i].ctype = r&0xFF; 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; parts[i].tmp = parts[r>>8].ctype;
} }
} }
} }
else { else {
if (parts[i].ctype==PT_LIFE) sim->create_part(-1, x+rand()%3-1, y+rand()%3-1, parts[i].ctype|(parts[i].tmp<<8)); if (parts[i].ctype==PT_LIFE) sim->create_part(-1, x+rand()%3-1, y+rand()%3-1, parts[i].ctype|(parts[i].tmp<<8));
else sim->create_part(-1, x+rand()%3-1, y+rand()%3-1, parts[i].ctype); else
{
int np = sim->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 && sim->elements[parts[i].tmp].HighTemperatureTransition==PT_LAVA)
parts[np].ctype = parts[i].tmp;
}
}
} }
return 0; return 0;
} }

13
src/simulation/elements/PBCN.cpp
View File

@ -82,7 +82,7 @@ int Element_PBCN::update(UPDATE_FUNC_ARGS)
(r&0xFF)!=PT_PBCN && (r&0xFF)<PT_NUM) (r&0xFF)!=PT_PBCN && (r&0xFF)<PT_NUM)
{ {
parts[i].ctype = r&0xFF; 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; parts[i].tmp = parts[r>>8].ctype;
} }
} }
@ -135,8 +135,15 @@ int Element_PBCN::update(UPDATE_FUNC_ARGS)
sim->create_part(-1, x+rx, y+ry, parts[i].ctype|(parts[i].tmp<<8)); sim->create_part(-1, x+rx, y+ry, parts[i].ctype|(parts[i].tmp<<8));
} }
} }
} else { }
sim->create_part(-1, x+rand()%3-1, y+rand()%3-1, parts[i].ctype); else
{
int np = sim->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 && sim->elements[parts[i].tmp].HighTemperatureTransition==PT_LAVA)
parts[np].ctype = parts[i].tmp;
}
} }
} }
return 0; return 0;

13
src/simulation/elements/PCLN.cpp
View File

@ -91,7 +91,7 @@ int Element_PCLN::update(UPDATE_FUNC_ARGS)
(r&0xFF)!=PT_PBCN && (r&0xFF)<PT_NUM) (r&0xFF)!=PT_PBCN && (r&0xFF)<PT_NUM)
{ {
parts[i].ctype = r&0xFF; 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; parts[i].tmp = parts[r>>8].ctype;
} }
} }
@ -125,8 +125,15 @@ int Element_PCLN::update(UPDATE_FUNC_ARGS)
sim->create_part(-1, x+rx, y+ry, parts[i].ctype|(parts[i].tmp<<8)); sim->create_part(-1, x+rx, y+ry, parts[i].ctype|(parts[i].tmp<<8));
} }
} }
} else { }
sim->create_part(-1, x+rand()%3-1, y+rand()%3-1, parts[i].ctype); else
{
int np = sim->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 && sim->elements[parts[i].tmp].HighTemperatureTransition==PT_LAVA)
parts[np].ctype = parts[i].tmp;
}
} }
} }
return 0; return 0;