diff options
author | Loic Blot <loic.blot@unix-experience.fr> | 2016-10-08 10:38:04 +0200 |
---|---|---|
committer | Ner'zhul <nerzhul@users.noreply.github.com> | 2016-10-08 11:36:28 +0200 |
commit | 8bcd10b872bc88c6f474913d6efb8d53c50c5ae1 (patch) | |
tree | 39a8af0048ed642eddc43c74ab9f736558663e9d /src/script/lua_api/l_object.h | |
parent | 0264e38bff12a3c6b81231ac1f6cd281179df744 (diff) | |
download | minetest-8bcd10b872bc88c6f474913d6efb8d53c50c5ae1.tar.gz minetest-8bcd10b872bc88c6f474913d6efb8d53c50c5ae1.tar.bz2 minetest-8bcd10b872bc88c6f474913d6efb8d53c50c5ae1.zip |
Player/LocalPlayer/RemotePlayer inheritance cleanup (part 1 on X)
* LocalPlayer take ownership of maxHudId as it's the only caller
* RemotePlayer take ownership of day night ratio as it's the only user
* Pass getPlayerControl as const reference to prevent object copy on each call (perf improvement in ObjectRef::l_get_player_control call)
* getPlayerSAO is now only RemotePlayer call
* get/setHotbarItemCount is now RemotePlayer owned
* Server: Use RemotePlayer instead of Player object on concerned call to properly fix the object type
* PlayerSAO now uses RemotePlayer instead of Player because it's only server side
* ObjectRef::getplayer also returns RemotePlayer as it's linked with PlayerSAO
Diffstat (limited to 'src/script/lua_api/l_object.h')
-rw-r--r-- | src/script/lua_api/l_object.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/script/lua_api/l_object.h b/src/script/lua_api/l_object.h index a37d29535..a7ac9dff9 100644 --- a/src/script/lua_api/l_object.h +++ b/src/script/lua_api/l_object.h @@ -27,6 +27,7 @@ class ServerActiveObject; class LuaEntitySAO; class PlayerSAO; class Player; +class RemotePlayer; /* ObjectRef @@ -47,7 +48,7 @@ private: static PlayerSAO* getplayersao(ObjectRef *ref); - static Player* getplayer(ObjectRef *ref); + static RemotePlayer* getplayer(ObjectRef *ref); // Exported functions |