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

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
mmbob 2013-04-30 21:54:09 -04:00
commit 7bc321b176
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/simulation/Simulation.cpp
View File

@ -602,9 +602,9 @@ int Simulation::FloodINST(int x, int y, int fullc, int cm)
{ {
if ((pmap[y-1][x]&0xFF)==cm && !parts[pmap[y-1][x]>>8].life) if ((pmap[y-1][x]&0xFF)==cm && !parts[pmap[y-1][x]>>8].life)
{ {
if (x==x1 || x==x2 || y>=YRES-CELL-1 || !PMAP_CMP_CONDUCTIVE(pmap[y+1][x], cm)) if (x==x1 || x==x2 || y>=YRES-CELL-1 || !PMAP_CMP_CONDUCTIVE(pmap[y+1][x], cm) || PMAP_CMP_CONDUCTIVE(pmap[y+1][x+1], cm) || PMAP_CMP_CONDUCTIVE(pmap[y+1][x-1], cm))
{ {
// if at the end of a horizontal section, or if it's a T junction // if at the end of a horizontal section, or if it's a T junction or not a 1px wire crossing
coord_stack[coord_stack_size][0] = x; coord_stack[coord_stack_size][0] = x;
coord_stack[coord_stack_size][1] = y-1; coord_stack[coord_stack_size][1] = y-1;
coord_stack_size++; coord_stack_size++;
@ -641,9 +641,9 @@ int Simulation::FloodINST(int x, int y, int fullc, int cm)
{ {
if ((pmap[y+1][x]&0xFF)==cm && !parts[pmap[y+1][x]>>8].life) if ((pmap[y+1][x]&0xFF)==cm && !parts[pmap[y+1][x]>>8].life)
{ {
if (x==x1 || x==x2 || y<0 || !PMAP_CMP_CONDUCTIVE(pmap[y-1][x], cm)) if (x==x1 || x==x2 || y<0 || !PMAP_CMP_CONDUCTIVE(pmap[y-1][x], cm) || PMAP_CMP_CONDUCTIVE(pmap[y-1][x+1], cm) || PMAP_CMP_CONDUCTIVE(pmap[y-1][x-1], cm))
{ {
// if at the end of a horizontal section, or if it's a T junction // if at the end of a horizontal section, or if it's a T junction or not a 1px wire crossing
coord_stack[coord_stack_size][0] = x; coord_stack[coord_stack_size][0] = x;
coord_stack[coord_stack_size][1] = y+1; coord_stack[coord_stack_size][1] = y+1;
coord_stack_size++; coord_stack_size++;

2
src/simulation/elements/GOLD.cpp
View File

@ -40,7 +40,7 @@ Element_GOLD::Element_GOLD()
HighPressureTransition = NT; HighPressureTransition = NT;
LowTemperature = ITL; LowTemperature = ITL;
LowTemperatureTransition = NT; LowTemperatureTransition = NT;
HighTemperature = 1941.0f; HighTemperature = 1337.0f;
HighTemperatureTransition = PT_LAVA; HighTemperatureTransition = PT_LAVA;
Update = &Element_GOLD::update; Update = &Element_GOLD::update;