From 5b4816ec32a35441616ce486c8a14d1b23cc0297 Mon Sep 17 00:00:00 2001
From: Ethan Adams <ethan.adams@live.ca>
Date: Fri, 21 Jun 2024 17:21:40 -0400
Subject: [PATCH] Adding back bullet and removed whitespace

---
 Resources/sprites/bullet.png         | Bin 0 -> 2347 bytes
 YuppleMayham/CMakeLists.txt          |   2 +-
 YuppleMayham/src/gameplay/entity.cpp |   1 -
 3 files changed, 1 insertion(+), 2 deletions(-)
 create mode 100644 Resources/sprites/bullet.png

diff --git a/Resources/sprites/bullet.png b/Resources/sprites/bullet.png
new file mode 100644
index 0000000000000000000000000000000000000000..f311624015dcb0cb690de82d17b763ea5fe8a812
GIT binary patch
literal 2347
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
R8Djtd002ovPDHLkV1g{lQaS(t

literal 0
HcmV?d00001

diff --git a/YuppleMayham/CMakeLists.txt b/YuppleMayham/CMakeLists.txt
index 33237a5..f2590cf 100644
--- a/YuppleMayham/CMakeLists.txt
+++ b/YuppleMayham/CMakeLists.txt
@@ -21,7 +21,7 @@ include_directories(${PROJECT_SOURCE_DIR}/YupplyMayham/gameplay/weapons)
 include_directories(${PROJECT_SOURCE_DIR}/YupplyMayham)
 
 # Add source to this project's executable.
-add_executable (YuppleMayham  "src/main.cpp" "c:/sdks/glad/src/glad.c" "graphics/glwindow.h" "src/graphics/sprite.cpp" "src/graphics/mesh.cpp" "src/gameplay/entity.cpp" "src/gameplay/gameactor.cpp" "src/graphics/shader.cpp" "src/util.cpp" "gameplay/camera.h" "src/gameplay/camera.cpp"  "src/utility/command.cpp" "src/gameplay/input.cpp" "gameplay/mousestate.h" "graphics/line.h" "src/gameplay/weapons/bullet.cpp"  "gameplay/weapons/bulletmanager.h" "src/gameplay/weapons/bulletmanager.cpp" "src/gameplay/scene.cpp" "gameplay/scene.h" "graphics/tile.h"  "graphics/texture.h" "src/graphics/texture.cpp" "src/graphics/tile.cpp" "graphics/tiletype.h" "utility/resourcemanager.h" "src/utility/resourcemanager.cpp" "utility/xmlloader.h" "src/utility/xmlloader.cpp" "gameplay/game.h" "src/gameplay/game.cpp" "src/graphics/instancedraw.cpp" "gameplay/map.h" "src/gameplay/map.cpp" "src/gameplay/weapons/weapon.cpp"  "gameplay/physics.h" "src/gameplay/physics.cpp" "utility/events.h" "utility/debugdraw.h" "src/utility/debugdraw.cpp" "utility/script.h" "src/utility/script.cpp" "gameplay/ai.h" "utility/raycaster.h" "src/gameplay/ai.cpp" "utility/ftfont.h" "src/utility/ftfont.cpp" "utility/direction.h")
+add_executable (YuppleMayham  "src/main.cpp" "c:/sdks/glad/src/glad.c" "graphics/glwindow.h" "src/graphics/sprite.cpp" "src/graphics/mesh.cpp" "src/gameplay/entity.cpp" "src/gameplay/gameactor.cpp" "src/graphics/shader.cpp" "src/util.cpp" "gameplay/camera.h" "src/gameplay/camera.cpp"  "src/utility/command.cpp" "src/gameplay/input.cpp" "gameplay/mousestate.h" "src/gameplay/weapons/bullet.cpp"  "gameplay/weapons/bulletmanager.h" "src/gameplay/weapons/bulletmanager.cpp" "src/gameplay/scene.cpp" "gameplay/scene.h" "graphics/tile.h"  "graphics/texture.h" "src/graphics/texture.cpp" "src/graphics/tile.cpp" "graphics/tiletype.h" "utility/resourcemanager.h" "src/utility/resourcemanager.cpp" "utility/xmlloader.h" "src/utility/xmlloader.cpp" "gameplay/game.h" "src/gameplay/game.cpp" "src/graphics/instancedraw.cpp" "gameplay/map.h" "src/gameplay/map.cpp" "src/gameplay/weapons/weapon.cpp"  "gameplay/physics.h" "src/gameplay/physics.cpp" "utility/events.h" "utility/debugdraw.h" "src/utility/debugdraw.cpp" "utility/script.h" "src/utility/script.cpp" "gameplay/ai.h" "utility/raycaster.h" "src/gameplay/ai.cpp" "utility/ftfont.h" "src/utility/ftfont.cpp" "utility/direction.h")
 
 add_custom_command(TARGET YuppleMayham PRE_BUILD COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/Resources/ $<TARGET_FILE_DIR:YuppleMayham>)
 
diff --git a/YuppleMayham/src/gameplay/entity.cpp b/YuppleMayham/src/gameplay/entity.cpp
index 2f53951..955d82f 100644
--- a/YuppleMayham/src/gameplay/entity.cpp
+++ b/YuppleMayham/src/gameplay/entity.cpp
@@ -21,7 +21,6 @@ void Entity::setRotation(const float& rotation)
 void Entity::setLocalPosition(const glm::vec3& localPosition)
 {
 	this->localPosition = localPosition;
-
 }
 
 void Entity::setRotatable(bool rotatable)