Merge pull request #717 from worktycho/warningfixes
fixed globals.h warnings
This commit is contained in:
commit
93f881fab4
@ -92,6 +92,7 @@ public:
|
||||
/// Converts absolute block coords into relative (chunk + block) coords:
|
||||
inline static void AbsoluteToRelative(/* in-out */ int & a_X, int & a_Y, int & a_Z, /* out */ int & a_ChunkX, int & a_ChunkZ )
|
||||
{
|
||||
UNUSED(a_Y);
|
||||
BlockToChunk(a_X, a_Z, a_ChunkX, a_ChunkZ);
|
||||
|
||||
a_X = a_X - a_ChunkX * Width;
|
||||
|
@ -82,7 +82,11 @@ protected:
|
||||
cLightingChunkStay(cLightingThread & a_LightingThread, int a_ChunkX, int a_ChunkZ, cChunkCoordCallback * a_CallbackAfter);
|
||||
|
||||
protected:
|
||||
virtual void OnChunkAvailable(int a_ChunkX, int a_ChunkZ) override {}
|
||||
virtual void OnChunkAvailable(int a_ChunkX, int a_ChunkZ) override
|
||||
{
|
||||
UNUSED(a_ChunkX);
|
||||
UNUSED(a_ChunkZ);
|
||||
}
|
||||
virtual bool OnAllChunksAvailable(void) override;
|
||||
virtual void OnDisabled(void) override;
|
||||
} ;
|
||||
|
@ -29,7 +29,11 @@ public:
|
||||
static void Delete(T) {};
|
||||
|
||||
/// Called when an Item is inserted with EnqueueItemIfNotPresent and there is another equal value already inserted
|
||||
static void Combine(T & a_existing, const T & a_new) {};
|
||||
static void Combine(T & a_existing, const T & a_new)
|
||||
{
|
||||
UNUSED(a_existing);
|
||||
UNUSED(a_new);
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user