From: Christoph Sommer <mail@christoph-sommer.de>
Date: Sat, 25 Mar 2006 17:46:04 +0000 (+0000)
Subject: Phone rings again. /
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=0ab7225b67a00a83da252434a84c1acdf5fde602;p=supertux.git

Phone rings again. /
Fixed some unused parameters.

SVN-Revision: 3119
---

diff --git a/src/object/camera.cpp b/src/object/camera.cpp
index 8f7b6c5f7..8a4a9c01a 100644
--- a/src/object/camera.cpp
+++ b/src/object/camera.cpp
@@ -141,7 +141,7 @@ Camera::update(float elapsed_time)
       update_scroll_normal(elapsed_time);
       break;
     case AUTOSCROLL:
-      update_scroll_autoscroll(elapsed_time);
+      update_scroll_autoscroll();
       break;
     case SCROLLTO:
       update_scroll_to(elapsed_time);
@@ -269,7 +269,7 @@ Camera::update_scroll_normal(float elapsed_time)
 }
 
 void
-Camera::update_scroll_autoscroll(float elapsed_time)
+Camera::update_scroll_autoscroll()
 {
   Player* player = sector->player;
   
diff --git a/src/object/camera.hpp b/src/object/camera.hpp
index 72157cdbe..b310822a7 100644
--- a/src/object/camera.hpp
+++ b/src/object/camera.hpp
@@ -81,7 +81,7 @@ public:
 
 private:
   void update_scroll_normal(float elapsed_time);
-  void update_scroll_autoscroll(float elapsed_time);
+  void update_scroll_autoscroll();
   void update_scroll_to(float elapsed_time);
   void keep_in_bounds(Vector& vector);
   void shake();
diff --git a/src/object/infoblock.cpp b/src/object/infoblock.cpp
index 93566c7e9..df6d7eef3 100644
--- a/src/object/infoblock.cpp
+++ b/src/object/infoblock.cpp
@@ -41,7 +41,7 @@ InfoBlock::InfoBlock(const lisp::Lisp& lisp)
     msg_warning("No message in InfoBlock");
   }
   stopped = false;
-  ringing = new AmbientSound(get_pos(), 0.5, 300, 1, "phone");
+  ringing = new AmbientSound(get_pos(), 0.5, 300, 1, "sounds/phone.wav");
   Sector::current()->add_object(ringing);  
 }