From 804805d35a87c2acc9425d1762ad26b1ba2ec9ac Mon Sep 17 00:00:00 2001 From: Samuel Barney Date: Wed, 29 Jul 2015 09:04:03 -0600 Subject: Silenced and fixed many warning messages across multiple files. --- src/LightingThread.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/LightingThread.h') diff --git a/src/LightingThread.h b/src/LightingThread.h index da6be12c8..b18ac7799 100644 --- a/src/LightingThread.h +++ b/src/LightingThread.h @@ -132,7 +132,7 @@ protected: unsigned int m_SeedIdx1[BlocksPerYLayer * cChunkDef::Height]; unsigned char m_IsSeed2 [BlocksPerYLayer * cChunkDef::Height]; unsigned int m_SeedIdx2[BlocksPerYLayer * cChunkDef::Height]; - int m_NumSeeds; + size_t m_NumSeeds; virtual void Execute(void) override; @@ -158,8 +158,8 @@ protected: /** Does one step in the light calculation - one seed propagation and seed recalculation */ void CalcLightStep( NIBBLETYPE * a_Light, - int a_NumSeedsIn, unsigned char * a_IsSeedIn, unsigned int * a_SeedIdxIn, - int & a_NumSeedsOut, unsigned char * a_IsSeedOut, unsigned int * a_SeedIdxOut + size_t a_NumSeedsIn, unsigned char * a_IsSeedIn, unsigned int * a_SeedIdxIn, + size_t & a_NumSeedsOut, unsigned char * a_IsSeedOut, unsigned int * a_SeedIdxOut ); /** Compresses from 1-block-per-byte (faster calc) into 2-blocks-per-byte (MC storage): */ @@ -168,7 +168,7 @@ protected: inline void PropagateLight( NIBBLETYPE * a_Light, unsigned int a_SrcIdx, unsigned int a_DstIdx, - int & a_NumSeedsOut, unsigned char * a_IsSeedOut, unsigned int * a_SeedIdxOut + size_t & a_NumSeedsOut, unsigned char * a_IsSeedOut, unsigned int * a_SeedIdxOut ) { ASSERT(a_SrcIdx < ARRAYCOUNT(m_SkyLight)); -- cgit v1.2.3