From 37f8ad93d473b2777f4d6ab22e46bada68148e0d Mon Sep 17 00:00:00 2001
From: cinnaboot <cinnaboot@protonmail.com>
Date: Sun, 20 Dec 2020 12:57:26 -0500
Subject: [PATCH] check for nullptr when freeing simple mesh

---
 src/entity.cpp   | 3 ++-
 src/mesh.cpp     | 1 +
 src/renderer.cpp | 3 ---
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/entity.cpp b/src/entity.cpp
index 35791fe..76226ac 100644
--- a/src/entity.cpp
+++ b/src/entity.cpp
@@ -51,7 +51,8 @@ entFree(entity& e)
 	roFree(e.render_objs);
 	e.render_objs = nullptr;
 	meFreeMeshGroup(e.meshes);
-	meFreeSimpleMesh(e.mesh);
+
+	if (e.mesh != nullptr) meFreeSimpleMesh(e.mesh);
 	e.mesh = nullptr;
 }
 
diff --git a/src/mesh.cpp b/src/mesh.cpp
index d34f4d0..c94051e 100644
--- a/src/mesh.cpp
+++ b/src/mesh.cpp
@@ -94,6 +94,7 @@ meFreeMeshGroup(mesh_group& mesh_group)
 void
 meFreeSimpleMesh(simple_mesh* mesh)
 {
+	assert(mesh != nullptr);
 	utilSafeFree(mesh->vertices);
 	mesh->vertices = nullptr;
 	utilSafeFree(mesh->vert_colors);
diff --git a/src/renderer.cpp b/src/renderer.cpp
index b30506a..5574890 100644
--- a/src/renderer.cpp
+++ b/src/renderer.cpp
@@ -1,7 +1,4 @@
 
-#include <vector>
-#include <cmath> // trig functions
-
 #if defined (_WIN32)
 	#include <SDL.h>
 #else