oss/luanti
oss/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-07-27 17:28:41 +00:00
Code Wiki Activity

Fix usage of destroyed mutex

Browse source 
Also fix a memory leak
Fix overloaded virtual warning in Player::move()
Remove some trailing whitespace
This commit is contained in:
kwolekr 2015-03-31 23:33:30 -04:00
parent 699e066bea
commit b4247dff2e
2 changed files with 85 additions and 80 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/player.h
View file

@ -92,6 +92,9 @@ class PlayerSAO;
struct HudElement;
class Environment;
// IMPORTANT:
// Do *not* perform an assignment or copy operation on a Player or
// RemotePlayer object! This will copy the lock held for HUD synchronization
class Player
{
public:
@ -102,7 +105,7 @@ public:
virtual void move(f32 dtime, Environment *env, f32 pos_max_d)
{}
virtual void move(f32 dtime, Environment *env, f32 pos_max_d,
std::list<CollisionInfo> *collision_info)
std::vector<CollisionInfo> *collision_info)
{}
v3f getSpeed()
@ -114,7 +117,7 @@ public:
{
m_speed = speed;
}
void accelerateHorizontal(v3f target_speed, f32 max_increase);
void accelerateVertical(v3f target_speed, f32 max_increase);
@ -252,7 +255,7 @@ public:
bool is_climbing;
bool swimming_vertical;
bool camera_barely_in_ceiling;
Inventory inventory;
f32 movement_acceleration_default;
@ -285,15 +288,15 @@ public:
u16 peer_id;
std::string inventory_formspec;
PlayerControl control;
PlayerControl getPlayerControl()
{
return control;
}
u32 keyPressed;
HudElement* getHud(u32 id);
u32 addHud(HudElement* hud);
@ -346,7 +349,7 @@ public:
void setPlayerSAO(PlayerSAO *sao)
{ m_sao = sao; }
void setPosition(const v3f &position);
private:
PlayerSAO *m_sao;
};