mirror of
https://github.com/luanti-org/luanti.git
synced 2025-06-27 16:36:03 +00:00
Player/LocalPlayer/RemotePlayer inheritance cleanup (part 2 on X)
* Server/Client Environments now have an helper to cast Player object in the right type to use it * Server: use RemotePlayer everywhere and remove previous added casts * Client: use LocalPlayer where needed * Environment: remove unused functions (getPlayers(), getRandomConnectedPlayer(), getNearestConnectedPlayer())
This commit is contained in:
parent
9393e4a0a8
commit
656faf7373
12 changed files with 97 additions and 156 deletions
|
@ -44,7 +44,6 @@ Some planning
|
|||
|
||||
class ServerEnvironment;
|
||||
struct ItemStack;
|
||||
class Player;
|
||||
struct ToolCapabilities;
|
||||
struct ObjectProperties;
|
||||
|
||||
|
@ -69,23 +68,23 @@ public:
|
|||
// environment
|
||||
virtual bool environmentDeletes() const
|
||||
{ return true; }
|
||||
|
||||
|
||||
// Create a certain type of ServerActiveObject
|
||||
static ServerActiveObject* create(ActiveObjectType type,
|
||||
ServerEnvironment *env, u16 id, v3f pos,
|
||||
const std::string &data);
|
||||
|
||||
|
||||
/*
|
||||
Some simple getters/setters
|
||||
*/
|
||||
v3f getBasePosition(){ return m_base_position; }
|
||||
void setBasePosition(v3f pos){ m_base_position = pos; }
|
||||
ServerEnvironment* getEnv(){ return m_env; }
|
||||
|
||||
|
||||
/*
|
||||
Some more dynamic interface
|
||||
*/
|
||||
|
||||
|
||||
virtual void setPos(v3f pos)
|
||||
{ setBasePosition(pos); }
|
||||
// continuous: if true, object does not stop immediately at pos
|
||||
|
@ -96,7 +95,7 @@ public:
|
|||
virtual float getMinimumSavedMovement();
|
||||
|
||||
virtual std::string getDescription(){return "SAO";}
|
||||
|
||||
|
||||
/*
|
||||
Step object in time.
|
||||
Messages added to messages are sent to client over network.
|
||||
|
@ -108,13 +107,13 @@ public:
|
|||
packet.
|
||||
*/
|
||||
virtual void step(float dtime, bool send_recommended){}
|
||||
|
||||
|
||||
/*
|
||||
The return value of this is passed to the client-side object
|
||||
when it is created
|
||||
*/
|
||||
virtual std::string getClientInitializationData(u16 protocol_version){return "";}
|
||||
|
||||
|
||||
/*
|
||||
The return value of this is passed to the server-side object
|
||||
when it is created (converted from static to active - actually
|
||||
|
@ -131,7 +130,7 @@ public:
|
|||
*/
|
||||
virtual bool isStaticAllowed() const
|
||||
{return true;}
|
||||
|
||||
|
||||
// Returns tool wear
|
||||
virtual int punch(v3f dir,
|
||||
const ToolCapabilities *toolcap=NULL,
|
||||
|
@ -207,7 +206,7 @@ public:
|
|||
- This can be set to true by anything else too.
|
||||
*/
|
||||
bool m_removed;
|
||||
|
||||
|
||||
/*
|
||||
This is set to true when an object should be removed from the active
|
||||
object list but couldn't be removed because the id has to be
|
||||
|
@ -218,7 +217,7 @@ public:
|
|||
list.
|
||||
*/
|
||||
bool m_pending_deactivation;
|
||||
|
||||
|
||||
/*
|
||||
Whether the object's static data has been stored to a block
|
||||
*/
|
||||
|
@ -228,12 +227,12 @@ public:
|
|||
a copy of the static data resides.
|
||||
*/
|
||||
v3s16 m_static_block;
|
||||
|
||||
|
||||
/*
|
||||
Queue of messages to be sent to the client
|
||||
*/
|
||||
std::queue<ActiveObjectMessage> m_messages_out;
|
||||
|
||||
|
||||
protected:
|
||||
// Used for creating objects based on type
|
||||
typedef ServerActiveObject* (*Factory)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue