diff options
| author | jacob1 <jfu614@gmail.com> | 2013-03-16 01:32:46 (GMT) |
|---|---|---|
| committer | jacob1 <jfu614@gmail.com> | 2013-03-16 01:32:46 (GMT) |
| commit | ff304321c54530040d82cb51b8c8742ed7611e54 (patch) | |
| tree | 87cb1f8e84e6de640aa39f422115e4902cf39db2 /src | |
| parent | 2267f3438689e195b38b0f05c8321c713ffd0932 (diff) | |
| download | powder-ff304321c54530040d82cb51b8c8742ed7611e54.zip powder-ff304321c54530040d82cb51b8c8742ed7611e54.tar.gz | |
new PSTN arms get deco color of the pushing pistons
Diffstat (limited to 'src')
| -rw-r--r-- | src/save/ServerSaveActivity.cpp | 1 | ||||
| -rw-r--r-- | src/simulation/elements/PSTN.cpp | 7 |
2 files changed, 7 insertions, 1 deletions
diff --git a/src/save/ServerSaveActivity.cpp b/src/save/ServerSaveActivity.cpp index f4ec27e..1be8c26 100644 --- a/src/save/ServerSaveActivity.cpp +++ b/src/save/ServerSaveActivity.cpp @@ -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; diff --git a/src/simulation/elements/PSTN.cpp b/src/simulation/elements/PSTN.cpp index 0f6e916..f1c9fd7 100644 --- a/src/simulation/elements/PSTN.cpp +++ b/src/simulation/elements/PSTN.cpp @@ -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; |