merge conficts fixed

1 files changed, 15 insertions, 3 deletions

diff --git a/src/crepe/api/Sprite.cpp b/src/crepe/api/Sprite.cpp
index aa7dbb0..806f147 100644
--- a/src/crepe/api/Sprite.cpp
+++ b/src/crepe/api/Sprite.cpp
@@ -1,8 +1,20 @@
-#include <string>
+#include <cstdint>
+#include <memory>
 
+#include "api/Texture.h"
+#include "util/log.h"
+
+#include "Component.h"
 #include "Sprite.h"
 
-using namespace crepe::api;
 using namespace std;
+using namespace crepe;
+using namespace crepe::api;
+
+Sprite::Sprite(uint32_t id, shared_ptr<Texture> image, const Color & color,
+			   const FlipSettings & flip)
+	: Component(id), color(color), flip(flip), sprite_image(image) {
+	dbg_trace();
+}
 
-Sprite::Sprite(string path) : path(path) {}
+Sprite::~Sprite() { dbg_trace(); }