oss/luanti
oss/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-06-27 16:36:03 +00:00
Code Wiki Activity

Pass clang-format on various cpp/header files (#5559)

Browse source
This commit is contained in:
Loïc Blot 2017-04-23 09:52:40 +02:00 • committed by GitHub
parent 0c34fe20a1
commit 91a9382c25
30 changed files with 138 additions and 183 deletions
Download patch file Download diff file Expand all files Collapse all files

36
src/localplayer.h
View file

@ -30,7 +30,13 @@ class GenericCAO;
class ClientActiveObject;
class IGameDef;
enum LocalPlayerAnimations {NO_ANIM, WALK_ANIM, DIG_ANIM, WD_ANIM}; // no local animation, walking, digging, both
enum LocalPlayerAnimations
{
NO_ANIM,
WALK_ANIM,
DIG_ANIM,
WD_ANIM
}; // no local animation, walking, digging, both
class LocalPlayer : public Player
{
@ -97,12 +103,11 @@ public:
float hurt_tilt_timer;
float hurt_tilt_strength;
GenericCAO* getCAO() const {
return m_cao;
}
GenericCAO *getCAO() const { return m_cao; }
void setCAO(GenericCAO* toset) {
assert( m_cao == NULL ); // Pre-condition
void setCAO(GenericCAO *toset)
{
assert(m_cao == NULL); // Pre-condition
m_cao = toset;
}
@ -113,28 +118,20 @@ public:
v3s16 getLightPosition() const;
void setYaw(f32 yaw)
{
m_yaw = yaw;
}
void setYaw(f32 yaw) { m_yaw = yaw; }
f32 getYaw() const { return m_yaw; }
void setPitch(f32 pitch)
{
m_pitch = pitch;
}
void setPitch(f32 pitch) { m_pitch = pitch; }
f32 getPitch() const { return m_pitch; }
void setPosition(const v3f &position)
{
m_position = position;
}
void setPosition(const v3f &position) { m_position = position; }
v3f getPosition() const { return m_position; }
v3f getEyePosition() const { return m_position + getEyeOffset(); }
v3f getEyeOffset() const;
private:
void accelerateHorizontal(const v3f &target_speed, const f32 max_increase);
void accelerateVertical(const v3f &target_speed, const f32 max_increase);
@ -169,9 +166,8 @@ private:
bool camera_barely_in_ceiling;
aabb3f m_collisionbox;
GenericCAO* m_cao;
GenericCAO *m_cao;
Client *m_client;
};
#endif