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
Showing
- src/clientiface.cpp 9 additions, 5 deletionssrc/clientiface.cpp
- src/collision.cpp 1 addition, 1 deletionsrc/collision.cpp
- src/content_sao.cpp 80 additions, 75 deletionssrc/content_sao.cpp
- src/content_sao.h 45 additions, 17 deletionssrc/content_sao.h
- src/environment.cpp 20 additions, 15 deletionssrc/environment.cpp
- src/environment.h 4 additions, 3 deletionssrc/environment.h
- src/localplayer.cpp 7 additions, 0 deletionssrc/localplayer.cpp
- src/localplayer.h 41 additions, 0 deletionssrc/localplayer.h
- src/network/clientpackethandler.cpp 0 additions, 1 deletionsrc/network/clientpackethandler.cpp
- src/network/serverpackethandler.cpp 29 additions, 26 deletionssrc/network/serverpackethandler.cpp
- src/player.cpp 1 addition, 13 deletionssrc/player.cpp
- src/player.h 0 additions, 50 deletionssrc/player.h
- src/remoteplayer.cpp 34 additions, 32 deletionssrc/remoteplayer.cpp
- src/remoteplayer.h 3 additions, 32 deletionssrc/remoteplayer.h
- src/script/lua_api/l_object.cpp 16 additions, 16 deletionssrc/script/lua_api/l_object.cpp
- src/server.cpp 39 additions, 32 deletionssrc/server.cpp
- src/serverobject.h 1 addition, 1 deletionsrc/serverobject.h
- src/unittest/test_player.cpp 23 additions, 16 deletionssrc/unittest/test_player.cpp
Loading
Please register or sign in to comment