Skip to content
Permalink
Browse files

Fix warnings reported by clang

  • Loading branch information...
sfan5 committed Jul 6, 2014
1 parent 5f9962e commit 37b7f094e3ea502339794f64e8bad22444c6fb54
Showing with 8 additions and 16 deletions.
  1. +6 −7 src/clientobject.h
  2. +0 −1 src/content_cao.h
  3. +1 −1 src/jthread/jsemaphore.h
  4. +0 −2 src/main.cpp
  5. +1 −5 src/shader.cpp
@@ -61,27 +61,27 @@ class ClientActiveObject : public ActiveObject
virtual scene::IMeshSceneNode *getMeshSceneNode(){return NULL;}
virtual scene::IAnimatedMeshSceneNode *getAnimatedMeshSceneNode(){return NULL;}
virtual scene::IBillboardSceneNode *getSpriteSceneNode(){return NULL;}
virtual bool isPlayer(){return false;}
virtual bool isLocalPlayer(){return false;}
virtual bool isPlayer() const {return false;}
virtual bool isLocalPlayer() const {return false;}
virtual void setAttachments(){}
virtual bool doShowSelectionBox(){return true;}
virtual void updateCameraOffset(v3s16 camera_offset){};

// Step object in time
virtual void step(float dtime, ClientEnvironment *env){}

// Process a message sent by the server side object
virtual void processMessage(const std::string &data){}

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){}

// Create a certain type of ClientActiveObject
static ClientActiveObject* create(u8 type, IGameDef *gamedef,
ClientEnvironment *env);
@@ -120,4 +120,3 @@ struct DistanceSortedActiveObject
};

#endif

@@ -197,4 +197,3 @@ class GenericCAO : public ClientActiveObject


#endif

@@ -54,10 +54,10 @@ class JSemaphore {
HANDLE m_hSemaphore;
#elif __MACH__
semaphore_t m_semaphore;
int semcount;
#else
sem_t m_semaphore;
#endif
int semcount;
};


@@ -381,8 +381,6 @@ class MyEventReceiver : public IEventReceiver
#endif

private:
IrrlichtDevice *m_device;

// The current state of keys
KeyList keyIsDown;
// Whether a key has been pressed or not
@@ -211,8 +211,7 @@ class ShaderCallback : public video::IShaderConstantSetCallBack
class MainShaderConstantSetter : public IShaderConstantSetter
{
public:
MainShaderConstantSetter(IrrlichtDevice *device):
m_device(device)
MainShaderConstantSetter(IrrlichtDevice *device)
{}
~MainShaderConstantSetter() {}

@@ -256,9 +255,6 @@ class MainShaderConstantSetter : public IShaderConstantSetter
services->setVertexShaderConstant(world.pointer(), 8, 4);

}

private:
IrrlichtDevice *m_device;
};

/*

0 comments on commit 37b7f09

Please sign in to comment.
You can’t perform that action at this time.