oss/luanti
oss/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-06-27 16:36:03 +00:00
Code Wiki Activity

Player/LocalPlayer/RemotePlayer inheritance cleanup (part 2 on X)

Browse source 
* 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:
Loic Blot 2016-10-08 12:21:41 +02:00 • committed by Ner'zhul
parent 9393e4a0a8
commit 656faf7373
12 changed files with 97 additions and 156 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/environment.h
View file

@ -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;