mirror of
https://github.com/luanti-org/luanti.git
synced 2025-10-12 16:15:20 +02: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:
@@ -74,12 +74,6 @@ public:
|
||||
|
||||
virtual void addPlayer(Player *player);
|
||||
void removePlayer(Player *player);
|
||||
Player * getPlayer(u16 peer_id);
|
||||
Player * getPlayer(const char *name);
|
||||
Player * getRandomConnectedPlayer();
|
||||
Player * getNearestConnectedPlayer(v3f pos);
|
||||
std::vector<Player*> getPlayers();
|
||||
std::vector<Player*> getPlayers(bool ignore_disconnected);
|
||||
|
||||
u32 getDayNightRatio();
|
||||
|
||||
@@ -91,7 +85,6 @@ public:
|
||||
void stepTimeOfDay(float dtime);
|
||||
|
||||
void setTimeOfDaySpeed(float speed);
|
||||
float getTimeOfDaySpeed();
|
||||
|
||||
void setDayNightRatioOverride(bool enable, u32 value);
|
||||
|
||||
@@ -101,6 +94,9 @@ public:
|
||||
u32 m_added_objects;
|
||||
|
||||
protected:
|
||||
Player * getPlayer(u16 peer_id);
|
||||
Player * getPlayer(const char *name);
|
||||
|
||||
// peer_ids in here should be unique, except that there may be many 0s
|
||||
std::vector<Player*> m_players;
|
||||
|
||||
@@ -440,6 +436,8 @@ public:
|
||||
void setStaticForActiveObjectsInBlock(v3s16 blockpos,
|
||||
bool static_exists, v3s16 static_block=v3s16(0,0,0));
|
||||
|
||||
RemotePlayer *getPlayer(const u16 peer_id);
|
||||
RemotePlayer *getPlayer(const char* name);
|
||||
private:
|
||||
|
||||
/*
|
||||
@@ -640,8 +638,10 @@ public:
|
||||
{ m_player_names.remove(name); }
|
||||
void updateCameraOffset(v3s16 camera_offset)
|
||||
{ m_camera_offset = camera_offset; }
|
||||
v3s16 getCameraOffset()
|
||||
{ return m_camera_offset; }
|
||||
v3s16 getCameraOffset() const { return m_camera_offset; }
|
||||
|
||||
LocalPlayer *getPlayer(const u16 peer_id);
|
||||
LocalPlayer *getPlayer(const char* name);
|
||||
|
||||
private:
|
||||
ClientMap *m_map;
|
||||
|
Reference in New Issue
Block a user