1
0
mirror of https://github.com/luanti-org/luanti.git synced 2025-11-01 15:55:26 +01:00

Players are more like objects + related stuff

This commit is contained in:
Perttu Ahola
2011-12-01 23:33:48 +02:00
parent ee0d3bacbc
commit af32240545
15 changed files with 622 additions and 599 deletions

View File

@@ -50,7 +50,7 @@ public:
std::string getClientInitializationData();
std::string getStaticData();
InventoryItem* createInventoryItem();
void punch(ServerActiveObject *puncher);
void punch(ServerActiveObject *puncher, float time_from_last_punch);
float getMinimumSavedMovement(){ return 0.1*BS; }
private:
std::string m_inventorystring;
@@ -70,7 +70,7 @@ public:
void step(float dtime, bool send_recommended);
std::string getClientInitializationData();
std::string getStaticData();
void punch(ServerActiveObject *puncher);
void punch(ServerActiveObject *puncher, float time_from_last_punch);
private:
bool m_is_active;
IntervalLimiter m_inactive_interval;
@@ -96,7 +96,7 @@ public:
std::string getClientInitializationData();
std::string getStaticData();
InventoryItem* createPickedUpItem(){return NULL;}
void punch(ServerActiveObject *puncher);
void punch(ServerActiveObject *puncher, float time_from_last_punch);
bool isPeaceful(){return false;}
private:
void doDamage(u16 d);
@@ -156,7 +156,7 @@ public:
std::string getClientInitializationData();
void step(float dtime, bool send_recommended);
InventoryItem* createPickedUpItem(){return NULL;}
void punch(ServerActiveObject *puncher);
void punch(ServerActiveObject *puncher, float time_from_last_punch);
bool isPeaceful();
private:
void sendPosition();
@@ -210,7 +210,7 @@ public:
std::string getClientInitializationData();
std::string getStaticData();
InventoryItem* createPickedUpItem();
void punch(ServerActiveObject *puncher);
void punch(ServerActiveObject *puncher, float time_from_last_punch);
void rightClick(ServerActiveObject *clicker);
void setPos(v3f pos);
void moveTo(v3f pos, bool continuous);
@@ -240,30 +240,5 @@ private:
float m_last_sent_move_precision;
};
class ServerRemotePlayer;
class PlayerSAO : public ServerActiveObject
{
public:
PlayerSAO(ServerEnvironment *env, v3f pos,
ServerRemotePlayer *player);
~PlayerSAO();
u8 getType() const
{return ACTIVEOBJECT_TYPE_PLAYER;}
void step(float dtime, bool send_recommended);
std::string getClientInitializationData();
std::string getStaticData();
bool isStaticAllowed() const
{ return false; }
void punch(ServerActiveObject *puncher);
/* PlayerSAO-specific */
void setPlayer(ServerRemotePlayer *player);
ServerRemotePlayer* getPlayer();
void positionUpdated();
private:
ServerRemotePlayer *m_player;
bool m_position_updated;
};
#endif