luanti-org/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-10-18 10:45:27 +02:00
Code Activity

Switch player names to std::string

Browse Source
This commit is contained in:
Lars Mueller
2023-11-12 15:25:46 +01:00
committed by sfan5
parent 603eb57943
commit cc8e7a569e
18 changed files with 39 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/player.h
View File

@@ -28,6 +28,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include <mutex>
#include <functional>
#include <tuple>
#include <string>
#define PLAYERNAME_SIZE 20
@@ -158,7 +159,7 @@ class Player
{
public:
Player(const char *name, IItemDefManager *idef);
Player(const std::string &name, IItemDefManager *idef);
virtual ~Player() = 0;
DISABLE_CLASS_COPY(Player);
@@ -178,7 +179,7 @@ public:
// in BS-space
v3f getSpeed() const { return m_speed; }
const char *getName() const { return m_name; }
const std::string& getName() const { return m_name; }
u32 getFreeHudID()
{
@@ -251,7 +252,7 @@ public:
u16 getMaxHotbarItemcount();
protected:
char m_name[PLAYERNAME_SIZE];
std::string m_name;
v3f m_speed; // velocity; in BS-space
u16 m_wield_index = 0;
PlayerFovSpec m_fov_override_spec = { 0.0f, false, 0.0f };