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

new PSTN arms get deco color of the pushing pistons

Browse Source
This commit is contained in:
jacob1 2013-03-15 21:32:46 -04:00
parent 2267f34386
commit ff304321c5
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/save/ServerSaveActivity.cpp
View File

@ -142,7 +142,6 @@ ServerSaveActivity::ServerSaveActivity(SaveInfo save, ServerSaveActivity::SaveUp
AddComponent(okayButton);
SetOkayButton(okayButton);
//Position.X+(Size.X/2)+((Size.X/2)-thumbnail->Width)/2, Position.Y+25, thumbnail->Width, thumbnail->Height
ui::Button * RulesButton = new ui::Button(ui::Point((Size.X*3/4)-75, Size.Y-20), ui::Point(150, 16), "Save Uploading Rules");
RulesButton->Appearance.HorizontalAlign = ui::Appearance::AlignCentre;
RulesButton->Appearance.VerticalAlign = ui::Appearance::AlignMiddle;

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

@ -136,6 +136,13 @@ int Element_PSTN::update(UPDATE_FUNC_ARGS)
int nr = sim->create_part(-3, pistonEndX+(nxi*j), pistonEndY+(nyi*j), PT_PSTN);
if (nr > -1) {
parts[nr].life = 1;
if (parts[i].dcolour)
{
int red = PIXR(parts[i].dcolour)&0xFF;
int green = PIXG(parts[i].dcolour);
int blue = PIXB(parts[i].dcolour);
parts[nr].dcolour = 255<<24|PIXRGB(red>60?red-60:0, green>60?green-60:0, blue>60?blue-60:0);
}
}
}
movedPiston = true;