From b499eed459260840b5940b11d150357d67095ccc Mon Sep 17 00:00:00 2001
From: Wolfgang Becker <uafr@gmx.de>
Date: Sun, 16 Jul 2006 00:30:09 +0000
Subject: [PATCH] Rock update

SVN-Revision: 4028
---
 data/images/objects/rock/rock.png    | Bin 0 -> 1871 bytes
 data/images/objects/rock/rock.sprite |   2 +-
 src/object/rock.cpp                  |  11 ++++++++---
 3 files changed, 9 insertions(+), 4 deletions(-)
 create mode 100644 data/images/objects/rock/rock.png

diff --git a/data/images/objects/rock/rock.png b/data/images/objects/rock/rock.png
new file mode 100644
index 0000000000000000000000000000000000000000..40f5432e3ada48dd34dfa64196fa0aa4b403296f
GIT binary patch
literal 1871
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
JPDHLkV1n$iW9I+>

literal 0
HcmV?d00001

diff --git a/data/images/objects/rock/rock.sprite b/data/images/objects/rock/rock.sprite
index 66683d641..082868456 100644
--- a/data/images/objects/rock/rock.sprite
+++ b/data/images/objects/rock/rock.sprite
@@ -1,5 +1,5 @@
 (supertux-sprite
       (action
         (name "normal")
-        (images "../../tiles/blocks/block11.png"))
+        (images "rock.png"))
 )
diff --git a/src/object/rock.cpp b/src/object/rock.cpp
index 467377ce5..1eb8f6d31 100644
--- a/src/object/rock.cpp
+++ b/src/object/rock.cpp
@@ -21,13 +21,17 @@
 
 #include "rock.hpp"
 #include "lisp/writer.hpp"
-#include "video/drawing_context.hpp"
-#include "resources.hpp"
 #include "object_factory.hpp"
+#include "audio/sound_manager.hpp"
+
+namespace {
+  const std::string ROCK_SOUND = "sounds/brick.wav"; //TODO use own sound.
+}
 
 Rock::Rock(const lisp::Lisp& reader)
 	: MovingSprite(reader, "images/objects/rock/rock.sprite")
 {
+  sound_manager->preload( ROCK_SOUND );
   on_ground = false;
   flags |= FLAG_SOLID | FLAG_PORTABLE;
 }
@@ -55,7 +59,8 @@ void
 Rock::collision_solid(const CollisionHit& hit)
 {
   physic.set_velocity(0, 0);
-  if( hit.bottom ){
+  if( hit.bottom  && !on_ground ){
+    sound_manager->play( ROCK_SOUND, get_pos() );
      on_ground = true;
   }
 }
-- 
2.11.0