From 372e098ae239399cf37e11620eaf27a1a6284d9a Mon Sep 17 00:00:00 2001
From: UnknownShadow200 <unknownshadow200@gmail.com>
Date: Sat, 29 Apr 2017 16:22:46 +1000
Subject: [PATCH] Less compile errors III

---
 src/Client/Block.c      | 10 +++++-----
 src/Client/DefaultSet.c |  6 +++---
 src/Client/Vector3.c    | 10 +++++-----
 src/Client/Vector3.h    |  8 ++++----
 4 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/Client/Block.c b/src/Client/Block.c
index 6846e3489..b87f7d9cd 100644
--- a/src/Client/Block.c
+++ b/src/Client/Block.c
@@ -13,7 +13,7 @@ void Block_Init() {
 	for (Int32 i = 0; i < DefinedCustomBlocks.Length; i++)
 		DefinedCustomBlocks[i] = 0;
 	for (Int32 block = 0; block < Block_Count; block++)
-		ResetBlockProps((BlockID)block);
+		Block_ResetProps((BlockID)block);
 	UpdateCulling();
 }
 
@@ -58,7 +58,7 @@ void Block_ResetProps(BlockID block) {
 	FullBright[block] = DefaultSet_FullBright(block);
 	FogColour[block] = DefaultSet_FogColour(block);
 	FogDensity[block] = DefaultSet_FogDensity(block);
-	SetCollide(block, DefaultSet_Collide(block));
+	Block_SetCollide(block, DefaultSet_Collide(block));
 	DigSounds[block] = DefaultSet_DigSound(block);
 	StepSounds[block] = DefaultSet_StepSound(block);
 	SpeedMultiplier[block] = 1;
@@ -76,7 +76,7 @@ void Block_ResetProps(BlockID block) {
 		MaxBB[block].Y = DefaultSet_Height(block);
 	}
 
-	SetBlockDraw(block, Draw[block]);
+	Block_SetDrawType(block, Draw[block]);
 	CalcRenderBounds(block);
 	LightOffset[block] = CalcLightOffset(block);
 
@@ -117,7 +117,7 @@ String Block_DefaultName(BlockID block) {
 	}
 
 	String blockNames;
-	String_Constant(&blockNames, &Block_RawNames);
+	String_Constant(&blockNames, Block_RawNames);
 
 	// Find start and end of this particular block name
 	Int32 start = 0;
@@ -129,7 +129,7 @@ String Block_DefaultName(BlockID block) {
 
 	String buffer;
 	String_Empty(&buffer, Block_NamePtr(block), STRING_SIZE);
-	SplitUppercase(&buffer, &blockNames, start, end);
+	Block_SplitUppercase(&buffer, &blockNames, start, end);
 	return buffer;
 }
 
diff --git a/src/Client/DefaultSet.c b/src/Client/DefaultSet.c
index ead33a465..2aeb66dbe 100644
--- a/src/Client/DefaultSet.c
+++ b/src/Client/DefaultSet.c
@@ -54,14 +54,14 @@ UInt8 DefaultSet_MapOldCollide(BlockID b, UInt8 collide) {
 
 bool DefaultSet_BlocksLight(BlockID b) {
 	return !(b == BlockID_Glass || b == BlockID_Leaves
-		|| b == BlockID_Air || Draw(b) == DrawType_Sprite);
+		|| b == BlockID_Air || DefaultSet_Draw(b) == DrawType_Sprite);
 }
 
 UInt8 DefaultSet_StepSound(BlockID b) {
 	if (b == BlockID_Glass) return SoundType_Stone;
 	if (b == BlockID_Rope) return SoundType_Cloth;
-	if (Draw(b) == DrawType_Sprite) return SoundType_None;
-	return DigSound(b);
+	if (DefaultSet_Draw(b) == DrawType_Sprite) return SoundType_None;
+	return DefaultSet_DigSound(b);
 }
 
 
diff --git a/src/Client/Vector3.c b/src/Client/Vector3.c
index b3d2fe961..51bc98bf8 100644
--- a/src/Client/Vector3.c
+++ b/src/Client/Vector3.c
@@ -32,23 +32,23 @@ void Vector3_Subtract(Vector3* a, Vector3* b, Vector3* result) {
 	result->Z = a->Z - b->Z;
 }
 
-void Vector3_Multiply(Vector3* a, Real32 scale, Vector3* result) {
+void Vector3_Multiply1(Vector3* a, Real32 scale, Vector3* result) {
 	result->X = a->X * scale;
 	result->Y = a->Y * scale;
 	result->Z = a->Z * scale;
 }
 
-void Vector3_Multiply(Vector3* a, Vector3* scale, Vector3* result) {
+void Vector3_Multiply3(Vector3* a, Vector3* scale, Vector3* result) {
 	result->X = a->X * scale->X;
 	result->Y = a->Y * scale->Y;
 	result->Z = a->Z * scale->Z;
 }
 
-void Vector3_Divide(Vector3* a, Real32 scale, Vector3* result) {
-	Vector3_Multiply(a, 1.0f / scale, result);
+void Vector3_Divide1(Vector3* a, Real32 scale, Vector3* result) {
+	Vector3_Multiply1(a, 1.0f / scale, result);
 }
 
-void Vector3_Divide(Vector3* a, Vector3* scale, Vector3* result) {
+void Vector3_Divide3(Vector3* a, Vector3* scale, Vector3* result) {
 	result->X = a->X / scale->X;
 	result->Y = a->Y / scale->Y;
 	result->Z = a->Z / scale->Z;
diff --git a/src/Client/Vector3.h b/src/Client/Vector3.h
index 4a5ce3570..11393f6fd 100644
--- a/src/Client/Vector3.h
+++ b/src/Client/Vector3.h
@@ -43,16 +43,16 @@ void Vector3_Add(Vector3* a, Vector3* b, Vector3* result);
 void Vector3_Subtract(Vector3* a, Vector3* b, Vector3* result);
 
 /* Multiplies all components of a by scale. */
-void Vector3_Multiply(Vector3* a, Real32 scale, Vector3* result);
+void Vector3_Multiply1(Vector3* a, Real32 scale, Vector3* result);
 
 /* Multiplies components of a by scale. */
-void Vector3_Multiply(Vector3* a, Vector3* scale, Vector3* result);
+void Vector3_Multiply3(Vector3* a, Vector3* scale, Vector3* result);
 
 /* Divides all components of a by scale. */
-void Vector3_Divide(Vector3* a, Real32 scale, Vector3* result);
+void Vector3_Divide1(Vector3* a, Real32 scale, Vector3* result);
 
 /* Divides components of a by scale. */
-void Vector3_Divide(Vector3* a, Vector3* scale, Vector3* result);
+void Vector3_Divide3(Vector3* a, Vector3* scale, Vector3* result);
 
 
 /* Linearly interpolates between two vectors. */