diff options
| author | cracker64 <cracker642@gmail.com> | 2013-02-26 23:59:37 (GMT) |
|---|---|---|
| committer | cracker64 <cracker642@gmail.com> | 2013-02-26 23:59:37 (GMT) |
| commit | 8250515e97db5ace3e87c612d855f09235b73969 (patch) | |
| tree | ddbc36591a9043334b2fc684722ffd334894da83 /src/simulation/elements/BRMT.cpp | |
| parent | e700ff29883fcc3479ad8d9fce9805fbb0d31dfa (diff) | |
| download | powder-8250515e97db5ace3e87c612d855f09235b73969.zip powder-8250515e97db5ace3e87c612d855f09235b73969.tar.gz | |
Lots of small optimizations and things, nothing should be functionally different.
Only gotten through a few elements, more later.
Diffstat (limited to 'src/simulation/elements/BRMT.cpp')
| -rw-r--r-- | src/simulation/elements/BRMT.cpp | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/src/simulation/elements/BRMT.cpp b/src/simulation/elements/BRMT.cpp index 55eb243..0e36630 100644 --- a/src/simulation/elements/BRMT.cpp +++ b/src/simulation/elements/BRMT.cpp @@ -50,8 +50,11 @@ Element_BRMT::Element_BRMT() int Element_BRMT::update(UPDATE_FUNC_ARGS) { int r, rx, ry, rt, tempFactor; - if (parts[i].temp > (250.0f+273.15f)) + if (parts[i].temp > 523.15f)//250.0f+273.15f { + tempFactor = 1000 - ((523.15f-parts[i].temp)*2); + if(tempFactor < 2) + tempFactor = 2; for (rx=-1; rx<2; rx++) for (ry=-1; ry<2; ry++) if (x+rx>=0 && y+ry>0 && x+rx<XRES && y+ry<YRES && (rx || ry)) @@ -59,20 +62,14 @@ int Element_BRMT::update(UPDATE_FUNC_ARGS) r = pmap[y+ry][x+rx]; if (!r) continue; - rt = parts[r>>8].type; - tempFactor = 1000 - (((250.0f+273.15f)-parts[i].temp)*2); - if(tempFactor < 2) - tempFactor = 2; - if ((rt==PT_BREC) && 1 > (rand()%tempFactor)) + if ((r&0xFF)==PT_BREC && 1>(rand()%tempFactor)) { if(rand()%2) { sim->create_part(r>>8, x+rx, y+ry, PT_THRM); } else - { sim->create_part(i, x, y, PT_THRM); - } - return 1; + sim->create_part(i, x, y, PT_THRM); //part_change_type(r>>8,x+rx,y+ry,PT_BMTL); //parts[r>>8].tmp=(parts[i].tmp<=7)?parts[i].tmp=1:parts[i].tmp-(rand()%5);//rand()/(RAND_MAX/300)+100; } @@ -82,4 +79,4 @@ int Element_BRMT::update(UPDATE_FUNC_ARGS) } -Element_BRMT::~Element_BRMT() {}
\ No newline at end of file +Element_BRMT::~Element_BRMT() {} |