flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Piston is now warnings clean

Browse Source
This commit is contained in:
Tycho Bickerstaff 2013-12-21 15:08:01 +00:00
parent 38f808ac3d
commit 5034ae29b8
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Blocks/BlockHandler.h
View File

@ -99,7 +99,7 @@ public:
virtual bool DoesIgnoreBuildCollision(void); virtual bool DoesIgnoreBuildCollision(void);
/// <summary>Similar to DoesIgnoreBuildCollision(void), but is used for cases where block meta/player item-in-hand is needed to determine collision (thin snow)</summary> /// <summary>Similar to DoesIgnoreBuildCollision(void), but is used for cases where block meta/player item-in-hand is needed to determine collision (thin snow)</summary>
virtual bool DoesIgnoreBuildCollision(cPlayer * a_Player, NIBBLETYPE a_Meta) { return DoesIgnoreBuildCollision(); } virtual bool DoesIgnoreBuildCollision(cPlayer *, NIBBLETYPE /*a_Meta*/) { return DoesIgnoreBuildCollision(); }
/// <summary>Returns if this block drops if it gets destroyed by an unsuitable situation. Default: true</summary> /// <summary>Returns if this block drops if it gets destroyed by an unsuitable situation. Default: true</summary>
virtual bool DoesDropOnUnsuitable(void); virtual bool DoesDropOnUnsuitable(void);

2
src/Piston.cpp
View File

@ -236,7 +236,7 @@ bool cPiston::CanPush(BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta)
bool cPiston::CanBreakPush(BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta) bool cPiston::CanBreakPush(BLOCKTYPE a_BlockType, NIBBLETYPE /*a_BlockMeta*/)
{ {
return g_BlockPistonBreakable[a_BlockType]; return g_BlockPistonBreakable[a_BlockType];
} }

2
src/Simulator/FireSimulator.h
View File

@ -22,7 +22,7 @@ public:
cFireSimulator(cWorld & a_World, cIniFile & a_IniFile); cFireSimulator(cWorld & a_World, cIniFile & a_IniFile);
~cFireSimulator(); ~cFireSimulator();
virtual void Simulate(float a_Dt) override {} // not used virtual void Simulate(float /*a_Dt*/) override {} // not used
virtual void SimulateChunk(float a_Dt, int a_ChunkX, int a_ChunkZ, cChunk * a_Chunk) override; virtual void SimulateChunk(float a_Dt, int a_ChunkX, int a_ChunkZ, cChunk * a_Chunk) override;
virtual bool IsAllowedBlock(BLOCKTYPE a_BlockType) override; virtual bool IsAllowedBlock(BLOCKTYPE a_BlockType) override;

4
src/Simulator/RedstoneSimulator.h
View File

@ -19,7 +19,7 @@ public:
cRedstoneSimulator(cWorld & a_World); cRedstoneSimulator(cWorld & a_World);
~cRedstoneSimulator(); ~cRedstoneSimulator();
virtual void Simulate(float a_Dt) override {}; // Not used in this simulator virtual void Simulate(float /*a_Dt*/) override {}; // Not used in this simulator
virtual void SimulateChunk(float a_Dt, int a_ChunkX, int a_ChunkZ, cChunk * a_Chunk) override; virtual void SimulateChunk(float a_Dt, int a_ChunkX, int a_ChunkZ, cChunk * a_Chunk) override;
virtual bool IsAllowedBlock( BLOCKTYPE a_BlockType ) override { return IsRedstone(a_BlockType); } virtual bool IsAllowedBlock( BLOCKTYPE a_BlockType ) override { return IsRedstone(a_BlockType); }
@ -269,4 +269,4 @@ private:
default: return false; default: return false;
} }
} }
}; };

2
src/Simulator/SandSimulator.h
View File

@ -15,7 +15,7 @@ public:
cSandSimulator(cWorld & a_World, cIniFile & a_IniFile); cSandSimulator(cWorld & a_World, cIniFile & a_IniFile);
// cSimulator overrides: // cSimulator overrides:
virtual void Simulate(float a_Dt) override {} // Unused in this simulator virtual void Simulate(float /*a_Dt*/) override {} // Unused in this simulator
virtual void SimulateChunk(float a_Dt, int a_ChunkX, int a_ChunkZ, cChunk * a_Chunk) override; virtual void SimulateChunk(float a_Dt, int a_ChunkX, int a_ChunkZ, cChunk * a_Chunk) override;
virtual bool IsAllowedBlock(BLOCKTYPE a_BlockType) override; virtual bool IsAllowedBlock(BLOCKTYPE a_BlockType) override;