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

Revert "final fusion fixes"

Browse Source 
This reverts commit add4226f31.
This commit is contained in:
Simon Robertshaw 2012-08-25 16:32:51 +01:00
parent bd9829124b
commit 9b10f0c390
3 changed files with 10 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/simulation/elements/H2.cpp
View File

@ -79,8 +79,6 @@ int Element_H2::update(UPDATE_FUNC_ARGS)
}
if (rt==PT_FIRE || rt==PT_PLSM || rt==PT_LAVA)
{
if(parts[r>>8].tmp&8&&rt==PT_PLSM)
continue;
sim->create_part(i,x,y,PT_FIRE);
parts[i].temp+=(rand()%250);
parts[i].tmp |= 1;
@ -96,27 +94,11 @@ int Element_H2::update(UPDATE_FUNC_ARGS)
float temp = parts[i].temp;
sim->create_part(i,x,y,PT_NBLE);
j = sim->create_part(-3,x+rand()%3-1,y+rand()%3-1,PT_NEUT);
if (j != -1)
parts[j].temp = temp;
if (!(rand()%10))
{
j = sim->create_part(-3,x+rand()%3-1,y+rand()%3-1,PT_ELEC);
if (j != -1)
parts[j].temp = temp;
}
j = sim->create_part(-3,x+rand()%3-1,y+rand()%3-1,PT_PHOT);
if (j != -1)
{
parts[j].ctype = 0xFFFF00;
parts[j].temp = temp;
}
j = sim->create_part(-3,x+rand()%3-1,y+rand()%3-1,PT_PLSM);
if (j != -1)
{
parts[j].temp = temp;
parts[j].tmp |=8;
}
j = sim->create_part(-3,x+rand()%3-1,y+rand()%3-1,PT_NEUT); if (j != -1) parts[j].temp = temp;
if (!(rand()%10)) { j = sim->create_part(-3,x+rand()%3-1,y+rand()%3-1,PT_ELEC); if (j != -1) parts[j].temp = temp; }
j = sim->create_part(-3,x+rand()%3-1,y+rand()%3-1,PT_PHOT); if (j != -1) { parts[j].ctype = 0xFFFF00; parts[j].temp = temp; }
j = sim->create_part(-3,x+rand()%3-1,y+rand()%3-1,PT_PLSM); if (j != -1) parts[j].temp = temp;
parts[i].temp = temp+750+rand()%500;
sim->pv[y/CELL][x/CELL] += 30;

9
src/simulation/elements/NBLE.cpp
View File

@ -63,12 +63,7 @@ int Element_NBLE::update(UPDATE_FUNC_ARGS)
if (!(rand()%25)) { j = sim->create_part(-3,x+rand()%3-1,y+rand()%3-1,PT_ELEC); if (j != -1) parts[j].temp = temp; }
j = sim->create_part(-3,x+rand()%3-1,y+rand()%3-1,PT_PHOT); if (j != -1) { parts[j].ctype = 0xFF0000; parts[j].temp = temp; }
j = sim->create_part(-3,x+rand()%3-1,y+rand()%3-1,PT_PLSM);
if (j != -1)
{
parts[j].temp = temp;
parts[j].tmp |=8;
}
j = sim->create_part(-3,x+rand()%3-1,y+rand()%3-1,PT_PLSM); if (j != -1) parts[j].temp = temp;
parts[i].temp = temp+1750+rand()%500;
sim->pv[y/CELL][x/CELL] += 50;
@ -78,4 +73,4 @@ int Element_NBLE::update(UPDATE_FUNC_ARGS)
}
Element_NBLE::~Element_NBLE() {}
Element_NBLE::~Element_NBLE() {}

17
src/simulation/elements/O2.cpp
View File

@ -69,8 +69,6 @@ int Element_O2::update(UPDATE_FUNC_ARGS)
}
if ((r&0xFF)==PT_FIRE || (r&0xFF)==PT_PLSM)
{
if((r&0xFF)==PT_PLSM && parts[r>>8].tmp&8)
continue;
sim->create_part(i,x,y,PT_FIRE);
parts[i].temp+=(rand()/(RAND_MAX/100));
parts[i].tmp |= 2;
@ -85,18 +83,9 @@ int Element_O2::update(UPDATE_FUNC_ARGS)
int j;
sim->create_part(i,x,y,PT_BRMT);
j = sim->create_part(-3,x+rand()%3-1,y+rand()%3-1,PT_NEUT);
if (j != -1)
parts[j].temp = 15000;
j = sim->create_part(-3,x+rand()%3-1,y+rand()%3-1,PT_PHOT);
if (j != -1)
parts[j].temp = 15000;
j = sim->create_part(-3,x+rand()%3-1,y+rand()%3-1,PT_PLSM);
if (j != -1)
{
parts[j].temp = 15000;
parts[j].tmp |= 8;
}
j = sim->create_part(-3,x+rand()%3-1,y+rand()%3-1,PT_NEUT); if (j != -1) parts[j].temp = 15000;
j = sim->create_part(-3,x+rand()%3-1,y+rand()%3-1,PT_PHOT); if (j != -1) parts[j].temp = 15000;
j = sim->create_part(-3,x+rand()%3-1,y+rand()%3-1,PT_PLSM); if (j != -1) parts[j].temp = 15000;
parts[i].temp = 15000;
sim->pv[y/CELL][x/CELL] += 300;