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

Piston fix: Adjust colour and prevent piston from pushing too far when there's empty space

Browse Source
This commit is contained in:
Simon Robertshaw 2013-01-26 18:04:24 +00:00
parent 12e3802bf4
commit 631e49b8b7
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/simulation/elements/FRME.cpp
View File

@ -4,9 +4,9 @@ Element_FRME::Element_FRME()
{ {
Identifier = "DEFAULT_PT_FRME"; Identifier = "DEFAULT_PT_FRME";
Name = "FRME"; Name = "FRME";
Colour = PIXPACK(0xBBDD50); Colour = PIXPACK(0x999988);
MenuVisible = 1; MenuVisible = 1;
MenuSection = SC_ELEC; MenuSection = SC_SOLIDS;
Enabled = 1; Enabled = 1;
Advection = 0.0f; Advection = 0.0f;
@ -22,7 +22,7 @@ Element_FRME::Element_FRME()
Flammable = 0; Flammable = 0;
Explosive = 0; Explosive = 0;
Meltable = 0; Meltable = 0;
Hardness = 1; Hardness = 0;
Weight = 100; Weight = 100;

8
src/simulation/elements/PSTN.cpp
View File

@ -4,9 +4,9 @@ Element_PSTN::Element_PSTN()
{ {
Identifier = "DEFAULT_PT_PSTN"; Identifier = "DEFAULT_PT_PSTN";
Name = "PSTN"; Name = "PSTN";
Colour = PIXPACK(0xBBFF00); Colour = PIXPACK(0xAA9999);
MenuVisible = 1; MenuVisible = 1;
MenuSection = SC_ELEC; MenuSection = SC_FORCE;
Enabled = 1; Enabled = 1;
Advection = 0.0f; Advection = 0.0f;
@ -22,7 +22,7 @@ Element_PSTN::Element_PSTN()
Flammable = 0; Flammable = 0;
Explosive = 0; Explosive = 0;
Meltable = 0; Meltable = 0;
Hardness = 1; Hardness = 0;
Weight = 100; Weight = 100;
@ -229,6 +229,8 @@ int Element_PSTN::MoveStack(Simulation * sim, int stackX, int stackY, int direct
if(!r) { if(!r) {
spaces++; spaces++;
tempParts[currentPos++] = 0; tempParts[currentPos++] = 0;
if(spaces >= amount)
break;
} else { } else {
foundParts = true; foundParts = true;
if(currentPos < size) if(currentPos < size)