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

Merge branch 'master' into PreventNewWarnings

Browse Source
This commit is contained in:
tycho
2015-05-23 07:33:52 -07:00
parent b29ae54d91 7e0dc0f9bc
commit 81c0116cf1
19 changed files with 46 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Generating/VillageGen.cpp
View File

@@ -259,13 +259,13 @@ protected:
// cPiecePool overrides:
virtual cPieces GetPiecesWithConnector(int a_ConnectorType)
virtual cPieces GetPiecesWithConnector(int a_ConnectorType) override
{
return m_Prefabs.GetPiecesWithConnector(a_ConnectorType);
}
virtual cPieces GetStartingPieces(void)
virtual cPieces GetStartingPieces(void) override
{
return m_Prefabs.GetStartingPieces();
}