From: Miloš Klouček <m.kloucek.m@atlas.cz>
Date: Sat, 9 May 2009 18:15:32 +0000 (+0000)
Subject: expressed my opinion on code layout..
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=8b651d9d18f93952a9f735d2eef74680dfb95de5;p=supertux.git

expressed my opinion on code layout..

SVN-Revision: 5890
---

diff --git a/src/object/player.cpp b/src/object/player.cpp
index f04cb9090..02cfc131c 100644
--- a/src/object/player.cpp
+++ b/src/object/player.cpp
@@ -415,8 +415,7 @@ Player::apply_friction()
     physic.set_velocity_x(0);
     physic.set_acceleration_x(0);
   } else {
-    float friction = on_ice ? (WALK_ACCELERATION_X * ICE_FRICTION_MULTIPLIER) :
-                    (WALK_ACCELERATION_X * NORMAL_FRICTION_MULTIPLIER);
+    float friction = WALK_ACCELERATION_X * (on_ice ? ICE_FRICTION_MULTIPLIER : NORMAL_FRICTION_MULTIPLIER);
     if(physic.get_velocity_x() < 0) {
       physic.set_acceleration_x(friction);
     } else /*if(physic.get_velocity_x() > 0)*/ {