diff options
| author | Simon Robertshaw <simon@hardwired.org.uk> | 2013-03-16 11:20:23 (GMT) |
|---|---|---|
| committer | Simon Robertshaw <simon@hardwired.org.uk> | 2013-03-16 11:20:23 (GMT) |
| commit | b6e1526345b2e2e189b999ddc3fabdb151f395fb (patch) | |
| tree | 65dd16210aea9bfdef8b099e1a8515e5bc6ff71a /src/simulation/elements | |
| parent | 0646b7fe41bf8dc94b4f2eb1e3e1c0e85ac1f254 (diff) | |
| parent | ff304321c54530040d82cb51b8c8742ed7611e54 (diff) | |
| download | powder-b6e1526345b2e2e189b999ddc3fabdb151f395fb.zip powder-b6e1526345b2e2e189b999ddc3fabdb151f395fb.tar.gz | |
Merge branch 'master' of github.com:FacialTurd/The-Powder-Toy
Diffstat (limited to 'src/simulation/elements')
| -rw-r--r-- | src/simulation/elements/PSTN.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
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; |