New object weak_block: a block that can be destroyed by bullet hits

[supertux.git] / src / physic.cpp

diff --git a/src/physic.cpp b/src/physic.cpp
index e9fe94d..753d3cb 100644 (file)
--- a/src/physic.cpp
+++ b/src/physic.cpp
@@ -1,7 +1,8 @@
 //  $Id$
-// 
+//
 //  SuperTux
 //  Copyright (C) 2004 Tobias Glaesser <tobi.web@gmx.de>
+//  Copyright (C) 2006 Matthias Braun <matze@braunis.de>
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
@@ -12,7 +13,7 @@
 //  but WITHOUT ANY WARRANTY; without even the implied warranty of
 //  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 //  GNU General Public License for more details.
-// 
+//
 //  You should have received a copy of the GNU General Public License
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
@@ -56,28 +57,41 @@ Physic::set_velocity(float nvx, float nvy)
   vy = -nvy;
 }
 
+void
+Physic::set_velocity(const Vector& vector)
+{
+  vx = vector.x;
+  vy = vector.y;
+}
+
 void Physic::inverse_velocity_x()
 {
-vx = -vx;
+  vx = -vx;
 }
 
 void Physic::inverse_velocity_y()
 {
-vy = -vy;
+  vy = -vy;
 }
 
 float
-Physic::get_velocity_x()
+Physic::get_velocity_x() const
 {
     return vx;
 }
 
 float
-Physic::get_velocity_y()
+Physic::get_velocity_y() const
 {
     return -vy;
 }
 
+Vector
+Physic::get_velocity() const
+{
+  return Vector(vx, -vy);
+}
+
 void
 Physic::set_acceleration_x(float nax)
 {
@@ -93,20 +107,26 @@ Physic::set_acceleration_y(float nay)
 void
 Physic::set_acceleration(float nax, float nay)
 {
-    ax = nax;
-    ay = -nay;
+  ax = nax;
+  ay = -nay;
 }
 
 float
-Physic::get_acceleration_x()
+Physic::get_acceleration_x() const
 {
-    return ax;
+  return ax;
 }
 
 float
-Physic::get_acceleration_y()
+Physic::get_acceleration_y() const
+{
+  return -ay;
+}
+
+Vector
+Physic::get_acceleration() const
 {
-    return -ay;
+  return Vector(ax, -ay);
 }
 
 void