projects
/
oweals
/
minetest.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove FPS from being next to the version string
[oweals/minetest.git]
/
src
/
localplayer.cpp
diff --git
a/src/localplayer.cpp
b/src/localplayer.cpp
index 15a208b8cb987aee8871dcdd2bf5120c41b3b621..1a238cb4787789c0f45d25cecf5abd015765517d 100644
(file)
--- a/
src/localplayer.cpp
+++ b/
src/localplayer.cpp
@@
-43,7
+43,6
@@
LocalPlayer::LocalPlayer(IGameDef *gamedef):
last_pitch(0),
last_yaw(0),
last_keyPressed(0),
last_pitch(0),
last_yaw(0),
last_keyPressed(0),
- camera_mode(0),
eye_offset_first(v3f(0,0,0)),
eye_offset_third(v3f(0,0,0)),
last_animation(NO_ANIM),
eye_offset_first(v3f(0,0,0)),
eye_offset_third(v3f(0,0,0)),
last_animation(NO_ANIM),
@@
-54,7
+53,8
@@
LocalPlayer::LocalPlayer(IGameDef *gamedef):
m_old_node_below(32767,32767,32767),
m_old_node_below_type("air"),
m_need_to_get_new_sneak_node(true),
m_old_node_below(32767,32767,32767),
m_old_node_below_type("air"),
m_need_to_get_new_sneak_node(true),
- m_can_jump(false)
+ m_can_jump(false),
+ m_cao(NULL)
{
// Initialize hp to 0, so that no hearts will be shown if server
// doesn't support health points
{
// Initialize hp to 0, so that no hearts will be shown if server
// doesn't support health points
@@
-65,7
+65,7
@@
LocalPlayer::~LocalPlayer()
{
}
{
}
-void LocalPlayer::move(f32 dtime,
Client
Environment *env, f32 pos_max_d,
+void LocalPlayer::move(f32 dtime, Environment *env, f32 pos_max_d,
std::list<CollisionInfo> *collision_info)
{
Map *map = &env->getMap();
std::list<CollisionInfo> *collision_info)
{
Map *map = &env->getMap();
@@
-268,8
+268,9
@@
void LocalPlayer::move(f32 dtime, ClientEnvironment *env, f32 pos_max_d,
if(nodemgr->get(map->getNode(p)).walkable == false)
continue;
// And the node above it has to be nonwalkable
if(nodemgr->get(map->getNode(p)).walkable == false)
continue;
// And the node above it has to be nonwalkable
- if(nodemgr->get(map->getNode(p+v3s16(0,1,0))).walkable == true)
+ if(nodemgr->get(map->getNode(p+v3s16(0,1,0))).walkable == true)
{
continue;
continue;
+ }
if (!physics_override_sneak_glitch) {
if (nodemgr->get(map->getNode(p+v3s16(0,2,0))).walkable)
continue;
if (!physics_override_sneak_glitch) {
if (nodemgr->get(map->getNode(p+v3s16(0,2,0))).walkable)
continue;
@@
-360,7
+361,7
@@
void LocalPlayer::move(f32 dtime, ClientEnvironment *env, f32 pos_max_d,
m_can_jump = false;
}
m_can_jump = false;
}
-void LocalPlayer::move(f32 dtime,
Client
Environment *env, f32 pos_max_d)
+void LocalPlayer::move(f32 dtime, Environment *env, f32 pos_max_d)
{
move(dtime, env, pos_max_d, NULL);
}
{
move(dtime, env, pos_max_d, NULL);
}
@@
-504,7
+505,7
@@
void LocalPlayer::applyControl(float dtime)
if(control.jump)
{
if(free_move)
if(control.jump)
{
if(free_move)
- {
+ {
if(g_settings->getBool("aux1_descends") || g_settings->getBool("always_fly_fast"))
{
if(fast_move)
if(g_settings->getBool("aux1_descends") || g_settings->getBool("always_fly_fast"))
{
if(fast_move)