aboutsummaryrefslogtreecommitdiff
path: root/src/player.h
diff options
context:
space:
mode:
authorPerttu Ahola <celeron55@gmail.com>2012-03-29 21:21:34 +0300
committerPerttu Ahola <celeron55@gmail.com>2012-03-29 21:21:34 +0300
commit42bbd5c9ae06a8d8ffb7915599097ead6f848755 (patch)
tree26cb28be201826f6a624abeb1c26375af4f75c58 /src/player.h
parent92ae11bd3b5e95ff837f98463931e7772c455ad3 (diff)
downloadminetest-42bbd5c9ae06a8d8ffb7915599097ead6f848755.tar.gz
minetest-42bbd5c9ae06a8d8ffb7915599097ead6f848755.tar.bz2
minetest-42bbd5c9ae06a8d8ffb7915599097ead6f848755.zip
Simple fix for camera blinking black when jumping into ceiling with current smaller collision box
Diffstat (limited to 'src/player.h')
-rw-r--r--src/player.h8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/player.h b/src/player.h
index b6856b1d0..9bbdda15a 100644
--- a/src/player.h
+++ b/src/player.h
@@ -66,9 +66,12 @@ public:
v3f getEyeOffset()
{
// This is at the height of the eyes of the current figure
- // return v3f(0, BS+BS/2, 0);
+ // return v3f(0, BS*1.5, 0);
// This is more like in minecraft
- return v3f(0,BS+(5*BS)/8,0);
+ if(camera_barely_in_ceiling)
+ return v3f(0,BS*1.5,0);
+ else
+ return v3f(0,BS*1.625,0);
}
v3f getEyePosition()
@@ -143,6 +146,7 @@ public:
bool in_water_stable;
bool is_climbing;
bool swimming_up;
+ bool camera_barely_in_ceiling;
u8 light;