summaryrefslogtreecommitdiffstats
path: root/src/Blocks
diff options
context:
space:
mode:
authorHowaner <franzi.moos@googlemail.com>2014-04-06 21:45:55 +0200
committerHowaner <franzi.moos@googlemail.com>2014-04-06 21:45:55 +0200
commit4d7b250a509213fa7043b3670c6a393a3683fc69 (patch)
tree7d539af52515c634e4f3f6e1c579dfe6d6339589 /src/Blocks
parentMerge branch 'master' into Slabs (diff)
downloadcuberite-4d7b250a509213fa7043b3670c6a393a3683fc69.tar
cuberite-4d7b250a509213fa7043b3670c6a393a3683fc69.tar.gz
cuberite-4d7b250a509213fa7043b3670c6a393a3683fc69.tar.bz2
cuberite-4d7b250a509213fa7043b3670c6a393a3683fc69.tar.lz
cuberite-4d7b250a509213fa7043b3670c6a393a3683fc69.tar.xz
cuberite-4d7b250a509213fa7043b3670c6a393a3683fc69.tar.zst
cuberite-4d7b250a509213fa7043b3670c6a393a3683fc69.zip
Diffstat (limited to 'src/Blocks')
-rw-r--r--src/Blocks/BlockDirt.h3
-rw-r--r--src/Blocks/BlockHandler.h2
2 files changed, 2 insertions, 3 deletions
diff --git a/src/Blocks/BlockDirt.h b/src/Blocks/BlockDirt.h
index 84c8461b5..0c550257e 100644
--- a/src/Blocks/BlockDirt.h
+++ b/src/Blocks/BlockDirt.h
@@ -2,7 +2,6 @@
#pragma once
#include "BlockHandler.h"
-#include "BlockSlab.h"
#include "../FastRandom.h"
@@ -67,7 +66,7 @@ public:
cChunk * Chunk = a_Chunk.GetRelNeighborChunkAdjustCoords(BlockX, BlockZ);
if (Chunk == NULL)
{
- // Unloaded chunks
+ // Unloaded chunk
continue;
}
Chunk->GetBlockTypeMeta(BlockX, BlockY, BlockZ, DestBlock, DestMeta);
diff --git a/src/Blocks/BlockHandler.h b/src/Blocks/BlockHandler.h
index 760db02fe..4d6a2abb6 100644
--- a/src/Blocks/BlockHandler.h
+++ b/src/Blocks/BlockHandler.h
@@ -86,7 +86,7 @@ public:
/// Checks if the block can stay at the specified relative coords in the chunk
virtual bool CanBeAt(cChunkInterface & a_ChunkInterface, int a_RelX, int a_RelY, int a_RelZ, const cChunk & a_Chunk);
- /** Can spread the block under this block to grass? */
+ /** Can change the block under this block to grass? */
virtual bool CanChangeDirtToGrass(BLOCKTYPE a_Block, NIBBLETYPE a_Meta);
/** Checks if the block can be placed at this point.