#include "localplayer.h"
-#include "main.h" // For g_settings
#include "event.h"
#include "collision.h"
#include "gamedef.h"
last_pitch(0),
last_yaw(0),
last_keyPressed(0),
- eye_offset_first(v3f(0,0,0)),
- eye_offset_third(v3f(0,0,0)),
last_animation(NO_ANIM),
hotbar_image(""),
hotbar_selected_image(""),
// Initialize hp to 0, so that no hearts will be shown if server
// doesn't support health points
hp = 0;
+ eye_offset_first = v3f(0,0,0);
+ eye_offset_third = v3f(0,0,0);
}
LocalPlayer::~LocalPlayer()
}
void LocalPlayer::move(f32 dtime, Environment *env, f32 pos_max_d,
- std::list<CollisionInfo> *collision_info)
+ std::vector<CollisionInfo> *collision_info)
{
Map *map = &env->getMap();
INodeDefManager *nodemgr = m_gamedef->ndef();
v3f position = getPosition();
- v3f old_speed = m_speed;
-
// Copy parent position if local player is attached
if(isAttached)
{
bool noclip = m_gamedef->checkLocalPrivilege("noclip") &&
g_settings->getBool("noclip");
bool free_move = noclip && fly_allowed && g_settings->getBool("free_move");
- if(free_move)
- {
- position += m_speed * dtime;
+ if (free_move) {
+ position += m_speed * dtime;
setPosition(position);
m_sneak_node_exists = false;
return;
/*
Collision detection
*/
-
+
bool is_valid_position;
MapNode node;
v3s16 pp;
f32 d = 0.15*BS;
// This should always apply, otherwise there are glitches
- assert(d > pos_max_d);
+ sanity_check(d > pos_max_d);
// Maximum distance over border for sneaking
f32 sneak_max = BS*0.4;
v3f lwn_f = intToFloat(m_sneak_node, BS);
position.X = rangelim(position.X, lwn_f.X-maxd, lwn_f.X+maxd);
position.Z = rangelim(position.Z, lwn_f.Z-maxd, lwn_f.Z+maxd);
-
+
if(!is_climbing)
{
f32 min_y = lwn_f.Y + 0.5*BS;
#ifdef __ANDROID__
player_stepheight += (0.5 * BS);
#endif
-
+
v3f accel_f = v3f(0,0,0);
collisionMoveResult result = collisionMoveSimple(env, m_gamedef,
*/
bool touching_ground_was = touching_ground;
touching_ground = result.touching_ground;
-
+
//bool standing_on_unloaded = result.standing_on_unloaded;
/*
f32 max_axis_distance_f = MYMAX(
fabs(player_p2df.X-node_p2df.X),
fabs(player_p2df.Y-node_p2df.Y));
-
+
if(distance_f > min_distance_f ||
max_axis_distance_f > 0.5*BS + sneak_max + 0.1*BS)
continue;
min_distance_f = distance_f;
new_sneak_node = p;
}
-
+
bool sneak_node_found = (min_distance_f < 100000.0*BS*0.9);
m_sneak_node = new_sneak_node;
if(sneak_node_found && control.sneak)
touching_ground = true;
}
-
+
/*
Set new position
*/
setPosition(position);
-
+
/*
Report collisions
*/
bool bouncy_jump = false;
// Dont report if flying
- if(collision_info && !(g_settings->getBool("free_move") && fly_allowed))
- {
- for(size_t i=0; i<result.collisions.size(); i++){
+ if(collision_info && !(g_settings->getBool("free_move") && fly_allowed)) {
+ for(size_t i=0; i<result.collisions.size(); i++) {
const CollisionInfo &info = result.collisions[i];
collision_info->push_back(info);
if(info.new_speed.Y - info.old_speed.Y > 0.1*BS &&
*/
m_old_node_below = floatToInt(position - v3f(0,BS/2,0), BS);
m_old_node_below_type = nodemgr->get(map->getNodeNoEx(m_old_node_below)).name;
-
+
/*
Check properties of the node on which the player is standing
*/
v3f move_direction = v3f(0,0,1);
move_direction.rotateXZBy(getYaw());
-
+
v3f speedH = v3f(0,0,0); // Horizontal (X, Z)
v3f speedV = v3f(0,0,0); // Vertical (Y)
-
+
bool fly_allowed = m_gamedef->checkLocalPrivilege("fly");
bool fast_allowed = m_gamedef->checkLocalPrivilege("fast");
// When aux1_descends is enabled the fast key is used to go down, so fast isn't possible
bool fast_climb = fast_move && control.aux1 && !g_settings->getBool("aux1_descends");
bool continuous_forward = g_settings->getBool("continuous_forward");
+ bool always_fly_fast = g_settings->getBool("always_fly_fast");
// Whether superspeed mode is used or not
bool superspeed = false;
-
- if(g_settings->getBool("always_fly_fast") && free_move && fast_move)
+
+ if (always_fly_fast && free_move && fast_move)
superspeed = true;
// Old descend control
// If free movement and fast movement, always move fast
if(free_move && fast_move)
superspeed = true;
-
+
// Auxiliary button 1 (E)
if(control.aux1)
{
if(free_move)
{
// In free movement mode, sneak descends
- if(fast_move && (control.aux1 || g_settings->getBool("always_fly_fast")))
+ if (fast_move && (control.aux1 || always_fly_fast))
speedV.Y = -movement_speed_fast;
else
speedV.Y = -movement_speed_walk;
}
if(control.jump)
{
- if(free_move)
- {
- if(g_settings->getBool("aux1_descends") || g_settings->getBool("always_fly_fast"))
- {
- if(fast_move)
+ if (free_move) {
+ if (g_settings->getBool("aux1_descends") || always_fly_fast) {
+ if (fast_move)
speedV.Y = movement_speed_fast;
else
speedV.Y = movement_speed_walk;
{
speedJ.Y = movement_speed_jump * physics_override_jump;
setSpeed(speedJ);
-
+
MtEvent *e = new SimpleTriggerEvent("PlayerJump");
m_gamedef->event()->put(e);
}
projects / minetest.git / blobdiff