Commit 00fea477 authored by Gerhard Stein's avatar Gerhard Stein

Merge branch 'master' into testing

parents b71964ae 91bce183
......@@ -137,6 +137,11 @@ void CPlatformHorizontal::draw()
fireSprite.drawSprite(showX+Sprite.getWidth()-6, showY+8, w, h);
}
}
else
{
Sprite.drawSprite( showX, showY, sprW, sprH, (255-transluceny) );
}
for( auto &player : mCarriedPlayerVec)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment