From 365cbc6e1cea96741e26c9ce912b003f8fd2c62c Mon Sep 17 00:00:00 2001 From: Mattes D Date: Sun, 29 Sep 2019 14:59:24 +0200 Subject: Refactored more of Entities and BlockEntities to use Vector3. (#4403) --- tests/Generating/Stubs.cpp | 6 +++--- tests/LuaThreadStress/Stubs.cpp | 6 +++--- tests/SchematicFileSerializer/Stubs.cpp | 13 ++++++------- 3 files changed, 12 insertions(+), 13 deletions(-) (limited to 'tests') diff --git a/tests/Generating/Stubs.cpp b/tests/Generating/Stubs.cpp index 8a8095458..31ed50fa8 100644 --- a/tests/Generating/Stubs.cpp +++ b/tests/Generating/Stubs.cpp @@ -291,7 +291,7 @@ bool cBlockHandler::IsInsideBlock(Vector3d a_Position, const BLOCKTYPE a_BlockTy -cBlockEntity * cBlockEntity::CreateByBlockType(BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta, int a_BlockX, int a_BlockY, int a_BlockZ, cWorld * a_World) +cBlockEntity * cBlockEntity::CreateByBlockType(BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta, Vector3i a_Pos, cWorld * a_World) { return nullptr; } @@ -316,7 +316,7 @@ void cDeadlockDetect::UntrackCriticalSection(cCriticalSection & a_CS) -void cBlockEntity::SetPos(int a_BlockX, int a_BlockY, int a_BlockZ) +void cBlockEntity::SetPos(Vector3i a_NewPos) { } @@ -333,7 +333,7 @@ bool cBlockEntity::IsBlockEntityBlockType(BLOCKTYPE a_BlockType) -cBlockEntity * cBlockEntity::Clone(int a_BlockX, int a_BlockY, int a_BlockZ) +cBlockEntity * cBlockEntity::Clone(Vector3i a_Pos) { return nullptr; } diff --git a/tests/LuaThreadStress/Stubs.cpp b/tests/LuaThreadStress/Stubs.cpp index 5db1c9665..890a9448a 100644 --- a/tests/LuaThreadStress/Stubs.cpp +++ b/tests/LuaThreadStress/Stubs.cpp @@ -284,7 +284,7 @@ bool cBlockHandler::IsInsideBlock(Vector3d a_Position, const BLOCKTYPE a_BlockTy -cBlockEntity * cBlockEntity::CreateByBlockType(BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta, int a_BlockX, int a_BlockY, int a_BlockZ, cWorld * a_World) +cBlockEntity * cBlockEntity::CreateByBlockType(BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta, Vector3i a_Pos, cWorld * a_World) { return nullptr; } @@ -309,7 +309,7 @@ void cDeadlockDetect::UntrackCriticalSection(cCriticalSection & a_CS) -void cBlockEntity::SetPos(int a_BlockX, int a_BlockY, int a_BlockZ) +void cBlockEntity::SetPos(Vector3i a_NewPos) { } @@ -326,7 +326,7 @@ bool cBlockEntity::IsBlockEntityBlockType(BLOCKTYPE a_BlockType) -cBlockEntity * cBlockEntity::Clone(int a_BlockX, int a_BlockY, int a_BlockZ) +cBlockEntity * cBlockEntity::Clone(Vector3i a_Pos) { return nullptr; } diff --git a/tests/SchematicFileSerializer/Stubs.cpp b/tests/SchematicFileSerializer/Stubs.cpp index 715e4439e..669fe1048 100644 --- a/tests/SchematicFileSerializer/Stubs.cpp +++ b/tests/SchematicFileSerializer/Stubs.cpp @@ -34,6 +34,9 @@ cBlockInfo::cBlockInfoArray::cBlockInfoArray() } + + + cBoundingBox::cBoundingBox(double, double, double, double, double, double) { } @@ -217,7 +220,7 @@ bool cBlockEntity::IsBlockEntityBlockType(BLOCKTYPE a_BlockType) -void cBlockEntity::SetPos(int a_BlockX, int a_BlockY, int a_BlockZ) +void cBlockEntity::SetPos(Vector3i a_NewPos) { } @@ -225,7 +228,7 @@ void cBlockEntity::SetPos(int a_BlockX, int a_BlockY, int a_BlockZ) -cBlockEntity * cBlockEntity::Clone(int a_BlockX, int a_BlockY, int a_BlockZ) +cBlockEntity * cBlockEntity::Clone(Vector3i a_Pos) { return nullptr; } @@ -234,11 +237,7 @@ cBlockEntity * cBlockEntity::Clone(int a_BlockX, int a_BlockY, int a_BlockZ) -cBlockEntity * cBlockEntity::CreateByBlockType(BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta, int a_BlockX, int a_BlockY, int a_BlockZ, cWorld * a_World) +cBlockEntity * cBlockEntity::CreateByBlockType(BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta, Vector3i a_Pos, cWorld * a_World) { return nullptr; } - - - - -- cgit v1.2.3