water sfx and general fixes

src/Game/Data/Settings.h

@@ -21,7 +21,7 @@ class Settings
 	bool vsync = true;
 	bool fullscreen = false;
 
-	bool useAmbientDiffuse = false;
+	bool useAmbientDiffuse = true;
 
 	void Load();
 	void Save();

src/Game/Data/Structures/Ruins.cpp

@@ -575,6 +575,10 @@ void Data::Ruins::Create(int x, int z, int y, Data::Chunk& c, Data::Region* r)
 			return;
 	}
 
+
 	for (BlueprintBlock& block : b.blocks)
-		r->freePlace(_x + block.x, y - block.y, _z + block.z, block.type);
+	{
+		float realY = y - block.y;
+		r->freePlace(_x + block.x, realY, _z + block.z, block.type);
+	}
 }

src/Game/Data/World.cpp

@@ -83,6 +83,16 @@ void Data::Region::freePlace(int x, int y, int z, int type)
 	c->placeBlock(x - c->x, y, z - c->z, type);
 }
 
+bool Data::Region::doesBlockExist(int x, int y, int z)
+{
+	Chunk* c = getChunkPtr(x, z);
+
+	if (c == nullptr)
+		return false;
+
+	return c->bChunk.blocks[x - c->x][z - c->z][y] > 0;
+}
+
 bool Data::Region::doesBlockExistInRange(int x, int y, int z, int type, int range)
 {
 	std::lock_guard<std::mutex> lock(m);

src/Game/Data/World.h

@@ -122,9 +122,9 @@ namespace Data
 	{
 	public:
 		bool isGenerated = false;
-		BlockChunk bChunk;
+		BlockChunk bChunk = {};
 		int32_t x, z;
-		DataChunk data;
+		DataChunk data = {};
 
 		void placeBlock(int x, int y, int z, uint8_t block)
 		{
@@ -262,6 +262,7 @@ namespace Data
 		void freePlace(int x, int y, int z, int type);
 
 		bool doesBlockExistInRange(int x, int y, int z, int type, int range);
+		bool doesBlockExist(int x, int y, int z);
 
 		Chunk generateChunk(int x, int z);
 

src/Game/Objects/Base/Entity.cpp

@@ -387,6 +387,23 @@ void Entity::Draw()
 	else
 		inWater = topWater;
 
+	if (inWater && !waterSoundEntrance)
+	{
+		waterSoundEntrance = true;
+
+		float pitch = 1.0f + ((rand() % 20) - 10) / 100.0f;
+
+		MusicManager::GetInstance()->PlaySFX("water_in", position, pitch, "enter");
+	}
+	else if (!inWater && waterSoundEntrance)
+	{
+		waterSoundEntrance = false;
+
+		float pitch = 1.0f + ((rand() % 20) - 10) / 100.0f;
+
+		MusicManager::GetInstance()->PlaySFX("water_out", position, pitch, "exit");
+	}
+
 	if (glfwGetTime() - lightUpdate > 0.1)
 	{
 		lightUpdate = glfwGetTime();

src/Game/Objects/Base/Entity.h

@@ -8,6 +8,7 @@
 class Entity : public GameObject
 {
 	int lightUpdate = 0;
+	bool waterSoundEntrance = false;
 public:
 	Sprite3D* shadow;
 

src/Game/Scenes/Gameplay.cpp

@@ -535,7 +535,7 @@ void Gameplay::UpdateChunks()
 
 			float angle = camera->YawAngleTo(fakePosC);
 
-			if ((angle <= 260 || distance <= 32) && distance <= fog + 32)
+			if ((angle <= 300 || distance <= 64) && distance <= fog + 64)
 			{
 				if (!c->isRendered || c->pleaseRender)
 				{