memory leaks and shush

src/CMakeLists.txt

@@ -1,5 +1,12 @@
 cmake_minimum_required(VERSION 3.27)
 
+if (WIN32)
+    # /ENTRY:mainCRTStartup keeps the same "main" function instead of requiring "WinMain"
+    set(SUBSYSTEM_LINKER_OPTIONS "/SUBSYSTEM:WINDOWS /ENTRY:mainCRTStartup")
+else()
+    set(SUBSYSTEM_LINKER_OPTIONS "-mwindows")
+endif()
+
 project(
 	TheFrim
 	VERSION 1.0
@@ -63,13 +70,6 @@ link_directories(bassLibrary)
 
 add_executable(TheFrim ${SOURCE_FILES})
 
-if (WIN32)
-    # /ENTRY:mainCRTStartup keeps the same "main" function instead of requiring "WinMain"
-    set(SUBSYSTEM_LINKER_OPTIONS "/SUBSYSTEM:WINDOWS /ENTRY:mainCRTStartup")
-else()
-    set(SUBSYSTEM_LINKER_OPTIONS "-mwindows")
-endif()
-
 set_target_properties(TheFrim PROPERTIES 
 VS_DEBUGGER_WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
 )

src/CMakeSettings.json

@@ -35,8 +35,6 @@
       "configurationType": "RelWithDebInfo",
       "buildRoot": "${projectDir}\\out\\build\\${name}",
       "installRoot": "${projectDir}\\out\\install\\${name}",
-      "cmakeCommandArgs": "",
-      "buildCommandArgs": "",
       "ctestCommandArgs": "",
       "inheritEnvironments": [ "clang_cl_x64" ]
     },
@@ -58,6 +56,17 @@
       "rsyncCommandArgs": "-t --delete",
       "remoteCopyBuildOutput": false,
       "remoteCopySourcesMethod": "rsync"
+    },
+    {
+      "name": "x64-Release-x86",
+      "generator": "Ninja",
+      "configurationType": "Release",
+      "buildRoot": "${projectDir}\\out\\build\\${name}",
+      "installRoot": "${projectDir}\\out\\install\\${name}",
+      "buildCommandArgs": "",
+      "ctestCommandArgs": "",
+      "inheritEnvironments": [ "clang_cl_x86" ],
+      "addressSanitizerEnabled": true
     }
   ]
 }

src/Engine/Objects/2DCamera.cpp

@@ -74,6 +74,7 @@ Camera2D::Camera2D(glm::vec3 pos) : GameObject(pos)
 
 }
 
+
 void Camera2D::Resize()
 {
 	glm::vec2 size = Game::instance->GetWindowSize();

src/Engine/Objects/2DGameObject.h

@@ -62,6 +62,11 @@ class GameObject2D : public GameObject
 
 	}
 
+	~GameObject2D()
+	{
+		draws = {};
+	}
+
 	Texture* t = NULL;
 	Shader* s = NULL;
 

src/Game/Objects/Base/Block.h

@@ -124,7 +124,7 @@ class Block
 
 	virtual void OnInteract() {};
 
-	virtual void Update(int tick) {};
+	virtual bool Update(int tick) { return true; };
 
 	void Draw(std::vector<GameObject::VVertex>& verts, std::vector<unsigned int>& inds);
 

src/Game/Objects/Base/Blocks/Water.cpp

@@ -116,18 +116,21 @@ void Water::PlaceWater(glm::vec3 _pos, int _strength)
 	changedBlocks = true;
 }
 
-void Water::Update(int tick) // water functionality
+bool Water::Update(int tick) // water functionality
 {
-	if (strength == 0 || tick % 8 != 0 || currentChunk == nullptr)
-		return;
+	if (strength == 0 || currentChunk == nullptr)
+		return true;
 
 	std::vector<glm::vec3> freeSpaces = GetFreeSpaces(position);
 
+	if (tick % 8 != 0 || (freeSpaces.size() != 0 && tick % 8 != 0))
+		return false;
+
 	for (glm::vec3 freeSpace : freeSpaces)
 	{
 		Chunk* c = WorldManager::instance->GetChunk(freeSpace.x, freeSpace.z);
 
 		PlaceWater(freeSpace, strength - 1);
 	}
-
+	return true;
 }

src/Game/Objects/Base/Blocks/Water.h

@@ -83,7 +83,7 @@ class Water : public Block
 
 	void PlaceWater(glm::vec3 _pos, int _strength);
 
-	void Update(int tick) override;
+	bool Update(int tick) override;
 };
 
 #endif

src/Game/Objects/Base/Chunk.cpp

@@ -824,6 +824,9 @@ void Chunk::DestroySubChunk(int y)
 {
 	subChunk* sbc = GetSubChunk(y);
 
+	if (sbc == nullptr)
+		return;
+
 	DestroySubChunk(sbc);
 }
 
@@ -845,12 +848,14 @@ void Chunk::DestroySubChunk(subChunk* c)
 	}
 
 	delete c;
+
+	subChunks.erase(std::remove(subChunks.begin(), subChunks.end(), c), subChunks.end());
 }
 
 void Chunk::DestroySubChunks()
 {
-	for (int i = 0; i < subChunks.size(); i++)
-		DestroySubChunk(subChunks[i]->y);
+	for (int i = CHUNK_HEIGHT; i > -1; i--)
+		DestroySubChunk(i);
 
 	subChunks.clear();
 }
@@ -1077,7 +1082,10 @@ void Chunk::UpdateChunk(int tick)
 		modified = false;
 	}
 
-	if (wasModified)
+	if (wasModified || keepUpdating)
+	{
+		if (keepUpdating)
+			keepUpdating = false;
 		for (int i = 0; i < subChunks.size(); i++)
 		{
 			subChunk* sbc = subChunks[i];
@@ -1094,8 +1102,10 @@ void Chunk::UpdateChunk(int tick)
 					if (b == nullptr)
 						continue;
 
-					b->Update(tick);
+					if (!b->Update(tick))
+						keepUpdating = true;
 				}
 			}
 		}
+	}
 }

src/Game/Objects/Base/Chunk.h

@@ -38,7 +38,7 @@ class Chunk : public GameObject
     void CreateFaces(Block* b);
 
     void ApplyNormal(std::vector<GameObject::VVertex>& vertices, glm::vec3 normal);
-
+    bool keepUpdating = false;
 
     int shadowSize = 0;
     int size = 0;

src/Game/Objects/Base/Hud.cpp

@@ -302,8 +302,6 @@ Hud::Hud(glm::vec3 _pos, Player* _p, Camera2D* _c2d) : GameObject(_pos)
 
 Hud::~Hud()
 {
-	delete crosshair;
-
 	for (auto h : hotbar)
 	{
 		c2d->RemoveObject(h);
@@ -335,12 +333,6 @@ Hud::~Hud()
 	}
 
 	armor.clear();
-
-	delete hand;
-	delete pauseBackground;
-	delete resume;
-	delete title;
-	delete pauseHeader;
 }
 
 void Hud::Draw()