X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fphysic.cpp;h=e9fe94d97c8df58b06d023e6c589bb9f0915d049;hb=5b92cbefc559bc86308690dc277a8cc15bf2ddce;hp=39ad54e733ce46a2cdb28935bd6bd50dd0c38e26;hpb=60908c905544776c376421b8d3e12eeb936c068f;p=supertux.git diff --git a/src/physic.cpp b/src/physic.cpp index 39ad54e73..e9fe94d97 100644 --- a/src/physic.cpp +++ b/src/physic.cpp @@ -19,10 +19,10 @@ // 02111-1307, USA. #include -#include "physic.h" +#include "physic.hpp" Physic::Physic() - : ax(0), ay(0), vx(0), vy(0), gravity_enabled(true) + : ax(0), ay(0), vx(0), vy(0), gravity_enabled_flag(true) { } @@ -34,7 +34,7 @@ void Physic::reset() { ax = ay = vx = vy = 0; - gravity_enabled = true; + gravity_enabled_flag = true; } void @@ -112,13 +112,19 @@ Physic::get_acceleration_y() void Physic::enable_gravity(bool enable_gravity) { - gravity_enabled = enable_gravity; + gravity_enabled_flag = enable_gravity; +} + +bool +Physic::gravity_enabled() const +{ + return gravity_enabled_flag; } Vector Physic::get_movement(float elapsed_time) { - float grav = gravity_enabled ? 1000 : 0; + float grav = gravity_enabled_flag ? 1000 : 0; Vector result( vx * elapsed_time + ax * elapsed_time * elapsed_time,