Skip to content

Commit

Permalink
Fix Camera::add_arm_inertia -> addArmInertia
Browse files Browse the repository at this point in the history
  • Loading branch information
nerzhul committed Jun 26, 2017
1 parent 1d1d922 commit a8650e7
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions src/camera.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ void Camera::step(f32 dtime)
}
}

void Camera::add_arm_inertia(f32 player_yaw, f32 frametime)
void Camera::addArmInertia(f32 player_yaw, f32 frametime)
{
m_cam_vel.X = std::fabs((m_last_cam_pos.X - player_yaw) / m_timer.X) * 0.01f;
m_cam_vel.Y = std::fabs((m_last_cam_pos.Y - m_camera_direction.Y) / m_timer.Y);
Expand Down Expand Up @@ -458,7 +458,7 @@ void Camera::update(LocalPlayer* player, f32 frametime, f32 busytime,
m_cameranode->setFOV(m_fov_y);

if (m_arm_inertia)
add_arm_inertia(player->getYaw(), frametime);
addArmInertia(player->getYaw(), frametime);

// Position the wielded item
//v3f wield_position = v3f(45, -35, 65);
Expand Down
2 changes: 1 addition & 1 deletion src/camera.h
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ class Camera

void drawNametags();

inline void add_arm_inertia(f32 player_yaw, f32 frametime);
inline void addArmInertia(f32 player_yaw, f32 frametime);

private:
// Nodes
Expand Down

0 comments on commit a8650e7

Please sign in to comment.