X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fobject%2Fcoin.cpp;h=c75312fb9adfb02633fcde87821be07c16202a41;hb=5745d9670262c91e6cd35363fd0d2ec169e7c8a4;hp=7fbebc7eb330778a7f1eee9a6b18d960fbea1319;hpb=52de79ad8301a395a5a2999ecbdf31731c0b65f8;p=supertux.git

diff --git a/src/object/coin.cpp b/src/object/coin.cpp
index 7fbebc7eb..c75312fb9 100644
--- a/src/object/coin.cpp
+++ b/src/object/coin.cpp
@@ -29,46 +29,100 @@
 #include "gameobjs.hpp"
 #include "statistics.hpp"
 #include "object_factory.hpp"
+#include "level.hpp"
+#include "random_generator.hpp"
+#include "audio/sound_source.hpp"
+#include "audio/sound_manager.hpp"
+#include "timer.hpp"
 
 Coin::Coin(const Vector& pos)
+	: MovingSprite(pos, "images/objects/coin/coin.sprite", LAYER_TILES, COLGROUP_TOUCHABLE)
 {
-  bbox.set_pos(pos);
-  bbox.set_size(32, 32);
-  sprite = sprite_manager->create("images/objects/coin/coin.sprite");
-  set_group(COLGROUP_TOUCHABLE);
+  sound_manager->preload("sounds/coin.wav");
 }
 
 Coin::Coin(const lisp::Lisp& reader)
+	: MovingSprite(reader, "images/objects/coin/coin.sprite", LAYER_TILES, COLGROUP_TOUCHABLE)
 {
-  reader.get("x", bbox.p1.x);
-  reader.get("y", bbox.p1.y);
-  bbox.set_size(32, 32);
-  sprite = sprite_manager->create("images/objects/coin/coin.sprite");
-  set_group(COLGROUP_TOUCHABLE);
-}
-
-Coin::~Coin()
-{
-  delete sprite;
+  sound_manager->preload("sounds/coin.wav");
 }
 
 void
-Coin::update(float )
+Coin::collect()
 {
-}
+  // TODO: commented out musical code. Maybe fork this for a special "MusicalCoin" object?
+  /*
+  static Timer sound_timer;
+  static int pitch_one = 128;
+  static float last_pitch = 1;
+  float pitch = 1;
 
-void
-Coin::draw(DrawingContext& context)
-{
-  sprite->draw(context, get_pos(), LAYER_TILES);
-}
+  int tile = static_cast<int>(get_pos().y / 32);
 
-void
-Coin::collect()
-{
+  if (!sound_timer.started()) {
+    pitch_one = tile;
+    pitch = 1;
+    last_pitch = 1;
+  }
+  else if (sound_timer.get_timegone() < 0.02) {
+    pitch = last_pitch;
+  }
+  else
+  {
+    switch ((pitch_one - tile) % 7) {
+      case -6:
+	pitch = 1.0/2;
+	break;
+      case -5:
+	pitch = 5.0/8;
+	break;
+      case -4:
+	pitch = 4.0/6;
+	break;
+      case -3:
+	pitch = 3.0/4;
+	break;
+      case -2:
+	pitch = 5.0/6;
+	break;
+      case -1:
+	pitch = 9.0/10;
+	break;
+      case 0:
+	pitch = 1.0;
+	break;
+      case 1:
+	pitch = 9.0/8;
+	break;
+      case 2:
+	pitch = 5.0/4;
+	break;
+      case 3:
+	pitch = 4.0/3;
+	break;
+      case 4:
+	pitch = 3.0/2;
+	break;
+      case 5:
+	pitch = 5.0/3;
+	break;
+      case 6:
+	pitch = 9.0/5;
+	break;
+    }
+    last_pitch = pitch;
+  }
+  sound_timer.start(1);
+
+  SoundSource* soundSource = sound_manager->create_sound_source("sounds/coin.wav");
+  soundSource->set_position(get_pos());
+  soundSource->set_pitch(pitch);
+  soundSource->play();
+  sound_manager->manage_source(soundSource);
+*/
   Sector::current()->player->get_status()->add_coins(1);
   Sector::current()->add_object(new BouncyCoin(get_pos()));
-  Sector::current()->get_level()->stats.add_points(COINS_COLLECTED_STAT, 1);
+  Sector::current()->get_level()->stats.coins++;
   remove_me();
 }