From 96762af3ce39ebecb967e6cf1b9b8e709a105f6d Mon Sep 17 00:00:00 2001 From: ANAND Date: Fri, 16 Aug 2019 22:37:49 +0530 Subject: [PATCH] clientobject.h: Fix code-style --- src/client/clientobject.h | 33 ++++++++++++++++----------------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/src/client/clientobject.h b/src/client/clientobject.h index 05c235ace..c673fff9a 100644 --- a/src/client/clientobject.h +++ b/src/client/clientobject.h @@ -39,54 +39,53 @@ public: ClientActiveObject(u16 id, Client *client, ClientEnvironment *env); virtual ~ClientActiveObject(); - virtual void addToScene(ITextureSource *tsrc) {}; + virtual void addToScene(ITextureSource *tsrc) {} virtual void removeFromScene(bool permanent) {} // 0 <= light_at_pos <= LIGHT_SUN - virtual void updateLight(u8 light_at_pos){} - virtual void updateLightNoCheck(u8 light_at_pos){} - virtual v3s16 getLightPosition(){return v3s16(0,0,0);} + virtual void updateLight(u8 light_at_pos) {} + virtual void updateLightNoCheck(u8 light_at_pos) {} + virtual v3s16 getLightPosition() { return v3s16(0, 0, 0); } virtual bool getCollisionBox(aabb3f *toset) const { return false; } virtual bool getSelectionBox(aabb3f *toset) const { return false; } virtual bool collideWithObjects() const { return false; } virtual const v3f getPosition() const { return v3f(0.0f); } virtual scene::ISceneNode *getSceneNode() { return NULL; } virtual scene::IAnimatedMeshSceneNode *getAnimatedMeshSceneNode() { return NULL; } - virtual bool isLocalPlayer() const {return false;} + virtual bool isLocalPlayer() const { return false; } virtual ClientActiveObject *getParent() const { return nullptr; }; virtual const std::unordered_set &getAttachmentChildIds() const { static std::unordered_set rv; return rv; } virtual void updateAttachments() {}; - virtual bool doShowSelectionBox(){return true;} + virtual bool doShowSelectionBox() { return true; } // Step object in time - virtual void step(float dtime, ClientEnvironment *env){} + virtual void step(float dtime, ClientEnvironment *env) {} // Process a message sent by the server side object - virtual void processMessage(const std::string &data){} + virtual void processMessage(const std::string &data) {} - virtual std::string infoText() {return "";} - virtual std::string debugInfoText() {return "";} + virtual std::string infoText() { return ""; } + virtual std::string debugInfoText() { return ""; } /* This takes the return value of ServerActiveObject::getClientInitializationData */ - virtual void initialize(const std::string &data){} + virtual void initialize(const std::string &data) {} // Create a certain type of ClientActiveObject - static ClientActiveObject* create(ActiveObjectType type, Client *client, - ClientEnvironment *env); + static ClientActiveObject *create(ActiveObjectType type, Client *client, + ClientEnvironment *env); // If returns true, punch will not be sent to the server - virtual bool directReportPunch(v3f dir, const ItemStack *punchitem=NULL, - float time_from_last_punch=1000000) - { return false; } + virtual bool directReportPunch(v3f dir, const ItemStack *punchitem = nullptr, + float time_from_last_punch = 1000000) { return false; } protected: // Used for creating objects based on type - typedef ClientActiveObject* (*Factory)(Client *client, ClientEnvironment *env); + typedef ClientActiveObject *(*Factory)(Client *client, ClientEnvironment *env); static void registerType(u16 type, Factory f); Client *m_client; ClientEnvironment *m_env;