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

Merge branch 'master' into Werror

Browse Source 
Conflicts:
	src/Generating/PieceGenerator.cpp
This commit is contained in:
Tycho
2014-03-12 09:59:10 -07:00
parent ef58b0eb54 d545be9614
commit 3caa4a38b9
45 changed files with 663 additions and 649 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Generating/PieceGenerator.cpp
View File

@@ -376,8 +376,8 @@ bool cPieceGenerator::TryPlacePieceAtConnector(
// You need DirectionRotationTable[rot1][rot2] CCW turns to connect rot1 to rot2 (they are opposite)
static const int DirectionRotationTable[6][6] =
{
/* YM, YP, ZM, ZP, XM, XP
YM */ { 0, 0, 0, 0, 0, 0},
/* YM, YP, ZM, ZP, XM, XP */
/* YM */ { 0, 0, 0, 0, 0, 0},
/* YP */ { 0, 0, 0, 0, 0, 0},
/* ZM */ { 0, 0, 2, 0, 1, 3},
/* ZP */ { 0, 0, 0, 2, 3, 1},