From: LMH <lmh.0013@gmail.com>
Date: Thu, 4 Dec 2014 06:11:04 +0000 (-1000)
Subject: Miner's hardhat shakes with stone Tux during second prior to end of stone form
X-Git-Url: https://git.octo.it/?p=supertux.git;a=commitdiff_plain;h=8f89517bec07542520d0abbda1217c19f9abed07

Miner's hardhat shakes with stone Tux during second prior to end of stone form
---

diff --git a/src/object/player.cpp b/src/object/player.cpp
index ad9bdde83..66f3a2e4f 100644
--- a/src/object/player.cpp
+++ b/src/object/player.cpp
@@ -1276,11 +1276,11 @@ Player::draw(DrawingContext& context)
     Vector shake_delta = (stone && ability_timer.get_timeleft() < 1.0f) ? Vector(graphicsRandom.rand(-3,3), 0) : Vector(0,0);
     sprite->draw(context, get_pos() + shake_delta, LAYER_OBJECTS + 1);
     // draw hardhat
-    powersprite->draw(context, get_pos(), LAYER_OBJECTS + 1);
+    powersprite->draw(context, get_pos() + shake_delta, LAYER_OBJECTS + 1);
     // light
     context.push_target();
     context.set_target(DrawingContext::LIGHTMAP);
-    lightsprite->draw(context, get_pos()/* + Vector(dir==LEFT ? 0 : 32, 0)*/, 0);
+    lightsprite->draw(context, get_pos(), 0);
     context.pop_target();
     // give an indicator that stone form cannot be used for a while
     if (cooldown_timer.started() && graphicsRandom.rand(0, 4) == 0) {