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

1 files changed, 23 insertions, 16 deletions

diff --git a/src/unittest/test_player.cpp b/src/unittest/test_player.cpp
index 5de9eaaf2..fba422475 100644
--- a/src/unittest/test_player.cpp
+++ b/src/unittest/test_player.cpp
@@ -46,11 +46,14 @@ void TestPlayer::runTests(IGameDef *gamedef)
 void TestPlayer::testSave(IGameDef *gamedef)
 {
 	RemotePlayer rplayer("testplayer_save", gamedef->idef());
-	rplayer.setBreath(10);
-	rplayer.hp = 8;
-	rplayer.setYaw(0.1f);
-	rplayer.setPitch(0.6f);
-	rplayer.setPosition(v3f(450.2f, -15.7f, 68.1f));
+	PlayerSAO sao(NULL, 1, false);
+	sao.initialize(&rplayer, std::set<std::string>());
+	rplayer.setPlayerSAO(&sao);
+	sao.setBreath(10);
+	sao.setHP(8, true);
+	sao.setYaw(0.1f, false);
+	sao.setPitch(0.6f, false);
+	sao.setBasePosition(v3f(450.2f, -15.7f, 68.1f));
 	rplayer.save(".", gamedef);
 	UASSERT(fs::PathExists("testplayer_save"));
 }
@@ -58,24 +61,28 @@ void TestPlayer::testSave(IGameDef *gamedef)
 void TestPlayer::testLoad(IGameDef *gamedef)
 {
 	RemotePlayer rplayer("testplayer_load", gamedef->idef());
-	rplayer.setBreath(10);
-	rplayer.hp = 8;
-	rplayer.setYaw(0.1f);
-	rplayer.setPitch(0.6f);
-	rplayer.setPosition(v3f(450.2f, -15.7f, 68.1f));
+	PlayerSAO sao(NULL, 1, false);
+	sao.initialize(&rplayer, std::set<std::string>());
+	rplayer.setPlayerSAO(&sao);
+	sao.setBreath(10);
+	sao.setHP(8, true);
+	sao.setYaw(0.1f, false);
+	sao.setPitch(0.6f, false);
+	sao.setBasePosition(v3f(450.2f, -15.7f, 68.1f));
 	rplayer.save(".", gamedef);
 	UASSERT(fs::PathExists("testplayer_load"));
 
 	RemotePlayer rplayer_load("testplayer_load", gamedef->idef());
+	PlayerSAO sao_load(NULL, 2, false);
 	std::ifstream is("testplayer_load", std::ios_base::binary);
 	UASSERT(is.good());
-	rplayer_load.deSerialize(is, "testplayer_load");
+	rplayer_load.deSerialize(is, "testplayer_load", &sao_load);
 	is.close();
 
 	UASSERT(strcmp(rplayer_load.getName(), "testplayer_load") == 0);
-	UASSERT(rplayer.getBreath() == 10);
-	UASSERT(rplayer.hp == 8);
-	UASSERT(rplayer.getYaw() == 0.1f);
-	UASSERT(rplayer.getPitch() == 0.6f);
-	UASSERT(rplayer.getPosition() == v3f(450.2f, -15.7f, 68.1f));
+	UASSERT(sao_load.getBreath() == 10);
+	UASSERT(sao_load.getHP() == 8);
+	UASSERT(sao_load.getYaw() == 0.1f);
+	UASSERT(sao_load.getPitch() == 0.6f);
+	UASSERT(sao_load.getBasePosition() == v3f(450.2f, -15.7f, 68.1f));
 }