diff options
| author | Ner'zhul <nerzhul@users.noreply.github.com> | 2016-10-30 14:53:26 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-30 14:53:26 +0100 |
| commit | 9d25242c5c1411d692254cf910345d51c9a24fa3 (patch) | |
| tree | edec8475b32562379d463757e77031bdc994e971 /src/collision.cpp | |
| parent | d43326021a9a7def27773ed1f7ec01992ed3abf6 (diff) | |
| download | minetest-9d25242c5c1411d692254cf910345d51c9a24fa3.tar.gz minetest-9d25242c5c1411d692254cf910345d51c9a24fa3.tar.bz2 minetest-9d25242c5c1411d692254cf910345d51c9a24fa3.zip | |
PlayerSAO/LocalPlayer refactor: (#4612)
* Create UnitSAO, a common part between PlayerSAO & LuaEntitySAO
* Move breath to PlayerSAO & LocalPlayer
* Migrate m_yaw from (Remote)Player & LuaEntitySAO to UnitSAO
* Migrate m_yaw from Player to LocalPlayer for client
* Move some functions outside of player class to PlayerSAO/RemotePlayer or LocalPlayer depending on which class needs it
* Move pitch to LocalPlayer & PlayerSAO
* Move m_position from Player to LocalPlayer
* Move camera_barely_in_ceiling to LocalPlayer as it's used only there
* use PlayerSAO::m_base_position for Server side positions
* remove a unused variable
* ServerActiveObject::setPos now uses const ref
* use ServerEnv::loadPlayer unconditionnaly as it creates RemotePlayer only if it's not already loaded
* Move hp from Player to LocalPlayer
* Move m_hp from LuaEntitySAO to UnitSAO
* Use m_hp from PlayerSAO/UnitSAO instead of RemotePlayer
Diffstat (limited to 'src/collision.cpp')
| -rw-r--r-- | src/collision.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/collision.cpp b/src/collision.cpp index 6d22c0798..8e5dbcc9b 100644 --- a/src/collision.cpp +++ b/src/collision.cpp @@ -367,7 +367,7 @@ collisionMoveResult collisionMoveSimple(Environment *env, IGameDef *gamedef, #endif { ServerEnvironment *s_env = dynamic_cast<ServerEnvironment*>(env); - if (s_env != 0) { + if (s_env != NULL) { f32 distance = speed_f->getLength(); std::vector<u16> s_objects; s_env->getObjectsInsideRadius(s_objects, *pos_f, distance * 1.5); |