From ff304321c54530040d82cb51b8c8742ed7611e54 Mon Sep 17 00:00:00 2001
From: jacob1 <jfu614@gmail.com>
Date: Fri, 15 Mar 2013 21:32:46 -0400
Subject: new PSTN arms get deco color of the pushing pistons


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;
--
cgit v0.9.2-21-gd62e